Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
46ddda2ec0
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java View File

@@ -901,7 +901,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxFinanceReceive addreceive = generateReceive(receiveId,user,EnumFinanceCashierType.RECEIVE ,EnumFinanceReceiveType.ADVANCE, record.getReceiveMoney(), null,
record.getMerchantId(), record.getFeesId(), record.getRemark());
wxFinanceReceiveMapper.insert(addreceive);
//创建预收账单? WxBillAdvance
//创建预收账单,只是为了收款列表能够正常展现。
WxAllBill advance = generateAdvanceBillByReceive(record);
wxBillAllHelper.saveOrUpdateBill(advance, user);
createFinanceReceiveBill(addreceive, advance, record.getReceiveMoney(), null, null);
@@ -914,7 +914,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
advanceBill.setRentShopType(record.getRentShopType());
advanceBill.setNeedPay(record.getReceiveMoney());
advanceBill.setReceivePay(record.getReceiveMoney());
advanceBill.setPay("0");
advanceBill.setPay(record.getReceiveMoney());
advanceBill.setBillType(EnumBillAllType.ADVANCE.getCode());
//advanceBill.setPayWay();
advanceBill.setPayDate(new Date());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml View File

@@ -110,7 +110,7 @@
( `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))
or status in (8,9)
or status in (8)
)
</if>
<if test=" 1 == notifyed ">


Loading…
Cancel
Save