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 6e6efe02b..1944c2924 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -245,30 +245,31 @@ 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 { @@ -276,7 +277,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } catch (Exception ex) { logger.error("记录到结算表失败"); } - } +// } } // 成长值