Browse Source

duanxinbug

release_toaliyun_real
xhxu 5 years ago
parent
commit
73bd247652
4 changed files with 8 additions and 8 deletions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java
  4. +4
    -4
      mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java View File

@@ -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;
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java View File

@@ -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());





+ 1
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java View File

@@ -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();


+ 4
- 4
mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml View File

@@ -19,14 +19,14 @@
<result column="modelnotifyurl" jdbcType="VARCHAR" property="modelnotifyurl" />
<result column="verifynotifyurl" jdbcType="VARCHAR" property="verifynotifyurl" />
<result column="appid" jdbcType="VARCHAR" property="appid" />
<result column="isAliyunSMS" jdbcType="SMALLINT" property="isAliyunSMS" />
<result column="sms_channel" jdbcType="SMALLINT" property="smsChannel" />


</resultMap>
<sql id="allColumns">
`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`
</sql>

<sql id="dynamicWhereConditions">
@@ -104,8 +104,8 @@

</if>

<if test=" null != isAliyunSMS ">
and `appid` = #{isAliyunSMS}
<if test=" null != smsChannel ">
and `sms_channel` = #{smsChannel}

</if>



Loading…
Cancel
Save