提交代码

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1602,7 +1602,7 @@ GROUP BY od.GoodsId,o.OrderId
 
 
             string sql = $@"    SELECT a.OrderSource,a.OrderStatus,sum(b.InsuranceCostMoney) as InsuranceCostMoney,sum(b.InsuranceMoney) as InsuranceMoney,b.CarType,a.OrderClassify,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
-SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney+IFNULL(b.InsuranceMoney,0)) as AllPrice,SUM(b.DepositMoney+b.DepositRefundMoney) as TotalDepositMoney ,
+SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney+IFNULL(b.InsuranceMoney,0)) as AllPrice,SUM(b.DepositMoney+b.DepositFreightMoney) as TotalDepositMoney ,
 (IFNULL(b.CostMoney,0)) as CostMoney,0 as PackingMoney, 0 as CostFreight,sum(b.FreightCostMoney) as GoodsFreight,
 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney
 from rb_goods_orderdetail as b
@@ -1665,7 +1665,7 @@ GROUP BY b.Id order by b.Id asc";
 
             }
             string sql = $@"   SELECT a.OrderSource,a.OrderStatus,sum(b.InsuranceCostMoney) as InsuranceCostMoney,sum(b.InsuranceMoney) as InsuranceMoney,b.CarType,a.OrderClassify,B.Id,b.ServiceCharge,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
-SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney+IFNULL(b.InsuranceMoney,0)) as AllPrice ,
+SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney+IFNULL(b.InsuranceMoney,0)) as AllPrice,SUM(b.DepositMoney+b.DepositFreightMoney) as TotalDepositMoney  ,
 (IFNULL(b.CostMoney,0)) as CostMoney,0 as PackingMoney, 0 as CostFreight,sum(b.FreightCostMoney) as GoodsFreight,
 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney
 from rb_goods_orderdetail as b

Mall.WebApi/Controllers/MarketingCenter/AppletCouponController.cs

@@ -632,6 +632,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                     newDepositModel.RechargeType = 2;
                     newDepositModel.SendStatus = 0;
                     newDepositModel.SendTime = null;
+
+                    var oldUserInfo = CacheManager.User.UserReidsCache.GetAppletUserLoginInfo(depositModel.UserId);
                     Model.Entity.User.RB_Member_DepositBalance mergeModel = new Model.Entity.User.RB_Member_DepositBalance()
                     {
                         Id = 0,
@@ -650,7 +652,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                         Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
                         TenantId = userInfo.TenantId,
                         MallBaseId = userInfo.MallBaseId,
-                        Remarks = "用户id:" + userInfo.UserId + "将储值卡赠送给您",
+                        Remarks = "用户:" + oldUserInfo?.Name + "将储值卡赠送给您",
                     };
                     depositMergeList.Add(mergeModel);
                     Model.Entity.User.RB_Member_DepositBalance oldDergeModel = new Model.Entity.User.RB_Member_DepositBalance()
@@ -671,7 +673,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                         Type = Common.Enum.MarketingCenter.RecordTypeEnum.Expend,
                         TenantId = userInfo.TenantId,
                         MallBaseId = userInfo.MallBaseId,
-                        Remarks = "将储值卡赠送给了" + userInfo.Name + ",用户id:" + userInfo.UserId
+                        Remarks = "储值卡赠送给了" + userInfo.Name 
                     };
                     depositMergeList.Add(oldDergeModel);
                     bool flag = couponModule.ReceiveDeposit(depositModel, newDepositModel, depositMergeList);