diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
index 43f846037..8d5eb10d3 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
@@ -44,7 +44,7 @@ public class WxMsgConfig extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="appid",name="appid")
private String appid;
- @io.swagger.annotations.ApiModelProperty(value="是否阿里云发短信1:是;0:否",name="isAliyunSMS")
- private Integer isAliyunSMS;
+ @io.swagger.annotations.ApiModelProperty(value="发短信渠道0:wiwidi; 11:aliyun",name="smsChannel")
+ private Integer smsChannel;
}
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
index 86c9ded93..c433a41ce 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
@@ -103,7 +103,7 @@ public class SendCallBackSmsServiceImpl implements MsgSendService {
*/
String result = SMSFactory.sendSms(secret, bid, publickey, phone, signature, msg, notifyUrl,
EnumVerifyCode.NO.getCode().toString(), modelId,
- null,wxMsgModel.getModelCode(),Long.toString(record.getId()),wxMsgConfig.getIsAliyunSMS());
+ null,wxMsgModel.getModelCode(),Long.toString(record.getId()),wxMsgConfig.getSmsChannel());
diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
index b46aa872d..5597c8297 100644
--- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
@@ -102,7 +102,7 @@ public class SendSmsServiceImpl implements MsgSendService {
String result = SMSFactory.sendSms(secret, bid, publickey, phone, signature, msg, notifyUrl,
EnumVerifyCode.YES.getCode().toString(), modelId,
JSON.toJSONString(record.getDynamicContentMap()),wxMsgValidationcodeModel.getModelCode(),
- id,wxMsgConfig.getIsAliyunSMS());
+ id,wxMsgConfig.getSmsChannel());
JSONObject jsonObjectResult = JSONObject.parseObject(result);
String ret = jsonObjectResult.get("ret").toString();
String batchNo = jsonObjectResult.get("data").toString();
diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
index d42040b64..7f99ab969 100644
--- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml
@@ -19,14 +19,14 @@
-
+
`id`,`tenant_id`,`parent_tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,
- `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid`,`isAliyunSMS`
+ `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid`,`sms_channel`
@@ -104,8 +104,8 @@
-
- and `appid` = #{isAliyunSMS}
+
+ and `sms_channel` = #{smsChannel}