diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 6f3f30296..deaa1339b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -972,6 +972,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { fq.updateTenantInfo(record); fq.setId(record.getEnergyFeesId()); WxEnergyFees fees = wxEnergyService.getFeesById(fq) ; + record.setBillType(fees.getBillType()); WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) { generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 26c66bb36..ede9bf67b 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -111,7 +111,7 @@ and ( ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5)) or - ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') < 0 and bill_type in (13,21,5)) + ( `pay` > 0 and bill_type in (13,21,5)) )