winter пре 1 година
родитељ
комит
b42303ed8a
2 измењених фајлова са 2 додато и 1 уклоњено
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Прегледај датотеку

@@ -972,6 +972,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
fq.updateTenantInfo(record); fq.updateTenantInfo(record);
fq.setId(record.getEnergyFeesId()); fq.setId(record.getEnergyFeesId());
WxEnergyFees fees = wxEnergyService.getFeesById(fq) ; WxEnergyFees fees = wxEnergyService.getFeesById(fq) ;
record.setBillType(fees.getBillType());
WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId());
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) { if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) {
generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE); generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Прегледај датотеку

@@ -111,7 +111,7 @@
and ( and (
( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5)) ( `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 and bill_type not in (13,21,5))
or 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))
) )
</if> </if>
<if test=" 1 == notifyed "> <if test=" 1 == notifyed ">


Loading…
Откажи
Сачувај