1

Mall.Module.Product/OrderModule.cs

@@ -7541,7 +7541,7 @@ namespace Mall.Module.Product
         /// <param name="transactionId">微信订单号</param>
         /// <param name="refundid">微信退款单号</param>
         /// <returns></returns>
-        public bool SetOrderApplyForCancelAudit(RB_Goods_Order_Extend omodel, int type, string remark, string RefundOrderNo, int tenantId, int mallBaseId, Common.Enum.Goods.OrderPayTypeEnum payType, string dPrice, string outTradeNo, string transactionId, string refundid)
+        public bool SetOrderApplyForCancelAudit(RB_Goods_Order_Extend omodel, int type, string remark, string RefundOrderNo, int tenantId, int mallBaseId, Common.Enum.Goods.OrderPayTypeEnum payType, string dPrice, string outTradeNo, string transactionId, string refundid,int empId)
         {
             var trans = goods_OrderRepository.DbTransaction;
             try
@@ -7736,7 +7736,7 @@ namespace Mall.Module.Product
                         new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName);
                     }
                     //记录日志
-                    string Content = $"客人申请取消订单，审核：{(type == 1 ? "同意" : "拒绝")}";
+                    string Content = $"empId：{empId} 客人申请取消订单，审核：{(type == 1 ? "同意" : "拒绝")}";
                     if (type == 2)
                     {
                         Content += "，拒绝理由：" + remark;

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -910,7 +910,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
 
                     var dic = ((Dictionary<string, string>)Robj.Data);
-                    bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dic["dPrice"], dic["sOrderNo"], dic["sTradeNo"], dic["refundid"]);
+                    bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dic["dPrice"], dic["sOrderNo"], dic["sTradeNo"], dic["refundid"], req.EmpId);
                     if (flag)
                     {
                         return ApiResult.Success();
@@ -928,7 +928,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             else
             {
-                bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, "", req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "", "", "", "");
+                bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, "", req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "", "", "", "", req.EmpId);
                 if (flag)
                 {
                     return ApiResult.Success();