增加 同步物流服务，并扣款

Store.SyncLogistics/Apis/VirtualLogisticsApi.cs

@@ -177,7 +177,7 @@ public class VirtualLogisticsApi : ISingletonDependency
 			}
 			item.Encoding = Encoding.UTF8;
 
-			item.ProxyIp = "127.0.0.1:8080";
+			//item.ProxyIp = "127.0.0.1:8080";
 
 			long unix = DateHelper.GetCurrentUnixTimestampInSeconds();
 

Store.SyncLogistics/Controllers/LogisticsController.cs

@@ -1,5 +1,6 @@
 using Store.Framework.Base;
 using Store.Framework.Models;
+using Store.SyncLogistics.Dtos;
 using Store.VirtualLogistics.Apis;
 using Store.VirtualLogistics.Entitys;
 using Store.VirtualLogistics.Models;
@@ -99,11 +100,13 @@ public class LogisticsController : ApiControllerBase
 	/// 购买快递
 	/// </summary>
 	[HttpPost]
-	public IHttpActionResult Buy(string orderId)
+	public IHttpActionResult Buy(BuyLogisticsRequest request)
 	{
 		try
 		{
-			var result = _logisticsService.Buy(orderId, "");
+			string orderId = request.OrderId;
+			string agentOrderId = request.AgentOrderId;
+			var result = _logisticsService.Buy(request.UserName, orderId, agentOrderId);
 			return Ok(ApiResult.Success(result));
 		}
 		catch (Exception ex)

Store.SyncLogistics/Dtos/BuyLogisticsRequest.cs

@@ -0,0 +1,14 @@
+using Store.Framework.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Store.SyncLogistics.Dtos;
+
+public class BuyLogisticsRequest : SignRequestBase
+{
+	public string OrderId { get; set; }
+	public string AgentOrderId { get; set; }
+}

Store.SyncLogistics/Models/BuyModels.cs

@@ -261,7 +261,7 @@ public class EncryptDatas
 	/// 订单商品数量，视频号必填
 	/// </summary>
 	[JsonProperty("sku_cnt")]
-	public string SkuCnt { get; set; }
+	public int SkuCnt { get; set; }
 }
 public class ExtendParams
 {

Store.SyncLogistics/Services/VirtualLogisticsService.cs

@@ -2,6 +2,9 @@ using MAX.Core.Commons;
 using MAX.Core.DependencyInjection;
 using MAX.Core.Logger;
 using Store.Contracts.Order.Entitys;
+using Store.Contracts.Shops;
+using Store.Contracts.User.Entitys;
+using Store.Contracts.User.Interfaces;
 using Store.VirtualLogistics.Apis;
 using Store.VirtualLogistics.Entitys;
 using Store.VirtualLogistics.Models;
@@ -16,14 +19,20 @@ namespace Store.VirtualLogistics.Services;
 
 public class VirtualLogisticsService : ITransientDependency
 {
+	/// <summary>
+	/// 固定费用1.7元
+	/// </summary>
+	const decimal FIXEDFEES = 1.7m;
 	private IFreeSql _freeSql;
 	private readonly ILoggerFacade _logger;
+	private readonly IUserService _userService;
 	private readonly VirtualLogisticsApi _api;
 
-	public VirtualLogisticsService(VirtualLogisticsApi api, IFreeSql freeSql, ILoggerFacade logger)
+	public VirtualLogisticsService(VirtualLogisticsApi api, IFreeSql freeSql, ILoggerFacade logger, IUserService userService)
 	{
 		_freeSql = freeSql ?? throw new ArgumentNullException(nameof(freeSql));
 		_logger = logger;
+		_userService = userService;
 		_api = api;
 	}
 
@@ -64,15 +73,22 @@ public class VirtualLogisticsService : ITransientDependency
 	/// <summary>
 	/// 购买快递
 	/// </summary>
-	public List<YhSyncLogisticsEntity> Buy(string orderId, string ds_orderId)
+	public List<YhSyncLogisticsEntity> Buy(string userName, string orderId, string agentOrderId)
 	{
-		var item = _freeSql.Select<OrderPddBuyerOrderEntity>()
+		if (string.IsNullOrEmpty(orderId) || string.IsNullOrWhiteSpace(agentOrderId))
+		{
+			throw new ArgumentNullException(nameof(orderId));
+		}
+		var user = _userService.GetUserByUserName(userName);
+		if (user == null) throw new Exception("错误的账号");
+		//中间订单
+		var middleOrder = _freeSql.Select<OrderPddBuyerOrderEntity>()
 			.Where(a => a.OrderSn == orderId)
 			.First();
-		if (item == null) throw new Exception("错误的订单号");
-
+		if (middleOrder == null) throw new Exception("错误的订单号");
+		//middleOrder.TrackingNumber = "YT0709726946568";
 		var w_order = _freeSql.Select<WeiOrderEntity>()
-			.Where(a => a.OrderId == item.WxOrderId)
+			.Where(a => a.OrderId == middleOrder.WxOrderId)
 			.First();
 
 		if (w_order == null) throw new Exception("错误的订单号");
@@ -81,6 +97,12 @@ public class VirtualLogisticsService : ITransientDependency
 			.First();
 		if (productItem == null) throw new Exception("错误的订单详情号");
 
+		var shop = _freeSql.Select<ShopEntity>()
+			.Where(a => a.Id == productItem.ShopId)
+			.First();
+		if (shop == null) throw new Exception("错误的店铺");
+
+
 		BuyRequest request = new BuyRequest()
 		{
 			KuaidiId = "874",
@@ -98,20 +120,28 @@ public class VirtualLogisticsService : ITransientDependency
 				new RecItem
 				{
 					OrderSn = orderId,
+					ShopOrder =w_order.OrderId,
 					RecName = w_order.UserName,
 					RecMobile = w_order.TelNumber,
 					RecProvince = w_order.ProvinceName,
 					RecCity = w_order.CityName,
 					RecDistrict = w_order.CountyName,
 					RecAddress = w_order.DetailInfo,
+					EwaybillOrderCode="wx7809625286c28f2f",
 					EncryptDatas=new EncryptDatas
 					{
-						DsOrderId=ds_orderId,
+						DsOrderId=agentOrderId,
 						SkuId = productItem.SkuId,
 						ProductId = productItem.ProductId,
-						SkuCnt = productItem.SkuCnt.ToString(),
+						SkuCnt = productItem.SkuCnt,
+						FromShopCode = shop.AppKey,
 					},
-					OtherKuaidiSn= "6738192431"//item.TrackingNumber,
+					ExtendParams=new ExtendParams{
+						Token="",
+						Api="",
+						DsOrderId =agentOrderId
+					},
+					OtherKuaidiSn= middleOrder.TrackingNumber,
 
 				}
 				]
@@ -141,6 +171,9 @@ public class VirtualLogisticsService : ITransientDependency
 			_logger.Error("购买同步单提交到数据库错误");
 			throw new Exception("记录同步单失败");
 		}
+
+		//todo 更新UserBlance
+		_userService.UserPayment(user.UserName, orderId, type: Contracts.User.Enums.UserPaymentTypes.同步单号);
 		return yhSyncs;
 
 	}