fix

2025-10-05 22:03:32 +08:00
parent 4ee24aabea
commit f64964a39a
12 changed files with 53 additions and 37 deletions
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java
@@ -44,7 +44,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,7 +51,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
-
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -476,8 +474,7 @@ public class WxClerkController {
    public R checkSubscribe() {
        String openid = ThreadLocalRequestDetail.getClerkUserInfo().getOpenid();
        String tenantId = SecurityUtils.getTenantId();
-        wxCustomMpService.checkSubscribe(openid, tenantId);
-        return R.ok(true);
+        return R.ok(wxCustomMpService.checkSubscribe(openid, tenantId));
    }


--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxCouponController.java
@@ -25,11 +25,13 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -139,18 +141,23 @@ public class WxCouponController {
        // 优惠券列表
        List<WxCouponOrderReturnVo> couponReturnVos = new ArrayList<>();
        for (PlayCouponDetailsReturnVo couponDetails : list) {
-            PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId());
-            WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class);
-            String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo,
-                    vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(),
-                    commodityInfo.getCommodityPrice());
-            if (StrUtil.isEmpty(couponReasonForUnavailableUse)) {
-                wxCouponReturnVo.setAvailable("1");
-            } else {
-                wxCouponReturnVo.setAvailable("0");
-                wxCouponReturnVo.setReasonForUnavailableUse(couponReasonForUnavailableUse);
+            try {
+                PlayCouponInfoEntity couponInfo = couponInfoService.selectPlayCouponInfoById(couponDetails.getCouponId());
+                WxCouponOrderReturnVo wxCouponReturnVo = ConvertUtil.entityToVo(couponDetails, WxCouponOrderReturnVo.class);
+                String couponReasonForUnavailableUse = couponInfoService.getCouponReasonForUnavailableUse(couponInfo,
+                        vo.getPlaceType(), vo.getCommodityId(), vo.getCommodityQuantity(),
+                        commodityInfo.getCommodityPrice());
+                if (StrUtil.isEmpty(couponReasonForUnavailableUse)) {
+                    wxCouponReturnVo.setAvailable("1");
+                } else {
+                    wxCouponReturnVo.setAvailable("0");
+                    wxCouponReturnVo.setReasonForUnavailableUse(couponReasonForUnavailableUse);
+                }
+                couponReturnVos.add(wxCouponReturnVo);
+            } catch (Exception e) {
+
            }
-            couponReturnVos.add(wxCouponReturnVo);
+
        }
        return R.ok(couponReturnVos);
    }
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxOauthController.java
@@ -27,10 +27,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import java.util.Date;
 import javax.annotation.Resource;
-
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -201,8 +199,7 @@ public class WxOauthController {
    public R checkSubscribe() {
        String openid = ThreadLocalRequestDetail.getCustomUserInfo().getOpenid();
        String tenantId = SecurityUtils.getTenantId();
-        wxCustomMpService.checkSubscribe(openid, tenantId);
-        return R.ok(true);
+        return R.ok(wxCustomMpService.checkSubscribe(openid, tenantId));
    }

    @ApiOperation(value = "顾客登录回调", notes = "微信顾客授权登录回调处理")
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
@@ -33,7 +33,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -43,7 +42,6 @@ import java.util.Map;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
 import lombok.extern.slf4j.Slf4j;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxCustomMpService.java
@@ -22,13 +22,11 @@ import com.starry.admin.modules.personnel.service.IPlayPersonnelAdminInfoService
 import com.starry.admin.modules.system.module.entity.SysTenantEntity;
 import com.starry.admin.modules.system.service.impl.SysTenantServiceImpl;
 import com.starry.admin.utils.SecurityUtils;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Resource;
-
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/service/WxOauthService.java
@@ -14,11 +14,9 @@ import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.utils.ConvertUtil;
 import com.starry.common.utils.IdUtils;
-
 import java.io.InputStream;
 import java.util.Date;
 import javax.annotation.Resource;
-
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;