From 86504c49b05e0882f7ceb8180a34de82f711f83f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 11:22:59 +0800 Subject: [PATCH] fix --- .../market/WxCardPayController.java | 8 +-- .../service/impl/WxCardSpendServiceImpl.java | 50 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e5c159d42..e133f71ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -107,10 +107,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - //List sources = new ArrayList(); - //sources.add(EnumMerchantSubsidySource.CARD.getCode()); - //wxCardSpendVo.setSources(sources); - //wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); + wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 3bd92e47c..b1f2b1673 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -246,30 +246,30 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } //卡不再调用微信分账 -// if (payAccount.checkShare()) { -// // 分账 -// if (cardInfo.getSaleAmount() > 0) { -// // 9. 只有有价卡才能分账 -// try { -// shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); -// } catch (MallinkException e) { -// logger.error(e.getMessage()); -// if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || -// ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { -// // 分账已到20次限制,后面只记录,不分账 -// // 分账已过期,后面只记录,不分账 -// logger.error("分账已到20次限制,后面只记录,无法分账"); -// try { -// creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); -// } catch (Exception ex) { -// logger.error("分账已到20次限制,记录到结算表失败"); -// } -// } else { -// throw new MallinkException(e.getErrorCode(), e.getMessage()); -// } -// } -// } -// } else { + if (payAccount.checkShare()) { + // 分账 + if (cardInfo.getSaleAmount() > 0) { + // 9. 只有有价卡才能分账 + try { + shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); + } catch (MallinkException e) { + logger.error(e.getMessage()); + if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || + ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { + // 分账已到20次限制,后面只记录,不分账 + // 分账已过期,后面只记录,不分账 + logger.error("分账已到20次限制,后面只记录,无法分账"); + try { + creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); + } catch (Exception ex) { + logger.error("分账已到20次限制,记录到结算表失败"); + } + } else { + throw new MallinkException(e.getErrorCode(), e.getMessage()); + } + } + } + } else { // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO if (cardInfo.getSaleAmount() > 0 && payment > 0) { try { @@ -278,7 +278,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { logger.error("记录到结算表失败"); } } -// } + } // 成长值 try {