赞羊返佣调整

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -399,5 +399,15 @@ namespace Mall.Model.Entity.Product
         /// 规格对应的班级（甲鹤小程序）
         /// </summary>
         public int ClassId { get; set; }
+
+        /// <summary>
+        /// 原成本价格
+        /// </summary>
+        public decimal OriginalCostMoney { get; set; }
+
+        /// <summary>
+        /// 粉象初始佣金
+        /// </summary>
+        public decimal FXCommission { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -7803,7 +7803,9 @@ namespace Mall.Module.Product
                     DepositMoney = item.DepositMoney,
                     DepositFreightMoney = item.DepositFreightMoney,
                     DepositRefundMoney = item.DepositRefundMoney,
-                    ClassId = item.ClassId
+                    ClassId = item.ClassId,
+                    FXCommission = item.CommissionPrice,
+                    OriginalCostMoney = item.CostMoney ?? 0
                 }, trans);
                 item.Id = detailId;
                 if (detailId > 0 && SatisfiedGoodsList.Any())

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -35,6 +35,10 @@ namespace Mall.Repository.Product
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)}={dmodel.OrderId}";
             }
+            if (dmodel.OrderDetailId > 0)
+            {
+                where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderDetailId)}={dmodel.OrderDetailId}";
+            }
             if (dmodel.UserId > 0)
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.UserId)}={dmodel.UserId}";

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -143,6 +143,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     IntegralNumber = y.IntegralNumber ?? 0,
                     DeductionCommission = y.DeductionCommission ?? 0,
                     y.IsApplyForAfterSale,
+                    y.OriginalCostMoney,
+                    y.FXCommission,
                     SFinanceList = y.FinanceList.Where(z => z.Type == Common.Enum.Finance.WFTempLateClassEnum.IN).Select(z => new
                     {
                         z.FrID,
@@ -2128,14 +2130,14 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递商品成本");
             }
-            bool flag = orderModule.SetOrderCostMoney(OrderId, costMoney, EmpId, req.TenantId, req.MallBaseId);
-            if (flag)
+            string msg = orderModule.SetOrderCostMoney(OrderId, costMoney, EmpId, req.TenantId, req.MallBaseId);
+            if (msg == "")
             {
                 return ApiResult.Success();
             }
             else
             {
-                return ApiResult.Failed();
+                return ApiResult.Failed(msg);
             }
         }
 
@@ -2569,7 +2571,10 @@ namespace Mall.WebApi.Controllers.MallBase
                     SpecificationList = !string.IsNullOrEmpty(y.Specification) ? JsonConvert.DeserializeObject<List<string>>(y.Specification) : new List<string>(),
                     y.ProductCode,
                     y.Final_Price,
-                    y.Number
+                    y.Number,
+                    y.OriginalCostMoney,
+                    y.FXCommission,
+                    y.CostMoney
                 }),
                 x.Consignee,
                 x.Mobile,