提交代码

Mall.Module.MarketingCenter/CouponModule.cs

@@ -1188,6 +1188,7 @@ namespace Mall.Module.MarketingCenter
                 //更新订单信息
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Member_DepositBuy.SendStatus),1},
+                     { nameof(RB_Member_DepositBuy.SendTime),null},
                   { nameof(RB_Member_DepositBuy.SurplusPrice),0}
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -1368,7 +1369,7 @@ namespace Mall.Module.MarketingCenter
             return memberDepositMergeRepository.GetDepositBalanceList(query);
         }
 
-            #endregion
+        #endregion
 
-        }
+    }
 }

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -787,6 +787,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             demodel.TenantId = userInfo.TenantId;
             demodel.Status = 0;
             demodel.SendStatus = 0;
+            demodel.OrderSource = userModel.Source;
             //新增充值记录
             int rechargeId = couponModule.AddDepositBuy(demodel);
             if (rechargeId == 0)

Mall.WebApi/Controllers/MarketingCenter/AppletCouponController.cs

@@ -357,6 +357,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.UserId = userInfo.UserId;
             demodel.Status = 1;
+            demodel.SendStatus = -1;
             var list = couponModule.GetDepositBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -608,7 +609,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
 
                     var newDepositModel = new RB_Member_DepositBuy_Extend()
                     {
-
+                        Status = depositModel.Status,
                         TenantId = depositModel.TenantId,
                         MallBaseId = depositModel.MallBaseId,
                         OrderNo = depositModel.OrderNo,
@@ -619,6 +620,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                         SurplusPrice = depositModel.SurplusPrice,
                         IndateDay = depositModel.IndateDay,
                         OrderSource = depositModel.OrderSource,
+                        DepositId = depositModel.DepositId,
                         PayWay = depositModel.PayWay,
                         Remarks = "领取储值卡",
                         PayTime = depositModel.PayTime,