Просмотр исходного кода

[修改][结算单][优化备注展示]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
2ea03a5e49
3 измененных файлов: 12 добавлений и 8 удалений
  1. +4
    -5
      mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
  2. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java

+ 4
- 5
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


+ 2
- 2
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();


+ 6
- 1
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());


Загрузка…
Отмена
Сохранить