From 5069733b92b23d0450a7121e86b9f9ceadcaad68 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 27 Oct 2020 09:58:56 +0800 Subject: [PATCH] fix --- .../com/iformall/service/impl/WxAppinfoServiceImpl.java | 7 ++++++- .../iformall/service/impl/WxCouponOrderServiceImpl.java | 1 + .../java/com/iformall/service/pay/PayServiceFactory.java | 9 +++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 6d0c39dfe..0b95a4b26 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -40,7 +40,12 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) { WxAppinfo appInfo = null; WxAppinfo appinfoQ = new WxAppinfo(); - appinfoQ.setPlat(payWay.getPlat().getCode()); + if (null == payWay.getPlat()) { + appinfoQ.setPlat(EnumPayWay.PAY_WAY_WECHAT.getPlat().getCode()); + }else { + appinfoQ.setPlat(payWay.getPlat().getCode()); + } + appinfoQ.updateTenantInfo(tenantEntity); appinfoQ.setType(EnumAppType.C.getCode()); List appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d6e47bf61..59cb91493 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -621,6 +621,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); subsidy.setOrderId(couponOrder.getOrderId()); subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); + subsidy.updateTenantInfo(couponOrder); List wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); if (wmsList.size() > 0) { logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java index cc78e5429..d3bd118cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java @@ -63,6 +63,15 @@ public class PayServiceFactory { shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService); shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD.getCode(), wxShareService); + shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT.getCode(), wxShareService); } return shareMap; }