Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -200,7 +200,7 @@ public class CmCouponController extends BaseController {
                                         messageCenter.setCouponMessageType(1);
                                         messageCenter.setCouponFee(cmCoupon.getCouponAmount().doubleValue());
                                         messageCenterDao.addMessageCenter(messageCenter);
-                                        String content = "采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                        String content = "采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。退订回T";
                                         boolean sendSms = false;
                                         try {
                                             sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
@@ -235,7 +235,7 @@ public class CmCouponController extends BaseController {
                                         messageCenter.setCouponMessageType(1);
                                         messageCenter.setCouponFee(cmCoupon.getCouponAmount().doubleValue());
                                         messageCenterDao.addMessageCenter(messageCenter);
-                                        String content = "采美平台" + catego + "类商品大优惠，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                        String content = "采美平台" + catego + "类商品大优惠，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。退订回T";
                                         boolean sendSms = false;
                                         try {
                                             sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
@@ -280,7 +280,7 @@ public class CmCouponController extends BaseController {
                                         messageCenter.setCouponMessageType(1);
                                         messageCenter.setCouponFee(cmCoupon.getCouponAmount().doubleValue());
                                         messageCenterDao.addMessageCenter(messageCenter);
-                                        String content = "采美平台为了回馈客户，赠送您" + cmCoupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                        String content = "采美平台为了回馈客户，赠送您" + cmCoupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。退订回T";
                                         boolean sendSms = false;
                                         try {
                                             sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
@@ -323,7 +323,7 @@ public class CmCouponController extends BaseController {
                                             messageCenter.setCouponFee(cmCoupon.getCouponAmount().doubleValue());
                                             messageCenterDao.addMessageCenter(messageCenter);
 
-                                            String content = "恭喜成功注册采美平台。采美平台赠送您" + cmCoupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                            String content = "恭喜成功注册采美平台。采美平台赠送您" + cmCoupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。退订回T";
                                             boolean sendSms = false;
                                             try {
                                                 sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
@@ -358,8 +358,8 @@ public class CmCouponController extends BaseController {
         List<Integer> clubIds = messageCenterDao.ClubIds();
 
 //        new Thread(() -> consumer(cmCoupon, clubIds)).start();
+        if("".equals(cmCoupon.getId())){
         consumer(cmCoupon, clubIds);
-
         RedisLearn.producer(clubIds);
         MessageCenter messageCenter = new MessageCenter();
         if (cmCoupon.getUserId() != null) {
@@ -375,7 +375,7 @@ public class CmCouponController extends BaseController {
             messageCenter.setCouponMessageType(1);
             messageCenter.setCouponFee(cmCoupon.getCouponAmount().doubleValue());
             messageCenterDao.addMessageCenter(messageCenter);
-            String content = "为了答谢您对采美平台的支持，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+            String content = "为了答谢您对采美平台的支持，采美平台送您" + cmCoupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。退订回T";
             boolean sendSms = false;
             try {
                 sendSms = SMSUtils.sendSms(3,user.getBindMobile(), content);
@@ -387,7 +387,7 @@ public class CmCouponController extends BaseController {
                 logger.info(">>>>>>>发送成功");
             }
         }
-
+        }
         cmCouponService.save(cmCoupon);
         addMessage(redirectAttributes, "保存优惠券成功");
         return "redirect:" + Global.getAdminPath() + "/coupon/cmCoupon/list?couponType=" + cmCoupon.getCouponType();

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -257,22 +257,12 @@
                 </if>
             </if>
             <if test="rebateOrder != null and rebateOrder != ''">
-                AND
-                (
                 <if test="rebateOrder == 1">
-                    co.rebateFlag = '1'
-                    OR exists
+                    AND co.rebateFlag = '1'
                 </if>
                 <if test="rebateOrder == 0">
-                    co.rebateFlag = '0'
-                    AND not exists
+                    AND co.rebateFlag = '0'
                 </if>
-                (select 1 from cm_receipt_order_relation c1
-                left join cm_discern_receipt cdr ON c1.receiptID = cdr.id
-                where c1.relationType = '1'
-                and c1.orderID in (select c2.shopOrderID from cm_shop_order c2 where c2.orderID = co.orderID)
-                and c1.delFlag = '0'
-                and cdr.receiptStatus = '2'))
             </if>
             <if test="serviceProviderId != null and serviceProviderId != 0">
                 and (co.spID = #{serviceProviderId}