|
|
|
@@ -102,7 +102,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { |
|
|
|
wxBillAll.updateTenantInfo(record); |
|
|
|
wxBillAll.setId(record.getBillId()); |
|
|
|
wxBillAll.setBillTypeValue(billTypeValue); |
|
|
|
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll,null,false,false,false); |
|
|
|
List<Map<String, Object>> 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<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); |
|
|
|
List<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null,false, false, false, false); |
|
|
|
if (bills.size() > 0) { |
|
|
|
Map<String, Object> 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<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); |
|
|
|
List<Map<String, Object>> 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<Map<String, Object>> bills = wxBillAllService.listBill(wxBillAll, null, false, false, false); |
|
|
|
List<Map<String, Object>> 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); |
|
|
|
|