diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 5b2b262f9..3692ccbc1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -27,7 +27,7 @@ public interface WxBillAllService { //List> listBillOweAndWaitPay(WxBillAll wxBillAll); ResultData pageListBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay); - List> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay); + List> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay); void updateBill(Map bill); 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 443e11213..6e92e63d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -284,12 +284,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { //更新各账单状态 //updateBillStatus(wxBillAll); PageHelper.startPage(wxBillAll.getPageIndex(), wxBillAll.getPageSize()); - PageInfo> pageInfo = new PageInfo<>(listBill(wxBillAll, wxMerchant, hasShop, hasPayBill, hasReceivePay)); + PageInfo> pageInfo = new PageInfo<>(listBill(wxBillAll, wxMerchant,true, hasShop, hasPayBill, hasReceivePay)); return new ResultData(pageInfo); } @Override - public List> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasShop,boolean hasPayBill,boolean hasReceivePay){ + public List> listBill(WxBillAll wxBillAll,WxMerchant wxMerchant,boolean hasSet,boolean hasShop,boolean hasPayBill,boolean hasReceivePay){ List> maps = null; //账单类型 wxBillAll.setBillTypeValue(EnumBillQueryType.getRealType(wxBillAll.getBillTypeValue())); @@ -320,7 +320,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else { logger.info("账单不存在"); } - if (null != maps) { + if (null != maps && hasSet) { for (Map map : maps) { Integer billType = ((Long) map.get("billTypeValue")).intValue(); if (EnumBillType.SETTLE.getCode().equals(billType)) { 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 1a8f53e2f..386214cfd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -102,7 +102,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { wxBillAll.updateTenantInfo(record); wxBillAll.setId(record.getBillId()); wxBillAll.setBillTypeValue(billTypeValue); - List> bills = wxBillAllService.listBill(wxBillAll,null,false,false,false); + List> bills = wxBillAllService.listBill(wxBillAll,null,true,false,false,false); if (bills.size()==0) { logger.error("pay bill, bill not allow, repaymentReq: " + JSONObject.toJSONString(record) + ", payWay: " + payWay.toString()); throw new MallinkException(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); @@ -709,7 +709,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setId(record.getBillId()); wxBillAll.setBillTypeValue(record.getBillTypeValue()); - List> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); + List> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false); if (bills.size() > 0) { Map bill = bills.get(0); bill.put("userId", record.getbUserId()); @@ -724,7 +724,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setId(record.getBillId()); wxBillAll.updateTenantInfo(record); - List> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); + List> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false); if (bills.size()==0) { logger.error("pay success handle, bill " + record.getBillId() + " not found , payBillNo : " + record.getPayBillNo()); throw new MallinkException(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); @@ -768,7 +768,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { WxBillAll wxBillAll = new WxBillAll(); wxBillAll.setId(record.getBillId()); wxBillAll.setBillTypeValue(record.getBillTypeValue()); - List> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); + List> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false); if (bills.size()==0) { logger.error("pay handle, bill " + record.getBillId() + " not found , payBillNo : " + record.getPayBillNo()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);