| @@ -87,7 +87,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| WxAppinfoMapper wxAppinfoMapper; | WxAppinfoMapper wxAppinfoMapper; | ||||
| @Autowired | @Autowired | ||||
| WxPayAccountMapper wxPayAccountMapper; | |||||
| WxPayAccountService wxPayAccountService; | |||||
| @Autowired | @Autowired | ||||
| WxMallMapper wxMallMapper; | 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) { | 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; | Date valid_date = null; | ||||
| //int limit_days = Constant.WX_LIMIT_DAYS; | //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; | WxPayOrder payOrder = null; | ||||
| // if (coupon.getSalePrice() > 0) { | // if (coupon.getSalePrice() > 0) { | ||||
| if(order.getPayment() > 0) { | if(order.getPayment() > 0) { | ||||
| @@ -1467,6 +1459,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| if (null != cardInfoList && cardInfoList.size() > 0) { | if (null != cardInfoList && cardInfoList.size() > 0) { | ||||
| //do nothing | //do nothing | ||||
| }else { | }else { | ||||
| WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(order.getTenantId(), payWay.getPlat()); | |||||
| WxPayAccount payAccount = wxPayAccountService.getByIdFromRedis(cAppInfo.getId()); | |||||
| // 有价卡 | // 有价卡 | ||||
| cardInfo.setTransactionId(payOrder.getTransactionId()); | cardInfo.setTransactionId(payOrder.getTransactionId()); | ||||
| WxComposeChildOrderShare share = payOrder.getChildOrderShare(order.getId()); | WxComposeChildOrderShare share = payOrder.getChildOrderShare(order.getId()); | ||||