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 f7293bbbb..e6c52e3f8 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -9,6 +9,7 @@ import com.iformall.mapper.WxBillSettleMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.utils.Constant; +import com.iformall.utils.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; @@ -142,5 +143,11 @@ public class Test { mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } - + @org.junit.Test + public void testmq2(){ + WxBillAll wxBillAll = new WxBillAll(); + wxBillAll.setTenantId("456"); + wxBillAll.setMerchantId(324754110547066880l); + System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 1249dbfb7..f3fedadf9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -196,13 +196,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { } List> maps = wxBillAllMapper.listData(wxBillAll); for (Map map:maps) { - Integer billType = (Integer)map.get("billTypeValue"); + Integer billType = ((Long)map.get("billTypeValue")).intValue(); if(EnumBillType.SETTLE.getCode().equals(billType)){ - Long rp = (Long)map.get("receive_pay"); + BigDecimal rp = (BigDecimal)map.get("receivePay"); WxBillSettle query = new WxBillSettle(); query.setId((Long)map.get("id")); Long sum = wxBillSettleRecordMapper.getSumMoneyBySettleId(query); - map.put("owe",rp-sum); + map.put("owe",rp.subtract(new BigDecimal(sum))); } } return new ResultData(maps);