From 46ddda2ec003a96d8dbdc4a0b07226e151ec4e55 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 15 Aug 2024 20:48:09 +0800 Subject: [PATCH] fix --- .../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 4 ++-- mallinkService/src/main/resources/mapper/WxAllBillMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 b79a16be3..76ebadfb6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -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()); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index 66a542c2f..eb7dbf1eb 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -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) )