Переглянути джерело

[修改][结算单][修改跳点率计算]

release_toaliyun_real
luozukai 6 роки тому
джерело
коміт
03c91e64da
2 змінених файлів з 10 додано та 1 видалено
  1. +9
    -0
      mallinkAdmin/src/test/java/com/iformall/service/test/Test.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java

+ 9
- 0
mallinkAdmin/src/test/java/com/iformall/service/test/Test.java Переглянути файл

@@ -80,6 +80,9 @@ public class Test {
@Autowired @Autowired
private WxBillSettleRecordService wxBillSettleRecordService; private WxBillSettleRecordService wxBillSettleRecordService;


@Autowired
private WxBillPropertyService wxBillPropertyService;

@Before @Before
public void setUp() { public void setUp() {
mockHttpServletRequest = new MockHttpServletRequest(webApplicationContext.getServletContext()); mockHttpServletRequest = new MockHttpServletRequest(webApplicationContext.getServletContext());
@@ -150,4 +153,10 @@ public class Test {
wxBillAll.setMerchantId(324754110547066880l); wxBillAll.setMerchantId(324754110547066880l);
System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll)));
} }

@org.junit.Test
public void testPro(){
System.out.println("--------"+JsonUtil.obj2Json(wxBillPropertyService.detail(329481088662077445l)));

}
} }

+ 1
- 1
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(); Integer billTypeValue = ((Long) bill.get("billTypeValue")).intValue();


if(EnumBillType.SETTLE.getCode().equals(billTypeValue)){ 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(); owe = wxBillSettle.getBalance();
bill.put("owe",owe); bill.put("owe",owe);
logger.info("wxBillSettle.balance:{}",owe); logger.info("wxBillSettle.balance:{}",owe);


Завантаження…
Відмінити
Зберегти