Browse Source

fixed openCard

fushengqian 1 year ago
parent
commit
5793d0e968

+ 2 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -472,9 +472,10 @@ public class BackendMemberController extends BaseController {
             settingService.saveSetting(mtSetting);
             settingService.saveSetting(mtSetting);
         }
         }
 
 
+        MtSetting openCardSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.OPEN_WX_CARD.getKey());
         MtSetting cardSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.WX_MEMBER_CARD.getKey());
         MtSetting cardSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.WX_MEMBER_CARD.getKey());
         MtSetting cardIdSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.WX_MEMBER_CARD_ID.getKey());
         MtSetting cardIdSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.WX_MEMBER_CARD_ID.getKey());
-        if (cardIdSetting == null && cardSetting != null && accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+        if (openCardSetting != null && openCardSetting.getValue().equals(YesOrNoEnum.TRUE.getKey()) && cardIdSetting == null && cardSetting != null && accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             String cardId = weixinService.createWxCard(accountInfo.getMerchantId());
             String cardId = weixinService.createWxCard(accountInfo.getMerchantId());
             if (StringUtil.isNotEmpty(cardId)) {
             if (StringUtil.isNotEmpty(cardId)) {
                 MtSetting mtSetting = new MtSetting();
                 MtSetting mtSetting = new MtSetting();