From 3dcaaa66b4ca433389752bd9d4d9b0b6c2296839 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Wed, 21 Aug 2024 11:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E5=91=98=E4=BB=B7=E6=A0=BCfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/mapper/PlayCommodityInfoMapper.java    |  2 +-
 .../weichat/controller/WxCouponController.java  | 17 +++++++++++++----
 .../weichat/entity/WxCouponOrderQueryVo.java    |  8 ++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java
index 57eeb7a..1a25b0c 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/shop/mapper/PlayCommodityInfoMapper.java
@@ -31,7 +31,7 @@ public interface PlayCommodityInfoMapper extends MPJBaseMapper<PlayCommodityInfo
      * @param id UUID
      * @return 项目信息
      */
-    @Select("select t.id as commodityId,t3.price as commodityPrice,t.item_name as serviceDuration,t1.item_name as commodityName from play_commodity_info t left join play_commodity_info t1 on t.p_id = t1.id left join play_commodity_and_level_info t3 ON t3.commodity_id = t1.id where t3.price is not null and t.id  = #{id} and t3.level_id = #{levelId} limit 1")
+    @Select("select t.id as commodityId,t3.price as commodityPrice,t.item_name as serviceDuration,t1.item_name as commodityName from play_commodity_info t left join play_commodity_info t1 on t.p_id = t1.id left join play_commodity_and_level_info t3 ON t3.commodity_id = t.id where t3.price is not null and t.id  = #{id} and t3.level_id = #{levelId} limit 1")
     PlayCommodityInfoVo queryCommodityInfo(String id, String levelId);
 
 
diff --git 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
index 4a66ceb..c52f81c 100644
--- 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
@@ -1,16 +1,17 @@
 package com.starry.admin.modules.weichat.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSON;
 import com.starry.admin.common.aspect.CustomUserLogin;
 import com.starry.admin.common.conf.ThreadLocalRequestDetail;
 import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
 import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
-import com.starry.admin.modules.shop.module.vo.PlayCommodityInfoVo;
-import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
 import com.starry.admin.modules.shop.module.entity.PlayCouponInfoEntity;
+import com.starry.admin.modules.shop.module.vo.PlayCommodityInfoVo;
 import com.starry.admin.modules.shop.module.vo.PlayCouponDetailsReturnVo;
+import com.starry.admin.modules.shop.service.IPlayCommodityInfoService;
 import com.starry.admin.modules.shop.service.IPlayCouponDetailsService;
 import com.starry.admin.modules.shop.service.IPlayCouponInfoService;
 import com.starry.admin.modules.weichat.entity.WxCouponOrderQueryVo;
@@ -107,9 +108,17 @@ public class WxCouponController {
     @CustomUserLogin
     @PostMapping("/custom/queryByOrder")
     public R queryByOrder(@Validated @RequestBody WxCouponOrderQueryVo vo) {
+        if (vo.getLevelId().isEmpty() && vo.getClerkId().isEmpty()) {
+            throw new CustomException("请求参数异常,店员ID不能为空,等级ID不能为空");
+        }
+        String levelId = vo.getLevelId();
+        if (!vo.getClerkId().isEmpty()) {
+            PlayClerkUserInfoEntity clerkUserInfo = playClerkUserInfoService.selectById(vo.getClerkId());
+            levelId = clerkUserInfo.getLevelId();
+        }
+        log.info(JSON.toJSONString(vo));
         List<PlayCouponDetailsReturnVo> list = couponDetailsService.selectByCustomId(ThreadLocalRequestDetail.getCustomUserInfo().getId());
-        PlayClerkUserInfoEntity clerkUserInfo = playClerkUserInfoService.selectById(vo.getClerkId());
-        PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(),clerkUserInfo.getLevelId());
+        PlayCommodityInfoVo commodityInfo = playCommodityInfoService.queryCommodityInfo(vo.getCommodityId(), levelId);
         // 优惠券列表
         List<WxCouponOrderReturnVo> couponReturnVos = new ArrayList<>();
         for (PlayCouponDetailsReturnVo couponDetails : list) {
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java
index 224f6d1..9cf9cab 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/WxCouponOrderQueryVo.java
@@ -15,6 +15,14 @@ public class WxCouponOrderQueryVo {
     private String commodityId;
 
 
+    /***
+     * 店员等级ID
+     */
+    private String levelId;
+
+    /***
+     * 店员ID
+     */
     private String clerkId;
 
     /**