用户召回短信/短信bugfix

src/main/java/com/caimei365/order/feign/ToolsFeign.java

@@ -21,7 +21,7 @@ public interface ToolsFeign {
      * @return str
      */
     @PostMapping("/tools/sms/send")
-    String getSendSms(@RequestParam String mobile, @RequestParam String content);
+    String getSendSms(@RequestParam Integer type, @RequestParam String mobile, @RequestParam String content);
 
     /**
      * 智能获取物流信息

src/main/java/com/caimei365/order/service/RemoteCallService.java

@@ -26,9 +26,10 @@ public interface RemoteCallService {
      * @param markId  短信类型
      * @param mobile  手机号
      * @param content 内容
+     * @param type    短信类型：1通知短信，2验证码短信，3营销短信
      * @return
      */
-    boolean getSendSms(int markId, String mobile, String content);
+    boolean getSendSms(Integer type,int markId, String mobile, String content);
 
     /**
      * 微信小程序授权登录（调用user服务，发送服务间调用POST请求）

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

@@ -800,86 +800,84 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         log.info("【升级超级会员异步回调】>>>>>>>>>>>收款项和购买历史关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，vipRecordId：" + recordId);
         //修改分账付款状态
         payOrderMapper.updateSplitAccountByPay(mbOrderId);
-        //已支付推送
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String current = dateFormat.format(new Date());
-        //1.日期格式
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        String endTime = sdf.format(dbUserVip.getEndTime());
-        //2.会员有效期(月)
-        Long s = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 30 / 1000;
-        //2.会员有效期(日)
-        Long t = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 1000;
-        Integer count =orderClubMapper.getVipHistoryCount(userId);
-        //推送信息中心-账户通知
-        Integer clubId = orderClubMapper.clubIdCule(userId);
-        if (clubId != null) {
-            //3.输出间隔天数         getTime获取的是毫秒
-            log.info("输出间隔月份----------->"+ s);
-            MessageCenter messageCenter = new MessageCenter();
-            messageCenter.setShopID(null);
-            messageCenter.setClubID(clubId);
-            messageCenter.setUserType(1);
-            messageCenter.setMessageType(2);
-            messageCenter.setAccountType(2);
-            messageCenter.setContent(mouth + "个月");
-            messageCenter.setTime(current);
-            orderClubMapper.addMessageCenter(messageCenter);
-        }
-        if(count==0){
-            String name = "0";
-            try {
-                log.info("***********会员办理微信公众号推送************");
-                String accessToken = weChatService.getAccessToken();
-                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.UserUnionId(userId));
-                name = "恭喜成为采美商城超级会员";
-                String time="超级会员（"+mouth+"个月）";
-                String dates=t+"天";
-                Double money =  amount;
-                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
-                // 跳转到【小程序付款-选择支付方式页面】
-                String pagePath = "/pages/user/member/member";
-                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
-
-                for (String openid : openidList) {
-                    weChatService.sendTempl(accessToken, openid, name, time, money.toString(), dates, remarkText, pagePath);
-                    log.error("获取openid>>>>>" + openid);
-                }
-
-            } catch (Exception e) {
-                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
-            }
-        }else {
-            String name = "0";
-            SimpleDateFormat dnf=new SimpleDateFormat("yyyy年MM月dd日");
-
-            try {
-                log.info("***********会员续费微信公众号推送************");
-                String accessToken = weChatService.getAccessToken();
-                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(userId));
-                name = "恭喜您成功续费采美超级会员";
-                String type="超级会员";
-                String dates=dnf.format(dbUserVip.getEndTime());
-                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
-                // 跳转到【小程序付款-选择支付方式页面】
-                String pagePath = "/pages/user/member/member";
-                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
-
-                for (String openid : openidList) {
-                    weChatService.sendTemplss(accessToken, openid,dates,pagePath);
-                }
-            } catch (Exception e) {
-                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
-            }
-        }
-
-
+        //已支付推送 todo 有空再改
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        String current = dateFormat.format(new Date());
+//        //1.日期格式
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+//        String endTime = sdf.format(dbUserVip.getEndTime());
+//        //2.会员有效期(月)
+//        Long s = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 30 / 1000;
+//        //2.会员有效期(日)
+//        Long t = (dbUserVip.getEndTime().getTime() - dbUserVip.getBeginTime().getTime()) / 24 / 60 / 60 / 1000;
+//        Integer count =orderClubMapper.getVipHistoryCount(userId);
+//        //推送信息中心-账户通知
+//        Integer clubId = orderClubMapper.clubIdCule(userId);
+//        if (clubId != null) {
+//            //3.输出间隔天数         getTime获取的是毫秒
+//            log.info("输出间隔月份----------->"+ s);
+//            MessageCenter messageCenter = new MessageCenter();
+//            messageCenter.setShopID(null);
+//            messageCenter.setClubID(clubId);
+//            messageCenter.setUserType(1);
+//            messageCenter.setMessageType(2);
+//            messageCenter.setAccountType(2);
+//            messageCenter.setContent(mouth + "个月");
+//            messageCenter.setTime(current);
+//            orderClubMapper.addMessageCenter(messageCenter);
+//        }
+//        if(count==0){
+//            String name = "0";
+//            try {
+//                log.info("***********会员办理微信公众号推送************");
+//                String accessToken = weChatService.getAccessToken();
+//                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.UserUnionId(userId));
+//                name = "恭喜成为采美商城超级会员";
+//                String time="超级会员（"+mouth+"个月）";
+//                String dates=t+"天";
+//                Double money =  amount;
+//                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
+//                // 跳转到【小程序付款-选择支付方式页面】
+//                String pagePath = "/pages/user/member/member";
+//                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
+//
+//                for (String openid : openidList) {
+//                    weChatService.sendTempl(accessToken, openid, name, time, money.toString(), dates, remarkText, pagePath);
+//                    log.error("获取openid>>>>>" + openid);
+//                }
+//
+//            } catch (Exception e) {
+//                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
+//            }
+//        }else {
+//            String name = "0";
+//            SimpleDateFormat dnf=new SimpleDateFormat("yyyy年MM月dd日");
+//
+//            try {
+//                log.info("***********会员续费微信公众号推送************");
+//                String accessToken = weChatService.getAccessToken();
+//                List<String> openidList = orderClubMapper.getOpenidListByPermission(orderClubMapper.FromUnionId(userId));
+//                name = "恭喜您成功续费采美超级会员";
+//                String type="超级会员";
+//                String dates=dnf.format(dbUserVip.getEndTime());
+//                String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
+//                // 跳转到【小程序付款-选择支付方式页面】
+//                String pagePath = "/pages/user/member/member";
+//                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
+//
+//                for (String openid : openidList) {
+//                    weChatService.sendTemplss(accessToken, openid,dates,pagePath);
+//                }
+//            } catch (Exception e) {
+//                log.error("【订单下单通知】获取微信公众号access_token异常！", e);
+//            }
+//        }
         boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
         String bindMobile = baseMapper.getBindMobileByUserId(userId);
         if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
             String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com/user/member.html?userId=" + userId);
             String content = "恭喜您成功开通采美平台超级会员，为期" + mouth + "个月，快戳采美网站链接www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
-            boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
+            boolean sendSms = remoteCallService.getSendSms(3,2, bindMobile, content);
             if (!sendSms) {
                 log.info("购买会员短信推送失败");
             }
@@ -1146,7 +1144,7 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
             String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com/user/member.html?userId=" + userId);
             String content = "恭喜您成功开通采美平台超级会员，为期" + mouth + "个月，快戳采美网站链接www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
-            boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
+            boolean sendSms = remoteCallService.getSendSms(3,2, bindMobile, content);
             if (!sendSms) {
                 log.info("购买会员短信推送失败");
             }

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

@@ -1119,7 +1119,7 @@ public class HeliPayServiceImpl implements HeliPayService {
             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);
+            boolean sendSms = remoteCallService.getSendSms(1, 6, bindMobile, content);
             if (!sendSms) {
                 log.info("取消订单推送失败，orderId>>>>" + orderId);
             }
@@ -1175,7 +1175,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                 }
             });
             shopOrder.setObligation(MathUtil.sub(shopOrder.getRealPay(), shopOrder.getReceiptAmount()).doubleValue());
-            if(998==shopOrder.getShopId()){
+            if (998 == shopOrder.getShopId()) {
                 shopOrder.setObligation(shopOrder.getTotalAmount());
             }
             shopOrder.setOrderProductList(orderProductList);

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

@@ -373,7 +373,7 @@ public class OrderClubServiceImpl implements OrderClubService {
             order.setStatus(31);
             order.setReceiptStatus(3);
         }
-        Integer count=0;
+        Integer count = 0;
         log.info("********************下单微信公众号消息推送***************************");
         if (0 == order.getSecondHandOrderFlag() && 0 == order.getRebateFlag() && !orderClubMapper.getProductOrder(order.getOrderId()).contains(6060) && order.getOrderType() != 0) {
             log.info("*******" + order.getSecondHandOrderFlag() + "**********" + order.getRebateFlag());
@@ -390,23 +390,22 @@ public class OrderClubServiceImpl implements OrderClubService {
                     name = StringUtils.strip(i.substring(0, 11), "[]");
                     name += "...";
                 }
-
-            String associateTitle = "订单已成功提交，等待付款！";
-            Double money=order.getPayTotalFee();
-            String orderno = orderClubMapper.getOrderNo(orderId);
-            String remarkText = "下单时间：" + order.getOrderTime() +"点击详情进行付款";
-            // 跳转到【小程序付款-选择支付方式页面】
-            String pagePath = "pages/user/order/order-details?type=share&orderId="+orderId;
-            for (String openid : openidList) {
-                // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
-                weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name,orderno, money, remarkText, pagePath);
-                count++;
+                String associateTitle = "订单已成功提交，等待付款！";
+                Double money = order.getPayTotalFee();
+                String orderno = orderClubMapper.getOrderNo(orderId);
+                String remarkText = "下单时间：" + order.getOrderTime() + "点击详情进行付款";
+                // 跳转到【小程序付款-选择支付方式页面】
+                String pagePath = "pages/user/order/order-details?type=share&orderId=" + orderId;
+                for (String openid : openidList) {
+                    // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接)
+                    weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name, orderno, money, remarkText, pagePath);
+                    count++;
+                }
+            } catch (Exception e) {
+                log.error("【订单发货通知】获取微信公众号access_token异常！", e);
             }
-        } catch (Exception e) {
-            log.error("【订单发货通知】获取微信公众号access_token异常！", e);
-        }
             //推送信息中心-交易物流
-            MessageCenter messageCenter=new MessageCenter();
+            MessageCenter messageCenter = new MessageCenter();
             messageCenter.setShopID(null);
             messageCenter.setClubID(order.getClubId());
             messageCenter.setUserType(1);
@@ -416,53 +415,47 @@ public class OrderClubServiceImpl implements OrderClubService {
             messageCenter.setContent(null);
             messageCenter.setTime(curDateStr);
             orderClubMapper.addMessageCenter(messageCenter);
-
-
-            log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderId);
+            log.info(">>>>>>>>>>>>>>>>>>>>>>" + orderId);
             log.info("********************确认订单短信消息推送***************************");
-            if(count<=0){
-                   ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(2);
-            executorService.schedule(new Runnable() {
-                @Override
-                public void run() {
+            if (count <= 0) {
+                ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(2);
+                executorService.schedule(new Runnable() {
+                    @Override
+                    public void run() {
 //                String orderno = orderClubMapper.getOrderNo(orderId);
-                    OrderVo orderVo=orderClubMapper.getOrderMess(orderId);
+                        OrderVo orderVo = orderClubMapper.getOrderMess(orderId);
 
-                    String bindMobile = baseMapper.getBindMobileByUserId(order.getBuyUserId());
-                    log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderId);
+                        String bindMobile = baseMapper.getBindMobileByUserId(order.getBuyUserId());
+                        log.info(">>>>>>>>>>>>>>>>>>>>>>" + orderId);
 
-                    log.info(">>>>>>>>>>>>>>>>>>>>>>"+orderVo.getProCount());
-                    String name=orderVo.getProName();
-                    if (name.length() > 10) {
-                        name = StringUtils.strip(name.substring(0, 11));
-                        name += "...";
-                    }
-                    if(orderVo.getPayFlag()==1 && orderVo.getOnlinePayFlag()==0){
-                        String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com");
-                        String content = "您已成功下单“"+ name +"”等"+orderVo.getProCount()+"件商品，订单编号："+orderVo.getOrderNo()+"订单等待支付，支付完成后采美将尽快安排发货。您可点击采美网址www.caimei365.com或使用微信小程序“采美采购商城”查看并支付订单。";
-                        boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
-                        if (!sendSms) {
-                            log.info("》》》》》》》》》》》》》》》》协销下单短信推送失败");
-                        }else {
-                            log.info("》》》》》》》》》》》》》》》》协销下单短信推送成功");
+                        log.info(">>>>>>>>>>>>>>>>>>>>>>" + orderVo.getProCount());
+                        String name = orderVo.getProName();
+                        if (name.length() > 10) {
+                            name = StringUtils.strip(name.substring(0, 11));
+                            name += "...";
+                        }
+                        if (orderVo.getPayFlag() == 1 && orderVo.getOnlinePayFlag() == 0) {
+                            String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com");
+                            String content = "您已成功下单“" + name + "”等" + orderVo.getProCount() + "件商品，订单编号：" + orderVo.getOrderNo() + "订单等待支付，支付完成后采美将尽快安排发货。您可点击采美网址www.caimei365.com或使用微信小程序“采美采购商城”查看并支付订单。";
+                            boolean sendSms = remoteCallService.getSendSms(1, 2, bindMobile, content);
+                            if (!sendSms) {
+                                log.info("》》》》》》》》》》》》》》》》协销下单短信推送失败");
+                            } else {
+                                log.info("》》》》》》》》》》》》》》》》协销下单短信推送成功");
+                            }
                         }
                     }
-                }
-            }, 300000, TimeUnit.MILLISECONDS);
-            }else {log.info("》》》》》推送了协销下单短信");}
-
-
+                }, 300000, TimeUnit.MILLISECONDS);
+            } else {
+                log.info("》》》》》推送了协销下单短信");
+            }
         }
-
-
-
         order.setUpdateDate(curDateStr);
         order.setConfirmTime(curDateStr);
         //确认订单状态
         order.setConfirmFlag(2);
         // 更新订单状态
         orderClubMapper.updateOrderStatus(order);
-
         return ResponseJson.success("确认订单成功！", null);
     }
 
@@ -525,7 +518,7 @@ public class OrderClubServiceImpl implements OrderClubService {
             });
         }
         //推送信息中心-取消订单
-        MessageCenter messageCenter=new MessageCenter();
+        MessageCenter messageCenter = new MessageCenter();
         messageCenter.setShopID(null);
         messageCenter.setClubID(order.getClubId());
         messageCenter.setUserType(1);
@@ -535,8 +528,6 @@ public class OrderClubServiceImpl implements OrderClubService {
         messageCenter.setContent("您的订单已成功取消！");
         messageCenter.setTime(curDateStr);
         orderClubMapper.addMessageCenter(messageCenter);
-
-
         // 退回 采美豆
         if (null != order.getUserBeans() && order.getUserBeans() > 0) {
             UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
@@ -573,13 +564,13 @@ public class OrderClubServiceImpl implements OrderClubService {
             }
         }
         //取消订单短信推送（取消推送）
-        if(orderClubMapper.getProductOrder(orderId).contains(6060)) {
+        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);
+                boolean sendSms = remoteCallService.getSendSms(1, 11, bindMobile, content);
                 if (!sendSms) {
                     log.info("取消订单推送失败，orderId>>>>" + orderId);
                 }
@@ -937,15 +928,15 @@ public class OrderClubServiceImpl implements OrderClubService {
      * @param orderId 订单Id
      */
     @Override
-    public ResponseJson<Map<String,Object>> getOrderShareInitProduct(Integer orderId) {
+    public ResponseJson<Map<String, Object>> getOrderShareInitProduct(Integer orderId) {
         List<OrderProductVo> orderProductList = orderCommonMapper.getOrderProductByOrderId(orderId);
         orderProductList.forEach(orderProduct -> orderProduct.setImage(ImageUtil.getImageUrl("product", orderProduct.getImage(), domain)));
         OrderVo order = orderCommonMapper.getOrderByOrderId(orderId);
         orderCommonService.setOrderStatus(order);
         HashMap<String, Object> result = new HashMap<>(2);
         orderCommonService.getDiscernReceiptAndSetOrder(order);
-        result.put("productList",orderProductList);
-        result.put("orderStatus",order.getStatus());
+        result.put("productList", orderProductList);
+        result.put("orderStatus", order.getStatus());
         //2021.12.14 去掉paybutton判断
 //        result.put("payButton", order.isPayButton());
         return ResponseJson.success(result);

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

@@ -719,7 +719,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
         if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {
             String shortLink = remoteCallService.getShortLink(8, 2, "https://www.caimei365.com/user/member.html?userId=" + userId);
             String content = "恭喜您成功开通采美平台超级会员，为期" + mouth + "个月，快戳采美网站链接www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
-            boolean sendSms = remoteCallService.getSendSms(2, bindMobile, content);
+            boolean sendSms = remoteCallService.getSendSms(3, 2, bindMobile, content);
             if (!sendSms) {
                 log.info("购买会员短信推送失败");
             }

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

@@ -1149,7 +1149,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 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);
+                boolean sendSms = remoteCallService.getSendSms(1, 6, bindMobile, content);
                 if (!sendSms) {
                     log.info("取消订单推送失败，orderId>>>>" + orderId);
                 }
@@ -1664,7 +1664,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                 String bindMobile = user.getBindMobile();
                 //B、【采美365】尊敬的会员XXX，您已成功购买”采美云上美博会“线下体验会门票1张，请尽快与您的专属客户经理预约体验时间，如已预约请忽略，体验预约电话：0755-22907771，退订回T
                 String content = "尊敬的会员" + userName + "，您已成功购买”采美云上美博会“线下体验会门票1张，请尽快与您的专属客户经理预约体验时间，如已预约请忽略，体验预约电话：0755-22907771，退订回T";
-                remoteCallService.getSendSms(23, bindMobile, content);
+                remoteCallService.getSendSms(3, 23, bindMobile, content);
             }
             if (75 == couponId) {
                 //A、【采美365】尊敬的会员XXX，您的房间预订成功，广州香格里拉大酒店3天2晚酒店套餐，豪华江景房2晚（含双早），酒店地址：广州市海珠区会展东路1号，凭此短信到酒店前台办理入住登记，入住时间：9月4日-6日，请按时入住酒店，如有问题请拨打客服电话：0755-22907771，退订回T
@@ -1672,14 +1672,14 @@ public class PayOrderServiceImpl implements PayOrderService {
                 String userName = user.getUserName();
                 String bindMobile = user.getBindMobile();
                 String content = "尊敬的会员" + userName + "，您的房间预订成功，广州香格里拉大酒店3天2晚酒店套餐，豪华江景房2晚（含双早），酒店地址：广州市海珠区会展东路1号，凭此短信到酒店前台办理入住登记，入住时间：9月27日-28日，请按时入住酒店，如有问题请拨打客服电话：0755-22907771，退订回T";
-                remoteCallService.getSendSms(23, bindMobile, content);
+                remoteCallService.getSendSms(3, 23, bindMobile, content);
                 try {
                     Thread.sleep(10000);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
                 String contentB = "尊敬的会员" + userName + "，您已成功购买”采美云上美博会“线下体验会门票1张，请尽快与您的专属客户经理预约体验时间，如已预约请忽略，体验预约电话：0755-22907771，退订回T";
-                remoteCallService.getSendSms(23, bindMobile, contentB);
+                remoteCallService.getSendSms(3, 23, bindMobile, contentB);
             }
         }
     }

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

@@ -68,7 +68,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
      * @param content 内容
      */
     @Override
-    public boolean getSendSms(int markId, String mobile, String content) {
+    public boolean getSendSms(Integer type, int markId, String mobile, String content) {
         AtomicBoolean returnValue = new AtomicBoolean(false);
         try {
             //测试环境手机号允许发短信
@@ -85,7 +85,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
                     Matcher matcher = pattern.matcher(mobile);
                     if (matcher.matches()) {
                         // 调用 ToolsFeign 发送短信
-                        String jsonStr = toolsFeign.getSendSms(mobile, content);
+                        String jsonStr = toolsFeign.getSendSms(type, mobile, content);
                         JSONObject parseObject = JSONObject.parseObject(jsonStr);
                         if (0 == parseObject.getInteger("code")) {
                             if (markId > 0) {
@@ -185,16 +185,13 @@ public class RemoteCallServiceImpl implements RemoteCallService {
         //17年之前的所有用户
         List<PushMessageUserVo> pushUsers = messagePushMapper.findOldUser();
         //https://www.caimei365.com/product/hot.html指向新品橱窗
-        String url = "https://www.caimei365.com/product/hot.html";
+        String url = "https://www.caimei365.com/page-370.html";
         List<String> list = new ArrayList<String>();
         list.add("15917362709");
-        list.add("15814011616");
-        list.add("13100721916");
-        list.add("15113936829");
         list.add("15827317748");
         list.add("18476937515");
         list.add("18605868824");
-        list.forEach(l->{
+        list.forEach(l -> {
             PushMessageUserVo pushMessageUserVo = new PushMessageUserVo();
             pushMessageUserVo.setMobile(l);
             pushUsers.add(pushMessageUserVo);
@@ -205,9 +202,10 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             p.setShortLink(link);
             p.setMarkId(23);
             messagePushMapper.insertNewLink(p);
-            String content = "亲，好久没登陆采美了，近期在找新项目吗？采美新品橱窗有多款院线产品和仪器，现在登陆采美https://www.caimei365.com/t/" +
-                    link + "，可获一张包邮券！退订回T";
-            getSendSms(23, p.getMobile(), content);
+
+            String content = "双11最后一天，错过再等一年！禾雅堂颜层水光仪仅1.6万、瑞漾医用耗材买十送一、买十送二，猛戳https://www.caimei365.com/t/" +
+                    link + "，退订回T";
+            getSendSms(3,23, p.getMobile(), content);
             log.info("userId-------------------->" + p.getUserId() + "发送手机号------------------------>" + p.getMobile() + "短信-------------->" + content);
         });
     }

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

@@ -1097,7 +1097,7 @@ public class SubmitServiceImpl implements SubmitService {
         log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增主订单(insert[cm_order])orderId：" + mainOrder.getOrderId());
 
         //推送信息中心-交易物流
-        MessageCenter messageCenter=new MessageCenter();
+        MessageCenter messageCenter = new MessageCenter();
         messageCenter.setShopID(null);
         messageCenter.setClubID(orderParamBo.getClubId());
         messageCenter.setUserType(1);
@@ -1628,7 +1628,7 @@ public class SubmitServiceImpl implements SubmitService {
                 }
                 String content = "您已成功下单“" + name + "...”等" + mainOrder.getProductCount() + "件商品，订单编号：" + mainOrder.getOrderNo() + "，订单等待支付，支付完成后采美将尽快安排发货。" +
                         "您可关注采美公众号或者访问采美微信小程序和网站查看并支付订单。平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
-                boolean sendSms = remoteCallService.getSendSms(3, orderParamBo.getBindMobile(), content);
+                boolean sendSms = remoteCallService.getSendSms(1, 3, orderParamBo.getBindMobile(), content);
                 if (!sendSms) {
                     log.info("下单推送失败，orderId>>>>" + mainOrder.getOrderId());
                 }

src/main/java/com/caimei365/order/task/DelayedSplittingTask.java

@@ -35,7 +35,7 @@ public class DelayedSplittingTask {
     /**
      * 优惠券下单查询,下了对应商品,送优惠券  2分钟一次
      */
-    @Scheduled(cron = "0 0/2 * * * ?")
+//    @Scheduled(cron = "0 0/2 * * * ?")
     public void couponCheck() {
         payOrderService.couponCheck();
     }

src/main/resources/mapper/MessagePushMapper.xml

@@ -20,11 +20,14 @@
         WHERE shortLink = #{shortLink}
     </select>
     <select id="findOldUser" resultType="com.caimei365.order.model.vo.PushMessageUserVo">
-        SELECT userID, clubID, contractMobile as mobile
-        FROM club
-        WHERE ADDTIME <![CDATA[ < ]]> '2017-01-01 00:00:00'
-          AND clubId > 1037
-          AND contractMobile IS NOT NULL
-          AND contractMobile NOT LIKE '%-%'
+        SELECT c.userID, c.clubID, c.contractMobile AS mobile
+        FROM club c
+        LEFT JOIN cm_short_link csl ON c.clubId=csl.clubid
+        WHERE c.ADDTIME <![CDATA[ < ]]> '2017-01-01 00:00:00'
+        AND c.clubId > 1037
+        AND c.contractMobile IS NOT NULL
+        AND c.contractMobile NOT LIKE '%-%'
+        AND c.status !=94
+        AND csl.viewTime IS NULL
     </select>
 </mapper>