From 03c91e64daf23784188f868cde560746b219786f Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 11 Sep 2019 14:50:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E8=B7=B3=E7=82=B9=E7=8E=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/iformall/service/test/Test.java | 9 +++++++++ .../com/iformall/service/impl/WxPayBillServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) 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 e6c52e3f8..aba63e9f2 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -80,6 +80,9 @@ public class Test { @Autowired private WxBillSettleRecordService wxBillSettleRecordService; + @Autowired + private WxBillPropertyService wxBillPropertyService; + @Before public void setUp() { mockHttpServletRequest = new MockHttpServletRequest(webApplicationContext.getServletContext()); @@ -150,4 +153,10 @@ public class Test { wxBillAll.setMerchantId(324754110547066880l); System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); } + + @org.junit.Test + public void testPro(){ + System.out.println("--------"+JsonUtil.obj2Json(wxBillPropertyService.detail(329481088662077445l))); + + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index 86f8025e9..be45ebdb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -105,7 +105,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { Integer billTypeValue = ((Long) bill.get("billTypeValue")).intValue(); if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){ - WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId(), EnumFilterSettle.NO.getCode()); + WxBillSettle wxBillSettle = wxBillSettleService.getById(record.getBillId(), EnumFilterSettle.YES.getCode()); owe = wxBillSettle.getBalance(); bill.put("owe",owe); logger.info("wxBillSettle.balance:{}",owe);