| @@ -66,10 +66,12 @@ public class Test { | |||||
| private MockMvc mockMvc; | private MockMvc mockMvc; | ||||
| @Autowired | @Autowired | ||||
| MqBaseProducer mqBaseProducer; | MqBaseProducer mqBaseProducer; | ||||
| @Autowired | |||||
| MsgReSendSchedu | |||||
| @Autowired | @Autowired | ||||
| private WxBillSettleService wxBillSettleService; | private WxBillSettleService wxBillSettleService; | ||||
| @@ -148,10 +150,7 @@ public class Test { | |||||
| @org.junit.Test | @org.junit.Test | ||||
| public void testmq2(){ | public void testmq2(){ | ||||
| WxBillAll wxBillAll = new WxBillAll(); | |||||
| wxBillAll.setTenantId("456"); | |||||
| wxBillAll.setMerchantId(324754110547066880l); | |||||
| System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); | |||||
| MsgReSendSchedule. | |||||
| } | } | ||||
| @org.junit.Test | @org.junit.Test | ||||
| @@ -24,8 +24,8 @@ public class MsgReSendSchedule { | |||||
| @Autowired | @Autowired | ||||
| private MqBaseProducer mqBaseProducer; | private MqBaseProducer mqBaseProducer; | ||||
| @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 | |||||
| //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | |||||
| //@Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 | |||||
| @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 | |||||
| public void msgReSend() { | public void msgReSend() { | ||||
| //消息重发 | //消息重发 | ||||
| WxMsgRecord msgRecord = new WxMsgRecord(); | WxMsgRecord msgRecord = new WxMsgRecord(); | ||||
| @@ -54,7 +54,12 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService | |||||
| record.setSettleMoney(-record.getSettleMoney()); | record.setSettleMoney(-record.getSettleMoney()); | ||||
| } | } | ||||
| String str = EnumSettleRecordWay.getEnum(record.getSettleWay()).getMessage()+"收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; | |||||
| String str; | |||||
| if(EnumSettleRecordWay.OTHER.getCode().equals(record.getSettleWay())){ | |||||
| str = EnumSettleRecordWay.getEnum(record.getRemark()+"-收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; | |||||
| }else{ | |||||
| str = EnumSettleRecordWay.getEnum(record.getSettleWay()).getMessage()+"收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; | |||||
| } | |||||
| record.setDetail(str); | record.setDetail(str); | ||||
| if(mallUserInfo != null) { | if(mallUserInfo != null) { | ||||
| record.setUserid(mallUserInfo.getId()); | record.setUserid(mallUserInfo.getId()); | ||||