From 14c389c44450a6ee7417ab698626993331fd3242 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 28 Apr 2021 13:28:55 +0800 Subject: [PATCH] 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