From 79425d3d28b5359c898d239fb25bb2b8c206f1df Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Oct 2022 18:39:42 +0800 Subject: [PATCH] =?UTF-8?q?//=E4=BC=9A=E5=91=98=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxMemberCardServiceImpl.java | 8 ++++---- .../src/main/java/com/iformall/utils/MaUtil.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java index ab0ebdb82..0c8b43785 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMemberCardServiceImpl.java @@ -123,7 +123,7 @@ public class WxMemberCardServiceImpl implements WxMemberCardService { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"未开通商圈或不支持此项操作"); } try { - WxPayService wxPayService = maUtil.getWxPayService(cAppInfo, payAccount); + WxPayService wxPayService = maUtil.getWxPayServiceBySelfModel(cAppInfo, payAccount); MemberCardResult memberCard = wxPayService.getMemberCardService().getMemberCard(card_id, code); WxMemberCard record = new WxMemberCard(); record.setTenantId(tenantEntity.getTenantId()); @@ -197,7 +197,7 @@ public class WxMemberCardServiceImpl implements WxMemberCardService { this.saveorupdate(record); if(record.getUserId() != null){ this.sendsyncMemberCardBonusMsg(tenantEntity,record.getUserId(),null); - this.sendsyncMemberCardLevelMsg(tenantEntity,record.getUserId(),null); +// this.sendsyncMemberCardLevelMsg(tenantEntity,record.getUserId(),null); } return new ResultData(); } catch (WxPayException e) { @@ -231,7 +231,7 @@ public class WxMemberCardServiceImpl implements WxMemberCardService { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"未开通商圈或不支持此项操作"); } try { - WxPayService wxPayService = maUtil.getWxPayService(cAppInfo, payAccount); + WxPayService wxPayService = maUtil.getWxPayServiceBySelfModel(cAppInfo, payAccount); MemberCardUpdRequest request = new MemberCardUpdRequest(); request.setLevel(level); request.setOutRequestNo(markid); @@ -273,7 +273,7 @@ public class WxMemberCardServiceImpl implements WxMemberCardService { return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"未开通商圈或不支持此项操作"); } try { - WxPayService wxPayService = maUtil.getWxPayService(cAppInfo, payAccount); + WxPayService wxPayService = maUtil.getWxPayServiceBySelfModel(cAppInfo, payAccount); MemberCardRightsRequest request = new MemberCardRightsRequest(); request.setBeforeBonusValue(before_bonus_value); request.setBonusValue(bonus_value); diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java index 6fce8d03a..8b71fcfe8 100644 --- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java +++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java @@ -126,7 +126,7 @@ public class MaUtil { config.setMchKey(payAccount.getMerchantApiKey()); config.setSubAppId(appinfo.getAppId()); config.setSubMchId(payAccount.getSubMchId()); - config.setKeyPath(payAccount.getMerchantKeyPath()); + config.setKeyPath(payAccount.getMerchantCertPath()); config.setPrivateKeyPath(payAccount.getMerchantKeyPath()); config.setPrivateCertPath(payAccount.getMerchantCertPemPath()); //config.setCertSerialNo(payAccount.getCertSerialNo());