代码优化

Mall.Module.Product/OrderModule.cs

@@ -8371,7 +8371,7 @@ namespace Mall.Module.Product
                 });
 
                 //收货  自动确认订单
-                SetOrderOperation(omodel.RefMapperTo<RB_Goods_Order_Extend>(), 6, "", 0, "", tenantId, mallBaseId, accessor);
+                SetOrderOperation(omodel.RefMapperTo<RB_Goods_Order_Extend>(), 6, "", 0,tenantId, mallBaseId, accessor);
             }
             return flag;
         }
@@ -11633,11 +11633,10 @@ namespace Mall.Module.Product
         /// <param name="type">类型  1修改备注  2修改金额  3强制取消  4放入回收站  5确认收货  6确认完成  7回收恢复 8回收删除</param>
         /// <param name="remark"></param>
         /// <param name="income"></param>
-        /// <param name="address"></param>
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public bool SetOrderOperation(RB_Goods_Order_Extend orderModel, int type, string remark, decimal income, string address, int tenantId, int mallBaseId, Microsoft.AspNetCore.Http.IHttpContextAccessor _accessor)
+        public bool SetOrderOperation(RB_Goods_Order_Extend orderModel, int type, string remark, decimal income,int tenantId, int mallBaseId, Microsoft.AspNetCore.Http.IHttpContextAccessor _accessor)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
             switch (type)
@@ -12105,7 +12104,7 @@ namespace Mall.Module.Product
                 else if (type == 5)
                 {
                     //收货  自动确认订单
-                    SetOrderOperation(orderModel, 6, "", 0, "", tenantId, mallBaseId, _accessor);
+                    SetOrderOperation(orderModel, 6, "", 0, tenantId, mallBaseId, _accessor);
                 }
             }
             return flag;

Mall.Module.User/UserCommonModule.cs

@@ -578,7 +578,7 @@ namespace Mall.Module.User
                 //赠送粉象等级(+VIP返佣)  ld 2020-08-03
                 var FXCOrder = oldOrder.RefMapperTo<RB_Goods_Order_Extend>();
                 FXCOrder.DetailList = orderGoodsList;
-                System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(FXCOrder, Out_Trade_No, Transaction_Id, PayWay, oldOrder.UserId ?? 0, oldOrder.OrderId));
+                System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(FXCOrder, Out_Trade_No,oldOrder.UserId ?? 0, oldOrder.OrderId));
 
                 if (oldOrder.OrderClassify == 2)
                 {
@@ -880,7 +880,7 @@ namespace Mall.Module.User
             //获取订单商品
             var orderGoodsList = goodsOrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = oldOrder.TenantId, MallBaseId = oldOrder.MallBaseId, OrderId = oldOrder.OrderId });
             oldOrder.DetailList = orderGoodsList;
-            System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(oldOrder, oldOrder.MerchantsNo, "", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, oldOrder.UserId ?? 0, oldOrder.OrderId));
+            System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(oldOrder, oldOrder.MerchantsNo,oldOrder.UserId ?? 0, oldOrder.OrderId));
         }
 
 
@@ -890,7 +890,7 @@ namespace Mall.Module.User
         /// <param name="demodel"></param>
         /// <param name="umodel"></param>
         /// <param name="OrderId"></param>
-        private void InsertPresentFXGradeCommission(RB_Goods_Order_Extend demodel, string Out_Trade_No, string Transaction_Id, Common.Enum.Goods.OrderPayTypeEnum PayWay, int UserId, int OrderId)
+        private void InsertPresentFXGradeCommission(RB_Goods_Order_Extend demodel, string Out_Trade_No, int UserId, int OrderId)
         {
             var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
             if ((basicModel?.IsEnableFXGrade ?? 2) == 1)
@@ -1446,8 +1446,7 @@ namespace Mall.Module.User
         /// <param name="OrderId">vip购买单号id</param>
         /// <param name="BuyUserId">购买人</param>
         /// <returns></returns>
-        //public bool InsertVipBuyCommission(int OrderId, int BuyUserId,int IsFristBuy,int TenantId,int MallBaseId)
-        public bool InsertVipBuyCommission(int BuyUserId, int OrderId, string Out_Trade_No, string Transaction_Id, Common.Enum.Goods.OrderPayTypeEnum PayWay, decimal Money, DateTime Time_End)
+        public bool InsertVipBuyCommission(int BuyUserId, int OrderId, string Out_Trade_No,decimal Money, DateTime Time_End)
         {
             bool flag = false;
             try

Mall.WebApi/Controllers/AppletWeChat/WeChatNotifyController.cs

@@ -347,7 +347,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
                     #region 修改会员购买支付信息
 
-                    userCommonModule.InsertVipBuyCommission(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dPaid, PayDate);
+                    userCommonModule.InsertVipBuyCommission(UserId, OrderId, sOrderNo, dPaid, PayDate);
                     #endregion
                 }
                 //告诉微信我们已经处理成功，不需要再调用我们的接口了