增加 shop 永不过期API

This commit is contained in:
chfei committed 2026-09-28 17:06:23 +08:00
1 parent 90dacd88a3
commit 766afa2fb8
10 files changed
+2152 -2132

No files matched your search

File diff suppressed because it is too large. Load diff
@@ -11,7 +11,7 @@ namespace KJD_Web.Controllers.WX
{ {
[RoutePrefix("wxxd_shop")] [RoutePrefix("wxxd_shop")]
[Route("{action}")] [Route("{action}")]
public class WXShopController:AsmxApiController public partial class WXShopController:AsmxApiController
{ {
public IHttpActionResult get_shop_list() public IHttpActionResult get_shop_list()
@@ -0,0 +1,40 @@
using KJD_Web.Requests;
using KJD_Web.Services.Shops;
using Store.Framework.Dtos;
using Store.Framework.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Http;
namespace KJD_Web.Controllers.WX;
public partial class WXShopController : AsmxApiController
{
private readonly ShopService _shopService;
public WXShopController(ShopService shopService)
{
_shopService = shopService;
}
/// <summary>
/// 更新商铺永久续费
/// </summary>
/// <returns></returns>
[HttpPost]
public IHttpActionResult UpdateShopNeverExpires(ShopNeverExpiresRequest request)
{
try
{
var ret = _shopService.UpdateShopNeverExpires(request.UserName, request.ShopId, request.OwnerUser, request.IsNever);
return Ok(ApiResult.Success(ret));
}
catch (Exception ex)
{
return Ok(ApiResult.Fail(ex.Message));
}
}
}
+3
View File
@@ -193,6 +193,7 @@
<Compile Include="Controllers\AsmxApiController.cs" /> <Compile Include="Controllers\AsmxApiController.cs" />
<Compile Include="Controllers\ImageCacheController.cs" /> <Compile Include="Controllers\ImageCacheController.cs" />
<Compile Include="Controllers\WX\OEMController.cs" /> <Compile Include="Controllers\WX\OEMController.cs" />
<Compile Include="Controllers\WX\WXShop_N_Controller.cs" />
<Compile Include="Controllers\WX\WXUser_N_Controller.cs" /> <Compile Include="Controllers\WX\WXUser_N_Controller.cs" />
<Compile Include="Controllers\WX\WXShopController.cs" /> <Compile Include="Controllers\WX\WXShopController.cs" />
<Compile Include="Controllers\WX\WXUserController.cs" /> <Compile Include="Controllers\WX\WXUserController.cs" />
@@ -218,6 +219,7 @@
<Compile Include="Model\WxModel\oms_wei_transfer_extra_package.cs" /> <Compile Include="Model\WxModel\oms_wei_transfer_extra_package.cs" />
<Compile Include="Model\WxModel\yh_sync_logistics.cs" /> <Compile Include="Model\WxModel\yh_sync_logistics.cs" />
<Compile Include="Requests\RequestBase.cs" /> <Compile Include="Requests\RequestBase.cs" />
<Compile Include="Requests\ShopRequest.cs" />
<Compile Include="Requests\Users\CUUserInfoRequest.cs" /> <Compile Include="Requests\Users\CUUserInfoRequest.cs" />
<Compile Include="Requests\Users\RebateRecordRequest.cs" /> <Compile Include="Requests\Users\RebateRecordRequest.cs" />
<Compile Include="Responses\Users\RebateRecordResponse.cs" /> <Compile Include="Responses\Users\RebateRecordResponse.cs" />
@@ -264,6 +266,7 @@
<Compile Include="Repository\UserPointsRecordRepository.cs" /> <Compile Include="Repository\UserPointsRecordRepository.cs" />
<Compile Include="Requests\Users\ShopRenewRequest.cs" /> <Compile Include="Requests\Users\ShopRenewRequest.cs" />
<Compile Include="Services\ImageCacheService.cs" /> <Compile Include="Services\ImageCacheService.cs" />
<Compile Include="Services\Shops\ShopService.cs" />
<Compile Include="Services\Users\UserService.FeeRecord.cs" /> <Compile Include="Services\Users\UserService.FeeRecord.cs" />
<Compile Include="Services\Users\UserService.OEM.cs" /> <Compile Include="Services\Users\UserService.OEM.cs" />
<Compile Include="Services\Users\UserService.cs" /> <Compile Include="Services\Users\UserService.cs" />
@@ -76,6 +76,8 @@ namespace KJD_Web.Model.ShopModel
public long? erp_shop_id { get; internal set; } public long? erp_shop_id { get; internal set; }
public long? erp_corporate_account_user_id { get; internal set; } public long? erp_corporate_account_user_id { get; internal set; }
public long? erp_manage_user_id { get; internal set; } public long? erp_manage_user_id { get; internal set; }
public bool never_expires { get; internal set; }
} }
public class AuthInfo public class AuthInfo
+14
View File
@@ -0,0 +1,14 @@
using Store.Framework.Dtos;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace KJD_Web.Requests;
public class ShopNeverExpiresRequest : SignRequestBase
{
public string ShopId { get; set; }
public string OwnerUser { get; set; }
public bool IsNever { get; set; }
}
@@ -0,0 +1,42 @@
using MAX.Core.DependencyInjection;
using MAX.Core.Logger;
using Store.Contracts.Shops;
using Store.Contracts.User.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace KJD_Web.Services.Shops;
public class ShopService : ITransientDependency
{
private readonly IFreeSql _freeSql;
private readonly ILoggerFacade _logger;
private readonly IUserService _userService;
public ShopService(IFreeSql freeSql, ILoggerFacade logger, IUserService userService)
{
_freeSql = freeSql;
_logger = logger;
_userService = userService;
}
/// <summary>
/// 修改商铺永不过期
/// </summary>
public bool UpdateShopNeverExpires(string userName, string shopId,string ownerUser, bool isNever)
{
if (string.IsNullOrEmpty(userName)) return false;
if (string.IsNullOrEmpty(shopId)) return false;
var user = _userService.GetUserByUserName(userName);
if (user == null) return false;
if (user.SaLevel != 1) return false;
var affrows = _freeSql.Update<ShopEntity>()
.Set(a => a.NeverExpires, isNever)
.Where(a => a.ShopId == shopId && a.UserName == ownerUser)
.ExecuteAffrows();
return affrows == 1;
}
}
+121 -227
View File
@@ -1,255 +1,149 @@
using FreeSql.DataAnnotations; using FreeSql.DataAnnotations;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Store.Contracts.Shops; namespace Store.Contracts.Shops
/// <summary>
/// 店铺表
/// </summary>
[Table(Name = "erp.o_shop")]
public class ShopEntity
{ {
/// <summary> /// <summary>
/// 主键 /// 店铺表
/// </summary> /// </summary>
[Column(Name = "id", IsPrimary = true, IsIdentity = true)] [Table(Name = "wxxd.shop")]
public long Id { get; set; } public class ShopEntity
{
/// <summary>
/// 表id
/// </summary>
[Column(Name = "id", IsPrimary = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary> /// <summary>
/// 店铺名 /// login_name
/// </summary> /// </summary>
[Column(Name = "name")] [Column(Name = "login_name")]
public string Name { get; set; } public string LoginName { get; set; }
/// <summary> /// <summary>
/// 对应第三方平台Id /// login_pass
/// </summary> /// </summary>
[Column(Name = "type")] [Column(Name = "login_pass")]
public int Type { get; set; } public string LoginPass { get; set; }
/// <summary> /// <summary>
/// 登录获取的Cookie信息 /// cookie
/// </summary> /// </summary>
[Column(Name = "login_cookie")] [Column(Name = "cookie")]
public string LoginCookie { get; set; } public string Cookie { get; set; }
/// <summary> /// <summary>
/// 访问需要的header参数 /// cookie2
/// </summary> /// </summary>
[Column(Name = "header_params")] [Column(Name = "cookie2")]
public string HeaderParams { get; set; } public string Cookie2 { get; set; }
/// <summary> /// <summary>
/// 店铺url /// anti_contents
/// </summary> /// </summary>
[Column(Name = "url")] [Column(Name = "anti_contents")]
public string Url { get; set; } public string AntiContents { get; set; }
/// <summary> /// <summary>
/// 排序 /// openid
/// </summary> /// </summary>
[Column(Name = "sort")] [Column(Name = "openid")]
public int Sort { get; set; } public string Openid { get; set; }
/// <summary> /// <summary>
/// 状态(1正常2已删除) /// shop_id
/// </summary> /// </summary>
[Column(Name = "status")] [Column(Name = "shop_id")]
public int? Status { get; set; } public string ShopId { get; set; }
/// <summary> /// <summary>
/// 描述 /// shop_account
/// </summary> /// </summary>
[Column(Name = "remark")] [Column(Name = "shop_account")]
public string Remark { get; set; } public string ShopAccount { get; set; }
/// <summary> /// <summary>
/// 第三方平台店铺id,淘宝天猫开放平台使用 /// sub_user_name
/// </summary> /// </summary>
[Column(Name = "seller_id")] [Column(Name = "sub_user_name")]
public long? SellerId { get; set; } public string SubUserName { get; set; }
/// <summary> /// <summary>
/// 授权时间 /// user_name
/// </summary> /// </summary>
[Column(Name = "auth_time")] [Column(Name = "user_name")]
public long? AuthTime { get; set; } public string UserName { get; set; }
/// <summary> /// <summary>
/// 服务市场授权到期时间 /// 店铺分组名称(非子账号分组)
/// </summary> /// </summary>
[Column(Name = "expire_time")] [Column(Name = "group_name")]
public long? ExpireTime { get; set; } public string GroupName { get; set; }
/// <summary> /// <summary>
/// Appkey /// add_time
/// </summary> /// </summary>
[Column(Name = "app_key")] [Column(Name = "add_time")]
public string AppKey { get; set; } public DateTime? AddTime { get; set; }
/// <summary> /// <summary>
/// Appsercet /// mdy_time
/// </summary> /// </summary>
[Column(Name = "app_secret")] [Column(Name = "mdy_time")]
public string AppSecret { get; set; } public DateTime? MdyTime { get; set; }
/// <summary> /// <summary>
/// 小红椒的access_token /// 店铺所属公司
/// </summary> /// </summary>
[Column(Name = "access_token_xhj")] [Column(Name = "company_name")]
public string AccessTokenXhj { get; set; } public string CompanyName { get; set; }
/// <summary> /// <summary>
/// 第三方平台sessionKey(access_token) /// 备注
/// </summary> /// </summary>
[Column(Name = "access_token")] [Column(Name = "notes")]
public string AccessToken { get; set; } public string Notes { get; set; }
/// <summary> /// <summary>
/// 小红椒多久到期 /// login_status
/// </summary> /// </summary>
[Column(Name = "expires_in_xhj")] [Column(Name = "login_status")]
public long? ExpiresInXhj { get; set; } public string LoginStatus { get; set; }
/// <summary> /// <summary>
/// 到期 /// 店铺每月商品上传限额剩余
/// </summary> /// </summary>
[Column(Name = "expires_in")] [Column(Name = "add_product_remaining")]
public long? ExpiresIn { get; set; } public int AddProductRemaining { get; set; }
/// <summary> /// <summary>
/// 小红椒access_token开始时间 /// 上传限额所处月份
/// </summary> /// </summary>
[Column(Name = "access_token_begin_xhj")] [Column(Name = "add_product_month")]
public long? AccessTokenBeginXhj { get; set; } public byte AddProductMonth { get; set; }
/// <summary> /// <summary>
/// access_token开始时间 /// 分配的二级超管的user_name
/// </summary> /// </summary>
[Column(Name = "access_token_begin")] [Column(Name = "operate_sub_sa_name")]
public long? AccessTokenBegin { get; set; } public string OperateSubSaName { get; set; }
/// <summary> /// <summary>
/// 刷新token /// 分配二级超管的时间
/// </summary> /// </summary>
[Column(Name = "refresh_token")] [Column(Name = "add_sub_sa_time")]
public string RefreshToken { get; set; } public DateTime? AddSubSaTime { get; set; }
/// <summary> /// <summary>
/// 刷新token过期时间 /// login_status2
/// </summary> /// </summary>
[Column(Name = "refresh_token_timeout")] [Column(Name = "login_status2")]
public long? RefreshTokenTimeout { get; set; } public string LoginStatus2 { get; set; }
/// <summary>
/// <summary> ///
/// 代理api请求凭证 /// </summary>
/// </summary> [Column(Name = "never_expires")]
[Column(Name = "session")] public bool NeverExpires { get; set; }
public string Session { get; set; } }
/// <summary>
/// 代理api获取请求凭证的shopkey字段
/// </summary>
[Column(Name = "shop_key")]
public string ShopKey { get; set; }
/// <summary>
/// 请求url
/// </summary>
[Column(Name = "api_request_url")]
public string ApiRequestUrl { get; set; }
/// <summary>
/// 回掉URL
/// </summary>
[Column(Name = "api_callback_url")]
public string ApiCallbackUrl { get; set; }
/// <summary>
/// 负责人id
/// </summary>
[Column(Name = "manage_user_id")]
public long? ManageUserId { get; set; }
/// <summary>
/// 默认运费模板id,抖店上传商品使用
/// </summary>
[Column(Name = "default_freight_template_id")]
public long? DefaultFreightTemplateId { get; set; }
/// <summary>
/// 默认品牌id,抖店上传商品使用
/// </summary>
[Column(Name = "default_brand_id")]
public long? DefaultBrandId { get; set; }
/// <summary>
/// 店铺是否已开启尺码自动优化,0:不需要开启,1:未开启,2:已开启
/// </summary>
[Column(Name = "auto_size_template_optimize")]
public byte? AutoSizeTemplateOptimize { get; set; }
/// <summary>
/// 店铺分组
/// </summary>
[Column(Name = "shop_group_id")]
public long? ShopGroupId { get; set; }
/// <summary>
/// 企业账号用户id
/// </summary>
[Column(Name = "corporate_account_user_id")]
public long? CorporateAccountUserId { get; set; }
/// <summary>
/// 国家/地区
/// </summary>
[Column(Name = "region_id")]
public long? RegionId { get; set; }
/// <summary>
/// 商户ID
/// </summary>
[Column(Name = "merchant_id")]
public long? MerchantId { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[Column(Name = "create_time")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
[Column(Name = "create_by")]
public string CreateBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[Column(Name = "update_time")]
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[Column(Name = "update_by")]
public string UpdateBy { get; set; }
/// <summary>
/// api调用状态0未开启1已开启
/// </summary>
[Column(Name = "api_status")]
public int ApiStatus { get; set; }
/// <summary>
/// 是否开启自动购买外采礼物单,0:未开启,1:已开启
/// </summary>
[Column(Name = "auto_purchase_external_gift")]
public int? AutoPurchaseExternalGift { get; set; }
} }
+17 -1
View File
@@ -14,7 +14,7 @@ namespace Store.Framework.Commons
/// </summary> /// </summary>
public override List<Assembly> GetAssemblies() public override List<Assembly> GetAssemblies()
{ {
LoadAssemblies(HttpRuntime.BinDirectory); LoadAssemblies(BinDirectory);
return GetAssembliesFromCurrentAppDomain(); return GetAssembliesFromCurrentAppDomain();
} }
@@ -22,5 +22,21 @@ namespace Store.Framework.Commons
{ {
return ["Max", "Store"]; return ["Max", "Store"];
} }
public string BinDirectory
{
get
{
// 传统 ASP.NET Web 环境(IIS 或 VS 调试的 Web 应用)
if (HttpRuntime.AppDomainAppVirtualPath != null)
{
return HttpRuntime.BinDirectory;
}
// 测试环境或非 Web 环境:返回当前程序集所在目录
return AppDomain.CurrentDomain.BaseDirectory;
}
}
} }
} }
+2 -2
View File
@@ -97,7 +97,7 @@ internal class GiftLogisticsTest
public void BuyTest() public void BuyTest()
{ {
var logisticsService = _container.Resolve<VirtualLogisticsService>(); var logisticsService = _container.Resolve<VirtualLogisticsService>();
var ret = logisticsService.Buy("15222220006", "260923-573109716621688", "4439363558732480512"); var ret = logisticsService.Buy("16603999396", "260924-061299770880192", "4439386298687207168");
if (ret != null) if (ret != null)
{ {
Console.WriteLine(string.Join(" ", ret.Select(a => $"{a.OrderId}:{a.TrackingNumber}"))); Console.WriteLine(string.Join(" ", ret.Select(a => $"{a.OrderId}:{a.TrackingNumber}")));
@@ -129,7 +129,7 @@ internal class GiftLogisticsTest
public void GetOrderStatus() public void GetOrderStatus()
{ {
var logisticsService = _container.Resolve<VirtualLogisticsService>(); var logisticsService = _container.Resolve<VirtualLogisticsService>();
var data = logisticsService.GetOrderStatus(["260923-407759756800192"]); var data = logisticsService.GetOrderStatus(["260927-623588227382767"]);
Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.KuaidiSn}:{a.ShopOrder}:{a.DeliveryStatus}"))); Console.WriteLine(string.Join(" ", data.Select(a => $"{a.OrderSn}:{a.KuaidiSn}:{a.ShopOrder}:{a.DeliveryStatus}")));
} }
} }