提交代码

Mall.Module.MarketingCenter/CouponModule.cs

@@ -928,7 +928,7 @@ namespace Mall.Module.MarketingCenter
                                 MaxDiscountsPrice = item.MaxDiscountsPrice,
                                 CouponType = item.CouponType,
                                 Name = item.Name,
-                                KeyWord=item.KeyWord
+                                KeyWord = item.KeyWord
                             };
 
                             isReceive = memberCouponRepository.Insert(nowMemberCoupon, trans) > 0;

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -356,11 +356,11 @@ on a.CouponId=b.ID {where} ";
                 }
             }
 
-            string sql = @$"SELECT a.*,b.TriggerType,b.GrantNum from rb_coupon_selfmotion as b LEFT JOIN {TableName} as a on a.ID=b.DiscountCouponId
+            string sql = @$"SELECT a.*,b.TriggerType,b.GrantNum,b.KeyWord from rb_coupon_selfmotion as b LEFT JOIN {TableName} as a on a.ID=b.DiscountCouponId
 where (a.IndateType=1 or (a.IndateType=2   and a.EndDate>NOW()))
  and a.`Status`=0 and b.`Status`=0 and IsAll=0 {builder.ToString()}
 UNION ALL 
-SELECT a.*,b.TriggerType,b.GrantNum from rb_coupon_selfmotion as b LEFT JOIN rb_discountcoupon as a on a.ID=b.DiscountCouponId
+SELECT a.*,b.TriggerType,b.GrantNum,b.KeyWord from rb_coupon_selfmotion as b LEFT JOIN rb_discountcoupon as a on a.ID=b.DiscountCouponId
 LEFT JOIN rb_coupon_selfmotionmember as c on c.SelfMotionId=b.ID
 where (a.IndateType=1 or (a.IndateType=2   and a.EndDate>NOW())) {builder.ToString()}
  and a.`Status`=0 and b.`Status`=0 and IsAll=1 {userWhere} ";