Browse Source

[短信][修改][短信类型区分]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
c0aff891c4
8 changed files with 53 additions and 15 deletions
  1. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  2. +36
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumVerifyCode.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
  5. +2
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  6. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
  7. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
  8. +4
    -3
      mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java

+ 3
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java View File

@@ -38,9 +38,9 @@ public class WxMsgValidationcodeController extends BaseController {
@GetMapping("sendvalidationcode")
@ApiImplicitParams({
@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "type", value = "场景", dataType = "Integer", paramType = "query", required = true),
@ApiImplicitParam(name = "type", value = "场景", dataType = "String", paramType = "query", required = true),
@ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)})
public ResultData sendvalidationcode(String phone, Integer type, String appid) {
public ResultData sendvalidationcode(String phone, String type, String appid) {

WxMerchantBUser userQ = new WxMerchantBUser();
userQ.setAppId(appid);
@@ -67,7 +67,7 @@ public class WxMsgValidationcodeController extends BaseController {
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.setTenantId(user.getTenantId());
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setType(Integer.valueOf(type));
wxMsgValidationcode.setAppid(appid);
return wxMsgValidationcodeService.sendvalidationcode(wxMsgValidationcode);
}


+ 36
- 0
mallinkService/src/main/java/com/iformall/enums/EnumVerifyCode.java View File

@@ -0,0 +1,36 @@
package com.iformall.enums;

/**
* Created by Stormeye on 2018/08/09.
*/
public enum EnumVerifyCode {

YES(1, "是"),
NO(0, "否")
;

public static EnumVerifyCode getEnum(Integer code) {
for (EnumVerifyCode value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumVerifyCode(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java View File

@@ -11,6 +11,7 @@ import com.iformall.domain.po.WxMallApply;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.domain.po.WxMsgValidationcode;
import com.iformall.domain.po.WxMsgValidationcodeModel;
import com.iformall.enums.EnumVerifyCode;
import com.iformall.mapper.WxMallApplyMapper;
import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.mapper.WxMsgValidationcodeMapper;
@@ -118,7 +119,7 @@ public class WxMallApplyServiceImpl implements WxMallApplyService {
wxMsgValidationcode.setMsg(msg);

String notifyUrl = wxMsgConfig.getNotifyurl();
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl);
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl,EnumVerifyCode.YES.getCode().toString());
JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();



+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java View File

@@ -10,6 +10,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.domain.po.WxMsgModel;
import com.iformall.enums.EnumMsgModelStatus;
import com.iformall.enums.EnumVerifyCode;
import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.mapper.WxMsgModelMapper;
import com.iformall.service.WxMsgModelService;
@@ -70,7 +71,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
}

String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature,
content, wxMsgConfig.getModelnotifyurl());
content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.NO.getCode().toString());
JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();
if (ret.equals(EnumMsgModelStatus.SUCCESS.getCode().toString())) {


+ 2
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java View File

@@ -11,10 +11,7 @@ import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxMsg;
import com.iformall.domain.po.WxMsgCallback;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.enums.EnumMsgSend;
import com.iformall.enums.EnumMsgSendSetTime;
import com.iformall.enums.EnumMsgSendStatus;
import com.iformall.enums.EnumMsgStatus;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCUserBasicInfoMapper;
import com.iformall.mapper.WxMsgCallbackMapper;
@@ -261,7 +258,7 @@ public class WxMsgServiceImpl implements WxMsgService {
String signature = wxMsg.getSignature();
String msg = wxMsg.getMsg();
String notifyUrl = wxMsgConfig.getNotifyurl();
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl);
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl,EnumVerifyCode.NO.getCode().toString());
JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();
String batchNo = jsonObjectResult.get("data").toString();


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java View File

@@ -10,6 +10,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.domain.po.WxMsgValidationcodeModel;
import com.iformall.enums.EnumMsgModelStatus;
import com.iformall.enums.EnumVerifyCode;
import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.mapper.WxMsgValidationcodeModelMapper;
import com.iformall.service.WxMsgValidationcodeModelService;
@@ -71,7 +72,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM
}

}
String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl());
String result = WiwideUtil.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.YES.getCode().toString());

JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java View File

@@ -9,6 +9,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumMsgSendStatus;
import com.iformall.enums.EnumVerifyCode;
import com.iformall.mapper.*;
import com.iformall.service.WxMsgValidationcodeService;
import com.iformall.utils.*;
@@ -120,7 +121,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic
wxMsgValidationcode.setMsg(msg);

String notifyUrl = wxMsgConfig.getNotifyurl();
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl);
String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString());
JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();
String batchNo = jsonObjectResult.get("data").toString();


+ 4
- 3
mallinkService/src/main/java/com/iformall/utils/WiwideUtil.java View File

@@ -17,14 +17,14 @@ public class WiwideUtil {
private static final String addTemplateUrl = "https://webapp.wiwide.com/apisms/addtemplate";
private static final String smsSendUrl = "https://webapp.wiwide.com/apisms/send";

public static String addTemplate(String secret, String bid, String publickey, String signature, String content, String notifyUrl) {
public static String addTemplate(String secret, String bid, String publickey, String signature, String content, String notifyUrl,String verifysms) {
//请求api数据排序
TreeMap<String, String> message = new TreeMap<>();
message.put("bid", bid);
message.put("signature", signature);
message.put("content", content);
message.put("notify_url",notifyUrl);
message.put("verifysms","1");
message.put("verifysms",verifysms);

StringBuilder sb = new StringBuilder();
Set<Map.Entry<String, String>> entries = message.entrySet();
@@ -56,13 +56,14 @@ public class WiwideUtil {
}

public static String sendMsg(String secret, String bid, String publickey,
String phone, String signature, String msg, String notifyUrl) {
String phone, String signature, String msg, String notifyUrl,String verifysms) {
TreeMap<String, String> message = new TreeMap<>();
message.put("bid", bid);
message.put("phone", phone);
message.put("signature", signature);
message.put("msg", msg);
message.put("notify_url", notifyUrl);
message.put("verifysms",verifysms);

StringBuilder sb = new StringBuilder();
Set<Map.Entry<String, String>> entries = message.entrySet();


Loading…
Cancel
Save