推荐供应商

Mall.Module.User/UserModule.cs

@@ -5482,7 +5482,7 @@ namespace Mall.Module.User
                     Id = 0,
                     MallBaseId = mallBaseId,
                     Money = totalMoney,
-                    Periods = DateTime.Now.ToString("yyyyMMdd"),
+                    Periods = DateTime.Now.ToString("yyyyMM"),
                     Remark = "",
                     Status = 0,
                     SupplierId = supplierId,

Mall.WebApi/App_Code/PayUtil.cs

@@ -473,7 +473,7 @@ namespace Mall.WebApi.App_Code
         /// <param name="CustomerId"></param>
         /// <param name="openid"></param>
         /// <returns></returns>
-        public static bool GetTransfersOrder(string sOrderNo, decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor)
+        public static bool GetTransfersOrder(string sOrderNo, decimal dPrice, string CustomerId, string openid, RB_MiniProgram_Extend model, IHttpContextAccessor _accessor, string Remark = "")
         {
             if (!System.IO.File.Exists(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "App_Data/Certs/WeChatApp/" + model.WeChatPayCertificateUrl)))
             {
@@ -489,7 +489,7 @@ namespace Mall.WebApi.App_Code
             req.SetParameter("openid", openid);
             req.SetParameter("check_name", "NO_CHECK");
             req.SetParameter("amount", (dPrice * 100).ToString("f0"));
-            req.SetParameter("desc", "赞羊商城佣金提现");
+            req.SetParameter("desc", Remark == "" ? "赞羊商城佣金提现" : Remark);
             req.SetParameter("sign", req.CreateMd5Sign(_accessor, model.WeChatApiSecret));
             var reqXml = req.ParseXml();
             var result = Common.Pay.WeChatPat.HttpHelper.Post(new HttpParam()

Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs

@@ -224,7 +224,7 @@ namespace Mall.WebApi.Controllers.Finance
             {
                 var mallModel = userModule.GetMiniProgramExtend(MallBaseId);
                 var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0);
-                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
+                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor, "赞羊供应商佣金打款");
                 if (flag)
                 {
                     string msg = userModule.SetRecommendOrdersBillRemit(BillId, TenantId, MallBaseId, 0, "单据审核通过，已自动打款");
@@ -233,7 +233,7 @@ namespace Mall.WebApi.Controllers.Finance
                         LogHelper.Write("企业付款失败 账单BillId:" + BillId);
                     }
 
-                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(TenantId, MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放推荐佣金，请注意查收");
+                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(TenantId, MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放供应商佣金，请注意查收");
                     return ApiResult.Success();
                 }
                 else

Mall.WebApi/Controllers/User/UserController.cs

@@ -3013,7 +3013,7 @@ namespace Mall.WebApi.Controllers.User
             {
                 var mallModel = userModule.GetMiniProgramExtend(req.MallBaseId);
                 var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0);
-                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
+                var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor,"赞羊供应商佣金打款");
                 if (flag)
                 {
                     string msg = userModule.SetRecommendOrdersBillRemit(BillId, req.TenantId, req.MallBaseId, req.EmpId);
@@ -3022,7 +3022,7 @@ namespace Mall.WebApi.Controllers.User
                         LogHelper.Write("企业付款失败 账单BillId:" + BillId);
                     }
 
-                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(req.TenantId, req.MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放推荐佣金，请注意查收");
+                    new MiniProgramMsgModule().SendWithdrawSucceedMsg(req.TenantId, req.MallBaseId, umodel.OpenId, (bmodel.Money ?? 0).ToString(), "0", "自动打款", "已发放供应商佣金，请注意查收");
                     return ApiResult.Success();
                 }
                 else