diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index 99c4488..fdb771f 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -23,6 +23,7 @@ import com.xdadan.erp.oms.common.core.domain.AjaxResult; import com.xdadan.erp.oms.common.core.redis.RedissonService; import com.xdadan.erp.oms.common.enums.BusinessType; import com.xdadan.erp.oms.common.utils.DateUtils; +import com.xdadan.erp.oms.domain.EmisSmsSendRecord; import com.xdadan.erp.oms.domain.exception.EmisBizError; import com.xdadan.erp.oms.domain.vo.AddressParseResult; import com.xdadan.erp.oms.service.*; @@ -78,7 +79,6 @@ public class Oms2cCommonController extends BaseController @Autowired private WxMaService wxMaService; - @Autowired private OmsBaseService omsBaseService; @@ -290,21 +290,17 @@ public class Oms2cCommonController extends BaseController * */ @Log(title = "发送小程序通知", businessType = BusinessType.OTHER) - @RequestMapping(value = "/sendWxSappNotifyToUser") - public AjaxResult sendWxSappNotifyToUser(String billCode,String openId,String tplId,String paramStr) + @RequestMapping(value = "/sendWxSappNotify") + public AjaxResult sendWxSappNotify(String billCode) { - WxMaSubscribeMessage wxMaSubscribeMessage = WxMaSubscribeMessage.builder() - .toUser(openId) - .templateId(tplId) - .page("pages/post/query?billCode="+billCode) - .build(); - JSONObject jObjParam = JSONObject.parseObject(paramStr); - - jObjParam.forEach( (k,v)-> { wxMaSubscribeMessage.addData(new WxMaSubscribeMessage.MsgData(k, (String)v));} ); - try { - wxMaService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage); - } catch (WxErrorException e) { - e.printStackTrace(); + log.error("==>sendWxSappNotify start billCode:"+billCode; + try{ + EmisSmsSendRecord emisSmsSendRecord=new EmisSmsSendRecord(); + emisSmsSendRecord.setBillCode(billCode); + omsBaseService.autoDoWxSappNotifySend(emisSmsSendRecord); + }catch(Exception ex){ + ex.printStackTrace(); + log.error("==>sendWxSappNotify exception:"+ex.getMessage()); } return AjaxResult.success("发送成功"); @@ -322,7 +318,8 @@ public class Oms2cCommonController extends BaseController // 加锁查询 redissonService.lock(lockKey,300); try{ - omsBaseService.autoDoWxSappNotifySend(); + EmisSmsSendRecord emisSmsSendRecord=new EmisSmsSendRecord(); + omsBaseService.autoDoWxSappNotifySend(emisSmsSendRecord); }catch(Exception ex){ ex.printStackTrace(); log.error("triggerSendWxSappNotify exception:"+ex.getMessage()); diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisSmsSendRecordMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisSmsSendRecordMapper.java index d653469..cfbdf68 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisSmsSendRecordMapper.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisSmsSendRecordMapper.java @@ -29,7 +29,7 @@ public interface EmisSmsSendRecordMapper extends BaseMapper * 查询列表 * @return 集合 */ - public List selectWxSappNotifyList(); + public List selectWxSappNotifyList(EmisSmsSendRecord emisSmsSendRecord); public int updateWxSappNotifyStatus(EmisSmsSendRecord emisSmsSendRecord); diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java index 4333673..6760133 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/OmsBaseService.java @@ -67,9 +67,9 @@ public class OmsBaseService { /** * 通知发送发送 */ - public void autoDoWxSappNotifySend() { + public void autoDoWxSappNotifySend(EmisSmsSendRecord emisSmsSendRecord) { - List list = emisSmsSendRecordMapper.selectWxSappNotifyList(); + List list = emisSmsSendRecordMapper.selectWxSappNotifyList(emisSmsSendRecord); if(!CollectionUtil.isEmpty(list)){ for(EmisSmsSendRecord dt:list){ log.error("===>Start 发送微信通知:"+dt.getBillCode()+","+dt.getPhone()+" :smsType:"+dt.getSmsType()); diff --git a/emis-oms-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml index d50894e..a86fcb5 100644 --- a/emis-oms-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml +++ b/emis-oms-biz/src/main/resources/mapper/EmisSmsSendRecordMapper.xml @@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" del_flag='0' and wx_notify_status='0' and create_time ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY) and create_time SUBDATE(now(),INTERVAL 2 hour) + and bill_code = #{billCode} order by create_time desc limit 300