Merge remote-tracking branch 'origin/developer' into developerC

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -511,16 +511,18 @@ public class OrderClubServiceImpl implements OrderClubService {
 
 
         //取消订单短信推送（取消推送）
-        /*String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
-        if (StringUtils.isNotBlank(bindMobile)) {
-            String shortLink = remoteCallService.getShortLink(8, 11, domain + "/user/order/detail.html?orderId=" + orderId);
-            String content = "您已成功取消订单（订单编号：" + order.getOrderNo() + "），订单金额￥" + order.getPayTotalFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
-                    "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
-            boolean sendSms = remoteCallService.getSendSms(11, bindMobile, content);
-            if (!sendSms) {
-                log.info("取消订单推送失败，orderId>>>>" + orderId);
+        if(orderClubMapper.getProductOrder(orderId).contains(6060)) {
+            String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
+            if (StringUtils.isNotBlank(bindMobile)) {
+                String shortLink = remoteCallService.getShortLink(8, 11, domain + "/user/order/detail.html?orderId=" + orderId);
+                String content = "您已成功取消订单（订单编号：" + order.getOrderNo() + "），订单金额￥" + order.getPayTotalFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
+                        "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
+                boolean sendSms = remoteCallService.getSendSms(11, bindMobile, content);
+                if (!sendSms) {
+                    log.info("取消订单推送失败，orderId>>>>" + orderId);
+                }
             }
-        }*/
+        }
         // 客服确认注册机构，一天内取消有效
         Integer clubStatus = baseMapper.getClubStatus(order.getUserId());
         if (null != clubStatus && 94 == clubStatus) {

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1105,17 +1105,19 @@ public class PayOrderServiceImpl implements PayOrderService {
             log.info("【支付异步回调】>>>>>更新用户采美豆(update[user(userBeans:" + userBeans + ")])，userId:" + beansHistory.getUserId());
         }
         // 已支付短信推送(取消推送)
-        /*boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
-        String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
-        if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
-            String shortLink = remoteCallService.getShortLink(8, 6, "https://www.caimei365.com/user/order/detail.html?orderId=" + orderId);
-            String content = "您已成功支付订单（订单编号：" + order.getOrderNo() + "）全部款项，支付总金额￥" + order.getPayTotalFee() + "，采美平台将立即安排发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
-                    "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
-            boolean sendSms = remoteCallService.getSendSms(6, bindMobile, content);
-            if (!sendSms) {
-                log.info("取消订单推送失败，orderId>>>>" + orderId);
+        if(orderClubMapper.getProductOrder(orderId).contains(6060)) {
+            boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
+            String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
+            if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
+                String shortLink = remoteCallService.getShortLink(8, 6, "https://www.caimei365.com/user/order/detail.html?orderId=" + orderId);
+                String content = "您已成功支付订单（订单编号：" + order.getOrderNo() + "）全部款项，支付总金额￥" + order.getPayTotalFee() + "，采美平台将立即安排发货。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
+                        "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
+                boolean sendSms = remoteCallService.getSendSms(6, bindMobile, content);
+                if (!sendSms) {
+                    log.info("取消订单推送失败，orderId>>>>" + orderId);
+                }
             }
-        }*/
+        }
         return "SUCCESS";
     }
 

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1599,7 +1599,7 @@ int Id=0;
         /*
          * 下单推送(自主订单才推送)
          */
-        if(Id==1) {
+        if(orderClubMapper.getProductOrder(mainOrder.getOrderId()).contains(6060)) {
             if (StringUtils.isNotBlank(orderParamBo.getBindMobile()) && 0 == mainOrder.getRebateFlag() && 1 == mainOrder.getOrderType()) {
                 String shortLink = remoteCallService.getShortLink(8, 3, domain + "/user/order/detail.html?orderId=" + mainOrder.getOrderId());
                 String name = orderProductList.get(0).getName();