页面修改

Mall.Module.Product/OrderModule.cs

@@ -8,6 +8,7 @@ using Mall.Common.API;
 using Mall.Common.Enum.Goods;
 using Mall.Common.Enum.User;
 using Mall.Common.Plugin;
+using Mall.Model.Entity.Finance;
 using Mall.Model.Entity.Product;
 using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.Finance;
@@ -3734,7 +3735,7 @@ namespace Mall.Module.Product
         /// <param name="extModel"></param>
         /// <param name="tradeModel"></param>
         /// <returns></returns>
-        public bool UpdateERPGoodsOrderInfoModule(RB_Goods_Order_Extend extModel, RB_Goods_Online_Trade_Extend tradeModel)
+        public bool UpdateERPGoodsOrderInfoModule(RB_Goods_Order_Extend extModel, RB_Goods_Online_Trade_Extend tradeModel,int FinanceId=0)
         {
             bool flag = false;
             Dictionary<string, object> fileds = new Dictionary<string, object>()
@@ -3742,7 +3743,24 @@ namespace Mall.Module.Product
                 {nameof(RB_Goods_Order_Extend.MerchantsNo),extModel.MerchantsNo },
                 {nameof(RB_Goods_Order_Extend.OrderStatus),extModel.OrderStatus },
                 {nameof(RB_Goods_Order_Extend.PaymentTime),extModel.PaymentTime },
+                {nameof(RB_Goods_Order_Extend.Fee),extModel.Fee}
             };
+            var detailsList= goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = extModel.OrderId });
+            if (detailsList != null && detailsList.Count > 0)
+            {
+                foreach (var item in detailsList)
+                {
+                    RB_ECFinanceId_Relation rModel = new RB_ECFinanceId_Relation()
+                    {
+                        FinanceId = FinanceId,
+                        CreateDate = DateTime.Now,
+                        ECOrderDetailId = item.Id,
+                        ECOrderId = extModel.OrderId,
+                        Status = Common.Enum.DateStateEnum.Normal
+                    };
+                    flag = new RB_ECFinanceId_RelationRepository().Insert(rModel) > 0;
+                }
+            }
             flag = goods_OrderRepository.Update(fileds, new WhereHelper(nameof(RB_Goods_Order_Extend.OrderId), extModel.OrderId));
             if (flag)
             {

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -611,12 +611,14 @@ namespace Mall.WebApi.Controllers.MallBase
         {
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
+            var FinanceId = parms.GetInt("FinanceId", 0);
             RB_Goods_Order_Extend extModel = new RB_Goods_Order_Extend()
             {
                 OrderId=parms.GetInt("OrderId"),
                 MerchantsNo=parms.GetStringValue("MerchantsNo"),
                 OrderStatus= OrderStatusEnum.WaitSendGoods,
                 PaymentTime=DateTime.Now,
+                Fee=parms.GetDecimal("Fee"),
             };
 
             RB_Goods_Online_Trade_Extend tradeModel = new RB_Goods_Online_Trade_Extend()
@@ -643,7 +645,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 TenantId = 1,
                 CreateDate = DateTime.Now,
             };
-            bool flag = orderModule.UpdateERPGoodsOrderInfoModule(extModel, tradeModel);
+            bool flag = orderModule.UpdateERPGoodsOrderInfoModule(extModel, tradeModel,FinanceId:FinanceId);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }