呵呵优惠券短信通知3

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

@@ -20,6 +20,6 @@ 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/user/service/RemoteCallService.java

@@ -12,9 +12,10 @@ public interface RemoteCallService {
      * 请求发短信接口
      *
      * @param markId  短信类型
+     * @param type    短信类型:1通知，2验证码，3营销
      * @param mobile  手机号
      * @param content 内容
      * @return
      */
-    boolean remoteSendSms(int markId, String mobile, String content);
+    boolean remoteSendSms(int markId, Integer type, String mobile, String content);
 }

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -153,7 +153,7 @@ public class BaseServiceImpl implements BaseService {
             }
             // 找回密码
             String content = "验证码"+randomCode+"，您正在尝试修改登录密码，请妥善保管账户信息。";
-            sendFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+            sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
             codeTypeTxt = "找回密码";
         } else if (2 == activateCodeType || 3 == activateCodeType) {
             if (null != userId && userId > 0) {
@@ -162,12 +162,12 @@ public class BaseServiceImpl implements BaseService {
             if (2 == activateCodeType) {
                 // 机构用户(自主)注册
                 String content = "欢迎注册采美365网，您的短信验证码为："+randomCode+"，该验证码 5 分钟内有效，请勿泄漏于他人。";
-                sendFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+                sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
                 codeTypeTxt = "机构(自主)注册";
             } else if (3 == activateCodeType) {
                 // 供应商(自主)注册
                 String content = "欢迎注册采美365网供应商账号，您的短信验证码为："+randomCode+"，该验证码 5 分钟内有效，请勿泄漏于他人。";
-                sendFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+                sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
                 codeTypeTxt = "供应商(自主)注册";
             } else {
                 return ResponseJson.error("参数错误：activateCodeType");
@@ -175,7 +175,7 @@ public class BaseServiceImpl implements BaseService {
         } else if (4 == activateCodeType) {
             // 您正在更换联系人手机号，您的验证码为：${code}。
             String content = "验证码"+randomCode+"，您正在尝试变更重要信息，请妥善保管账户信息。";
-            sendFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+            sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
             codeTypeTxt = "更换联系人(旧手机号验证码)";
         } else if (5 == activateCodeType) {
             if (null != userId && userId > 0) {
@@ -183,7 +183,7 @@ public class BaseServiceImpl implements BaseService {
             }
             // 您正在更换联系人手机号，您的验证码为：${code}。
             String content = "验证码"+randomCode+"，您正在尝试变更重要信息，请妥善保管账户信息。";
-            sendFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+            sendFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
             codeTypeTxt = "更换联系人(新手机号验证码)";
         } else {
             return ResponseJson.error("参数错误：activateCodeType");
@@ -264,10 +264,10 @@ public class BaseServiceImpl implements BaseService {
         String userName = baseMapper.getUserNameByUserId(userId);
         // 欢迎成为${name}的运营人员，您的邀请码为${code}。
         String content = "欢迎成为"+userName+"的运营人员，您的邀请码为"+randomCode+"。您可使用以下两种方式激活您的身份：1. 您可在微信搜索“采美采购商城”小程序，使用邀请码登录并绑定微信；2. 进入“采美采购商城”小程序后，使用邀请码登录并绑定微信。绑定微信后，您可通过微信授权直接登录“采美采购商城”小程序或微信扫码直接登录采美365网站。";
-        boolean smsFlag = isBeta || remoteCallService.remoteSendSms(0, mobile, content);
+        boolean smsFlag = isBeta || remoteCallService.remoteSendSms(0, 1, mobile, content);
         if (!smsFlag) {
             // 短信发送失败重试一次
-            smsFlag = remoteCallService.remoteSendSms(0, mobile, content);
+            smsFlag = remoteCallService.remoteSendSms(0, 1, mobile, content);
         }
         if (smsFlag) {
             redisService.set("code:" + mobile, randomCode, 1800L);

src/main/java/com/caimei365/user/service/impl/HeHeServiceImpl.java

@@ -110,7 +110,7 @@ public class HeHeServiceImpl implements HeHeService {
                         // 查询优惠券金额
                         Double couponAmount = heHeMapper.getCouponAmount(couponId);
                         String content = "恭喜您成功注册登录。现赠送" + couponAmount + "元优惠券到您的领券中心，请赶紧登录呵呵商城小程序领取下单吧。退订回T";
-                        boolean result = remoteCallService.remoteSendSms(17, heHeUserDto.getMobile(), content);
+                        boolean result = remoteCallService.remoteSendSms(17, 3, heHeUserDto.getMobile(), content);
                         log.info("【呵呵新人券派送】mobile:" + heHeUserDto.getMobile() + ",result:" + result);
                     });
                     heHeUser = heHeMapper.findHeHeUserByMobile(heHeUserDto.getMobile());
@@ -130,7 +130,7 @@ public class HeHeServiceImpl implements HeHeService {
                             // 查询优惠券金额
                             Double couponAmount = heHeMapper.getCouponAmount(couponId);
                             String content = "恭喜您成功邀请一位好友注册登录，现赠送"+couponAmount+"元优惠券到您的领券中心，请赶紧登录呵呵商城小程序领取下单吧。退订回T";
-                            boolean result = remoteCallService.remoteSendSms(18, mobile, content);
+                            boolean result = remoteCallService.remoteSendSms(18, 3, mobile, content);
                             log.info("【呵呵好友邀请券派送】mobile:" + mobile + ",result:" + result);
                         });
                     }
@@ -145,10 +145,10 @@ public class HeHeServiceImpl implements HeHeService {
     public ResponseJson<String> sendVerificationCode(String mobile) {
         String randomCode = CodeUtil.generateCodeInt(6);
         String content = "您“呵呵商城”小程序的验证码为："+randomCode+"，验证码 5 分钟内有效。";
-        boolean smsFlag = remoteCallService.remoteSendSms(0, mobile, content);
+        boolean smsFlag = remoteCallService.remoteSendSms(0, 1, mobile, content);
         if (!smsFlag) {
             // 短信发送失败重试一次
-            remoteCallService.remoteSendSms(0, mobile, content);
+            remoteCallService.remoteSendSms(0, 1, mobile, content);
         }
         log.info("呵呵商城注册验证码:" + randomCode);
         redisService.set("heCode:" + mobile, randomCode, 300L);

src/main/java/com/caimei365/user/service/impl/OperationServiceImpl.java

@@ -82,7 +82,7 @@ public class OperationServiceImpl implements OperationService {
             if (StringUtils.isNotEmpty(mobile)) {
                 // 欢迎成为${name}的运营人员，您的邀请码为${code}。
                 String content = "欢迎成为"+name+"的运营人员，您的邀请码为"+invitationCode+"。您可使用以下两种方式激活您的身份：1. 您可在微信搜索“采美采购商城”小程序，使用邀请码登录并绑定微信；2. 进入“采美采购商城”小程序后，使用邀请码登录并绑定微信。绑定微信后，您可通过微信授权直接登录“采美采购商城”小程序或微信扫码直接登录采美365网站。";
-                remoteCallService.remoteSendSms(0, mobile, content);
+                remoteCallService.remoteSendSms(0, 1, mobile, content);
                 log.info("欢迎成为"+ name +"的运营人员，您的邀请码为:" + invitationCode);
             }
         }
@@ -139,7 +139,7 @@ public class OperationServiceImpl implements OperationService {
             if (StringUtils.isNotEmpty(mobile)) {
                 // 欢迎成为${name}的运营人员，您更新的邀请码为${code}。
                 String content = "欢迎成为"+name+"的运营人员，您的邀请码为"+invitationCode+"。您可使用以下两种方式激活您的身份：1. 您可在微信搜索“采美采购商城”小程序，使用邀请码登录并绑定微信；2. 进入“采美采购商城”小程序后，使用邀请码登录并绑定微信。绑定微信后，您可通过微信授权直接登录“采美采购商城”小程序或微信扫码直接登录采美365网站。";
-                remoteCallService.remoteSendSms(0, mobile, content);
+                remoteCallService.remoteSendSms(0, 1, mobile, content);
                 log.info("欢迎成为"+ name +"的运营人员，您更新的邀请码为:" + invitationCode);
             }
             flag = operationMapper.updateOperation(operation);

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -216,10 +216,10 @@ public class RegisterServiceImpl implements RegisterService {
         registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         // 注册成功短信
         String content = "注册成功！您可以通过手机号"+clubRegisterDto.getBindMobile()+"登录。";
-        boolean smsFlag = remoteCallService.remoteSendSms(0, clubRegisterDto.getBindMobile(), content);
+        boolean smsFlag = remoteCallService.remoteSendSms(0, 1, clubRegisterDto.getBindMobile(), content);
         if (!smsFlag) {
             // 短信发送失败重试一次
-            remoteCallService.remoteSendSms(0, clubRegisterDto.getBindMobile(), content);
+            remoteCallService.remoteSendSms(0, 1, clubRegisterDto.getBindMobile(), content);
         }
         /*
             绑定微信，成为机构运营人员
@@ -665,10 +665,10 @@ public class RegisterServiceImpl implements RegisterService {
         }
         // 发送短信
         String content = "欢迎成为采美机构用户，您的登录账号为："+mobile+"，初始密码为：cm"+randomCode+"，您可使用该账号密码登录采美365网和“采美采购商城”小程序。";
-        boolean smsFlag = remoteCallService.remoteSendSms(0, mobile, content);
+        boolean smsFlag = remoteCallService.remoteSendSms(0, 1, mobile, content);
         if (!smsFlag) {
             // 短信发送失败重试一次
-            remoteCallService.remoteSendSms(0, mobile, content);
+            remoteCallService.remoteSendSms(0, 1, mobile, content);
         }
         // 打印短信内容
         log.info(logTxt);
@@ -1112,7 +1112,7 @@ public class RegisterServiceImpl implements RegisterService {
             message = "恭喜您成功开通采美平台超级会员，为期" + userPackageTime + "个月，快戳采美网站链接 www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
             String mobile = vipMapper.findMobile(userId);
             if (mobile != null && mobile != "") {
-                remoteCallService.remoteSendSms(2, mobile, message);
+                remoteCallService.remoteSendSms(2, 1, mobile, message);
             }
         } else if (repayFlag == 1) {
             //有效期内续费
@@ -1134,10 +1134,10 @@ public class RegisterServiceImpl implements RegisterService {
             setHistory(superVip, beginTime);
             //发短信
             String shortLink = getShortLink(8, 2, "https://www.caimei365.com/user/member.html?userId=" + userId);
-            message = "恭喜您成功续费采美平台超级会员，为期" + userPackageTime + "个月，快戳采美网站链接 www-b.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
+            message = "恭喜您成功续费采美平台超级会员，为期" + userPackageTime + "个月，快戳采美网站链接 www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
             String mobile = vipMapper.findMobile(userId);
             if (mobile != null && mobile != "") {
-                remoteCallService.remoteSendSms(2, mobile, message);
+                remoteCallService.remoteSendSms(2, 3, mobile, message);
             }
         } else if (repayFlag == -1) {
             //过期续费
@@ -1165,7 +1165,7 @@ public class RegisterServiceImpl implements RegisterService {
             message = "恭喜您成功续费采美平台超级会员，为期" + userPackageTime + "个月，快戳采美网站链接 www.caimei365.com/t/" + shortLink + "或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯。退订回T";
             String mobile = vipMapper.findMobile(userId);
             if (mobile != null && mobile != "") {
-                remoteCallService.remoteSendSms(2, mobile, message);
+                remoteCallService.remoteSendSms(2, 3, mobile, message);
             }
         }
         log.info(userId + "消费采美豆" + multiply + "会员到期时间至" + cal.getTime());

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

@@ -32,6 +32,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
     private ToolsFeign toolsFeign;
     @Resource
     private MessagePushMapper messagePushMapper;
+
     /**
      * 请求发短信接口
      *
@@ -40,7 +41,7 @@ public class RemoteCallServiceImpl implements RemoteCallService {
      * @param content 内容
      */
     @Override
-    public boolean remoteSendSms(int markId, String mobile, String content) {
+    public boolean remoteSendSms(int markId, Integer type, String mobile, String content) {
         AtomicBoolean returnValue = new AtomicBoolean(false);
         try {
             //测试环境手机号允许发短信
@@ -56,10 +57,10 @@ 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 ) {
+                        if (0 == parseObject.getInteger("code")) {
+                            if (markId > 0) {
                                 // 保存短信发送条数+count
                                 messagePushMapper.updateSmsSendCount(markId, 1);
                             }