From edf99ce97c97be17036de50c8320b3cdf8c69a1d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:18:48 +0800 Subject: [PATCH 1/4] fix shouyintai --- .../service/impl/WxPayOrderServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 6dd7a0533..fddd7ce1e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1068,11 +1068,19 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { merchantSubsidy.setMerchantId(wxMerchantBUser.getMerchantId()); merchantSubsidy.setCouponOrderId(0L); merchantSubsidy.setCouponType(0); - merchantSubsidy.setOrderPayment(record.getPayAmount()); - merchantSubsidy.setReceiverPayment(record.getPayAmount()); - merchantSubsidy.setRealPayment(record.getPayAmount()); - merchantSubsidy.setSubsidy(record.getPayAmount()); - merchantSubsidy.setRealSubsidy(record.getPayAmount()); + if (null == record.getPayAmount()) { + merchantSubsidy.setOrderPayment(order.getPayment()); + merchantSubsidy.setReceiverPayment(order.getPayment()); + merchantSubsidy.setRealPayment(order.getPayment()); + merchantSubsidy.setSubsidy(order.getPayment()); + merchantSubsidy.setRealSubsidy(order.getPayment()); + }else { + merchantSubsidy.setOrderPayment(record.getPayAmount()); + merchantSubsidy.setReceiverPayment(record.getPayAmount()); + merchantSubsidy.setRealPayment(record.getPayAmount()); + merchantSubsidy.setSubsidy(record.getPayAmount()); + merchantSubsidy.setRealSubsidy(record.getPayAmount()); + } merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); From 14c389c44450a6ee7417ab698626993331fd3242 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:28:55 +0800 Subject: [PATCH 2/4] fix shouyin --- .../iformall/service/impl/WxPayOrderServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index fddd7ce1e..974b23980 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -959,7 +959,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { if (record.getShare().equals(EnumPayShare.NO.getCode())) { //结算记录 try { - createMerchantSubsidy(record, order, new Date()); + proxy.createMerchantSubsidy(record, order, new Date(),true); } catch (Exception e) { logger.error("收银台结算记录失败,{}", e.getMessage()); } @@ -1057,7 +1057,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } - public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate) { + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate,boolean freshMerchantCash) { final IdWorker idWorker = IdWorker.get(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); @@ -1087,6 +1088,12 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { merchantSubsidy.setType(EnumMerchantSubsidyType.WECHAT.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CASHIER.getCode()); wxMerchantSubsidyMapper.insert(merchantSubsidy); + + if (freshMerchantCash) { + WxMerchant merchant = wxMerchantMapper.selectById(wxMerchantBUser.getMerchantId()); + merchant.setCashOutNumber(merchantSubsidy.getRealPayment()); + wxMerchantMapper.increaseCash(merchant); + } } @Override From 58a1fd3961d20c641247c5eb584be00deb45f9ff Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:36:17 +0800 Subject: [PATCH 3/4] fix shouyin --- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 974b23980..92667c00a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1059,6 +1059,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate,boolean freshMerchantCash) { + Date d = null; + System.out.println(d.getDate()); + final IdWorker idWorker = IdWorker.get(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId()); From 075f1d08e386eb0aa720cc7f9a3908c57db78e2c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:48:20 +0800 Subject: [PATCH 4/4] fix shouyin --- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 92667c00a..974b23980 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1059,9 +1059,6 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate,boolean freshMerchantCash) { - Date d = null; - System.out.println(d.getDate()); - final IdWorker idWorker = IdWorker.get(); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); merchantSubsidy.setId(idWorker.nextId());