From e70cf741304f0b27948009e137a674bb870c2d9b Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 19:02:54 +0800 Subject: [PATCH 1/4] fix --- .../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 6148563e1..0a34cc262 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -198,7 +198,8 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Override public FinanceBillSetoffSum getBillSetoffSum(WxFinanceReceive record) { - record.setType(EnumFinanceReceiveType.ADVANCE.getCode()); + record.setType(EnumFinanceCashierType.RECEIVE.getCode()); + record.setReceiveType(EnumFinanceReceiveType.ADVANCE.getCode()); record.setStatus(EnumFinanceReceiveStatus.NORMAL.getCode()); List advanceList = wxFinanceReceiveMapper.getMerchantAdvanceGroupSumList(record); BigDecimal total = new BigDecimal(0); From 9077e36c1fc8b13f7f5cefb9267109d08cd55520 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 19:32:32 +0800 Subject: [PATCH 2/4] fix --- .../main/resources/mapper/WxAllBillMapper.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index fcb1471c6..d6329f7da 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -76,23 +76,23 @@ and ( - (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7) and bill_type not in (13,21,5)) + (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) or - (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7) and bill_type in (13,21,5)) + (`starttime` <= #{oweBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) ) and ( - (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7) and bill_type not in (13,21,5)) + (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) or - (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7) and bill_type in (13,21,5)) + (`starttime` > #{oweBillLastTime} and `starttime` <= #{nearBillLastTime} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) ) and ( - (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7) and bill_type not in (13,21,5)) + (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) or - (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7) and bill_type in (13,21,5)) + (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) ) @@ -105,9 +105,9 @@ and ( - (`last_owe_call_time` is not null and `receive_pay` - `pay`- IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7) and bill_type not in (13,21,5)) + (`last_owe_call_time` is not null and `receive_pay` - `pay`- IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7,9) and bill_type not in (13,21,5)) or - (`last_owe_call_time` is not null and `receive_pay` - `pay`- IFNULL(`set_off`,'0') > 0 and status not in (3,6,7) and bill_type in (13,21,5)) + (`last_owe_call_time` is not null and `receive_pay` - `pay`- IFNULL(`set_off`,'0') > 0 and status not in (3,6,7,9) and bill_type in (13,21,5)) ) and `merchant_id` is not null From 3ac7130ab6ace4b866e6a6f1153fe5b91388ccef Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 20:35:11 +0800 Subject: [PATCH 3/4] fix --- .../iformall/service/impl/WxFinanceServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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 0a34cc262..dc72fbe2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -971,6 +971,19 @@ public class WxFinanceServiceImpl implements WxFinanceService { wxFinanceReceiveMapper.updateById(advance); } } + //要更新账单的冲抵 + WxBillPayDTO payDto = new WxBillPayDTO(); + payDto.updateTenantInfo(record); + payDto.setId(bill.getId()); + payDto.setBillTypeValue(bill.getBillType()); + payDto.setAddpay("0"); + payDto.setSetOff(rb.getReceive()); + if (isRedSetoff) { + payDto.setRemark("收款单红冲,自动回退"); + }else { + payDto.setRemark("收款单作废,自动回退"); + } + wxBillAllHelper.backPay(payDto, user); //记录删除 wxFinanceReceiveSetoffMapper.deleteByConditon(rsq); } From 8335c71854bae2a1961d2bb75b9047fc62be84d5 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 12 Aug 2024 21:06:42 +0800 Subject: [PATCH 4/4] fix --- .../iformall/service/impl/WxFinancePrintServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java index c5aeda79f..b06e08917 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -122,10 +122,10 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService { record.setUpdateTime(date); record.setName(record.getTitle()); Map map = new HashMap(); - map.put("width", 770); + map.put("width", 768); map.put("height", 500); - map.put("pageWidth", 325); - map.put("pageHeight", 275); + map.put("pageWidth", 215); + map.put("pageHeight", 140); map.put("tempItems", record.getTempItems()); map.put("id", String.valueOf(record.getId())); map.put("title", record.getName());