From 1b6a85d1002f44f19096bf0d095c75f162dd586f Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 19 Oct 2022 15:00:42 +0800 Subject: [PATCH] =?UTF-8?q?//=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxOrderServiceImpl.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 98c1ee172..be7fb56bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -87,7 +87,7 @@ public class WxOrderServiceImpl implements WxOrderService { WxAppinfoMapper wxAppinfoMapper; @Autowired - WxPayAccountMapper wxPayAccountMapper; + WxPayAccountService wxPayAccountService; @Autowired WxMallMapper wxMallMapper; @@ -1349,14 +1349,6 @@ public class WxOrderServiceImpl implements WxOrderService { public WxCouponOrder createCouponOrder(Date curr,WxOrder order, WxCUserBasicInfo user, WxCoupon coupon, Long couponPasswordId,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId,Long parentCouponOrderId) { Date valid_date = null; //int limit_days = Constant.WX_LIMIT_DAYS; - WxPayAccount payAccount = null; - WxPayAccount payAccountQ = new WxPayAccount(); - payAccountQ.updateTenantInfo(order); - try { - payAccount = wxPayAccountMapper.selectOne(new QueryWrapper<>(payAccountQ)); - } catch (Exception e) { - logger.error("获取payAccount error: " + order.getTenantId()); - } WxPayOrder payOrder = null; // if (coupon.getSalePrice() > 0) { if(order.getPayment() > 0) { @@ -1467,6 +1459,8 @@ public class WxOrderServiceImpl implements WxOrderService { if (null != cardInfoList && cardInfoList.size() > 0) { //do nothing }else { + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(order.getTenantId(), payWay.getPlat()); + WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(cAppInfo.getId()); // 有价卡 cardInfo.setTransactionId(payOrder.getTransactionId()); WxComposeChildOrderShare share = payOrder.getChildOrderShare(order.getId());