diff --git a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java index aba63e9f2..95a7cde0a 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -66,10 +66,12 @@ public class Test { private MockMvc mockMvc; - @Autowired MqBaseProducer mqBaseProducer; + @Autowired + MsgReSendSchedu + @Autowired private WxBillSettleService wxBillSettleService; @@ -148,10 +150,7 @@ public class Test { @org.junit.Test 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 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index ac009a214..73cad0f16 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -24,8 +24,8 @@ public class MsgReSendSchedule { @Autowired private MqBaseProducer mqBaseProducer; - @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 - //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + //@Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 + @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void msgReSend() { //消息重发 WxMsgRecord msgRecord = new WxMsgRecord(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java index 78c924715..e307eac5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -54,7 +54,12 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService 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); if(mallUserInfo != null) { record.setUserid(mallUserInfo.getId());