瀏覽代碼

fix

release_toaliyun_real
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.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);


+ 1
- 1
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))
)
</if>
<if test=" 1 == notifyed ">


Loading…
取消
儲存