소스 검색

fixed openCard

fushengqian 1 년 전
부모
커밋
5793d0e968
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

+ 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);
         }
 
+        MtSetting openCardSetting = settingService.querySettingByName(accountInfo.getMerchantId(), UserSettingEnum.OPEN_WX_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());
-        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());
             if (StringUtil.isNotEmpty(cardId)) {
                 MtSetting mtSetting = new MtSetting();