Procházet zdrojové kódy

Merge tag 'refs/tags/jenkins-back-end-1162' into release

develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
release_toaliyun_real
luozukai před 7 roky
rodič
revize
3e9acf5d8b
3 změnil soubory, kde provedl 21 přidání a 20 odebrání
  1. +18
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java
  2. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 18
- 18
mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java Zobrazit soubor

@@ -35,30 +35,30 @@ public class WxMsgRecordController extends BaseController {
private SendCallBackSmsServiceImpl msgSendService;


// @GetMapping(value = "/test")
// public ResultData test() throws Exception{
// String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00");
// WxMsg wxMsg = new WxMsg();
// wxMsg.setIsright(0);
// wxMsg.setSendtime(systemTime);
// wxMsg.setId(270060355273621504l);
// List<WxMsg> list = wxMsgMapper.findList(wxMsg);
// logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list));
// for (WxMsg msg : list) {
// //sendmsg(msg);
// msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
// msg.setReceiver(msg.getPhones());
// mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null);
// }
//
@GetMapping(value = "/test")
public ResultData test(Long id) throws Exception{
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00");
WxMsg wxMsg = new WxMsg();
wxMsg.setIsright(0);
wxMsg.setSendtime(systemTime);
wxMsg.setId(id);
List<WxMsg> list = wxMsgMapper.findList(wxMsg);
logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list));
for (WxMsg msg : list) {
//sendmsg(msg);
msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
msg.setReceiver(msg.getPhones());
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null);
}
// String s = "{\"tenantId\":\"456\",\"uuid\":\"0a410e4e-c0ef-461e-bea8-7bd222e7c7b7\",\"delayTimeLevel\":0,\"id\":270060355273621504,\"modelId\":220401934081720320,\"msg\":\"狂欢双十一:更多礼品等你来领取\",\"sendtime\":\"2019-03-25 16:00:00\",\"createtime\":\"2019-03-25 15:30:16\",\"expectSendNumber\":1,\"phones\":\"18601973448\",\"signature\":\"富茂科技\",\"isright\":0,\"name\":\"狂欢双十一\",\"excelpath\":\"\",\"label\":\"\",\"status\":0,\"way\":1}";
// WxMsg wxMsg = (WxMsg) JsonUtil.readValue(s,WxMsg.class);
// wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
// wxMsg.setReceiver("18601973448");
// wxMsg.setTenantId("456");
// msgSendService.send(wxMsg);
// return new ResultData();
// }
return new ResultData();
}

/**
* 重新发送失败的消息


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java Zobrazit soubor

@@ -49,8 +49,8 @@ public class MsgSendingSchedule {
logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list));
for (WxMsg msg : list) {
//sendmsg(msg);
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
wxMsg.setReceiver(msg.getPhones());
msg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
msg.setReceiver(msg.getPhones());
mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),null);
}
logger.info("sendmsg定时任务结束");


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Zobrazit soubor

@@ -180,6 +180,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {

WxLevelConfig wxLevelConfig = new WxLevelConfig();
wxLevelConfig.setTenantId(wxMerchant.getTenantId());
wxLevelConfig.setSortColumns(WxLevelConfig.Field.Points_ASC);
wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig));

return wxMerchant;


Načítá se…
Zrušit
Uložit