fixed 开通微信卡券优化

fuint-application/src/main/java/com/fuint/common/service/impl/CateServiceImpl.java

@@ -166,6 +166,7 @@ public class CateServiceImpl extends ServiceImpl<MtGoodsCateMapper, MtGoodsCate>
         Map<String, Object> params = new HashMap<>();
         params.put("cate_id", id);
         params.put("status", StatusEnum.ENABLED.getKey());
+        params.put("merchant_id", cateInfo.getMerchantId());
         List<MtGoods> goodsList = mtGoodsMapper.selectByMap(params);
         if (goodsList != null && goodsList.size() > 0) {
             throw new BusinessCheckException("删除失败，该分类有商品存在");

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -780,7 +780,7 @@ public class WeixinServiceImpl implements WeixinService {
     @Override
     public String createCardQrCode(Integer merchantId, String cardId, String code) {
         try {
-            String accessToken = getAccessToken(merchantId, false,false);
+            String accessToken = getAccessToken(merchantId, false, true);
             String url = "https://api.weixin.qq.com/card/qrcode/create?access_token="+accessToken;
 
             Map<String, Object> param = new HashMap<>();
@@ -830,7 +830,7 @@ public class WeixinServiceImpl implements WeixinService {
     @Override
     public Boolean isOpenCard(Integer merchantId, String cardId, String openId) {
         try {
-            String accessToken = getAccessToken(merchantId, false,false);
+            String accessToken = getAccessToken(merchantId, false,true);
             String url = "https://api.weixin.qq.com/card/user/getcardlist?access_token="+accessToken;
 
             Map<String, Object> param = new HashMap<>();
@@ -839,7 +839,7 @@ public class WeixinServiceImpl implements WeixinService {
 
             String reqDataJsonStr = JsonUtil.toJSONString(param);
             String response = HttpRESTDataClient.requestPostBody(url, reqDataJsonStr);
-            logger.info("微信卡券createCardQrCode接口返回：{}", response);
+            logger.info("微信卡券getCardList接口返回：{}", response);
             JSONObject data = (JSONObject) JSONObject.parse(response);
             if (data.get("errcode").toString().equals("0")) {
                 Object cards = data.get("card_list");
@@ -849,7 +849,7 @@ public class WeixinServiceImpl implements WeixinService {
                 return false;
             }
         } catch (Exception e) {
-            logger.error("创建微信卡券领取二维码出错：{}", e.getMessage());
+            logger.error("微信卡券getCardList接口出错：{}", e.getMessage());
             return true;
         }
         return true;

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -89,6 +89,8 @@ public class ClientUserController extends BaseController {
     public ResponseObject info(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
+        String isWechat = request.getHeader("isWechat") == null ? YesOrNoEnum.NO.getKey() : request.getHeader("isWechat");
+        String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
         String userNo = request.getParameter("code") == null ? "" : request.getParameter("code");
         UserInfo loginInfo = TokenUtil.getUserInfoByToken(token);
 
@@ -146,12 +148,13 @@ public class ClientUserController extends BaseController {
 
         // 是否开通微信会员卡
         boolean openWxCard = false;
-        if (mtUser != null && StringUtil.isNotEmpty(mtUser.getOpenId())) {
+        if (platform.equals(PlatformTypeEnum.H5.getCode()) && isWechat.equals(YesOrNoEnum.YES.getKey()) && mtUser != null && StringUtil.isNotEmpty(mtUser.getOpenId())) {
             MtSetting cardSetting = settingService.querySettingByName(mtUser.getMerchantId(), UserSettingEnum.OPEN_WX_CARD.getKey());
             if (cardSetting != null && cardSetting.getValue().equals(YesOrNoEnum.TRUE.getKey())) {
                 MtSetting cardIdSetting = settingService.querySettingByName(mtUser.getMerchantId(), UserSettingEnum.WX_MEMBER_CARD_ID.getKey());
                 if (cardIdSetting != null) {
-                    boolean isOpen = weixinService.isOpenCard(mtUser.getMerchantId(), cardIdSetting.getValue(), mtUser.getOpenId());
+                    Boolean isOpen = weixinService.isOpenCard(mtUser.getMerchantId(), cardIdSetting.getValue(), mtUser.getOpenId());
+                    logger.info("weixinService.isOpenCard userId = {}，isOpen = {}", mtUser.getId(), isOpen);
                     if (!isOpen) {
                         openWxCard = true;
                     }