店员礼物详情

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxArticleController.java

@@ -60,6 +60,18 @@ public class WxArticleController {
         return R.ok("成功");
     }
 
+
+    /**
+     * 店员删除
+     */
+    @ClerkUserLogin
+    @GetMapping("/clerk/deleteById")
+    public R clerkDeleteById(@RequestParam("id") String id) {
+        playClerkArticleInfoService.deletePlayClerkArticleInfoById(id);
+        playCustomArticleInfoService.deleteByArticleId(id);
+        return R.ok("成功");
+    }
+
     /**
      * 店员分页查询本人动态列表
      */

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java

@@ -6,20 +6,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.starry.admin.common.aspect.ClerkUserLogin;
 import com.starry.admin.common.conf.ThreadLocalRequestDetail;
 import com.starry.admin.common.exception.CustomException;
-import com.starry.admin.modules.clerk.module.entity.*;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkDataReviewInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
+import com.starry.admin.modules.clerk.module.entity.PlayClerkUserReviewInfoEntity;
 import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityEditVo;
 import com.starry.admin.modules.clerk.module.vo.PlayClerkCommodityQueryVo;
 import com.starry.admin.modules.clerk.service.*;
 import com.starry.admin.modules.clerk.service.impl.PlayClerkUserInfoServiceImpl;
 import com.starry.admin.modules.clerk.service.impl.PlayClerkUserReviewInfoServiceImpl;
+import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
 import com.starry.admin.modules.order.module.vo.PlayOrderEvaluateQueryVo;
 import com.starry.admin.modules.order.module.vo.PlayOrderStateEditVo;
 import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
 import com.starry.admin.modules.order.service.IPlayOrderInfoService;
-import com.starry.admin.modules.play.service.IPlayCommodityInfoService;
 import com.starry.admin.modules.weichat.entity.*;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
+import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
 import com.starry.admin.modules.weichat.entity.order.PlayClerkOrderDetailsReturnVo;
 import com.starry.admin.modules.weichat.entity.order.PlayClerkOrderInfoQueryVo;
 import com.starry.admin.modules.weichat.entity.order.PlayClerkOrderListReturnVo;
@@ -28,7 +32,6 @@ import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.redis.RedisCache;
 import com.starry.common.result.R;
 import com.starry.common.utils.ConvertUtil;
-import com.starry.common.utils.IdUtils;
 import com.starry.common.utils.VerificationCodeUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -37,9 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -79,8 +80,6 @@ public class WxClerkController {
     @Resource
     private IPlayClerkDataReviewInfoService playClerkDataReviewInfoService;
 
-    @Resource
-    private IPlayCommodityInfoService playCommodityInfoService;
 
     @Resource
     private IPlayClerkLevelInfoService playClerkLevelInfoService;
@@ -88,6 +87,9 @@ public class WxClerkController {
     @Resource
     private IPlayClerkClassificationInfoService playClerkClassificationInfoService;
 
+    @Resource
+    private IPlayGiftInfoService giftInfoService;
+
 
     /**
      * 店员获取个人信息
@@ -279,6 +281,7 @@ public class WxClerkController {
         return R.ok(page);
     }
 
+
     /**
      * 获取店员礼物信息
      *
@@ -292,17 +295,8 @@ public class WxClerkController {
         if (entity == null) {
             throw new CustomException("用户不存在");
         }
-        Map<String, Object> result = new HashMap<>();
+        List<PlayClerkGiftReturnVo> list = giftInfoService.clerkListByAll(id, "1");
-        List<PlayGiftInfoVo> list = new ArrayList<>();
+        return R.ok(list);
-        list.add(new PlayGiftInfoVo(IdUtils.getUuid(), "礼物1", "https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/d8e929c041e94075b93cfc6338a83d4c/2024/04/15/fc09da2f923d46e6951292ff8f34f6aa.png", 0, "0"));
-        list.add(new PlayGiftInfoVo(IdUtils.getUuid(), "礼物2", "https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/d8e929c041e94075b93cfc6338a83d4c/2024/04/15/fc09da2f923d46e6951292ff8f34f6aa.png", 1, "0"));
-        list.add(new PlayGiftInfoVo(IdUtils.getUuid(), "礼物3", "https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/d8e929c041e94075b93cfc6338a83d4c/2024/04/15/fc09da2f923d46e6951292ff8f34f6aa.png", 2, "1"));
-        list.add(new PlayGiftInfoVo(IdUtils.getUuid(), "礼物4", "https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/d8e929c041e94075b93cfc6338a83d4c/2024/04/15/fc09da2f923d46e6951292ff8f34f6aa.png", 3, "1"));
-        list.add(new PlayGiftInfoVo(IdUtils.getUuid(), "礼物5", "https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/d8e929c041e94075b93cfc6338a83d4c/2024/04/15/fc09da2f923d46e6951292ff8f34f6aa.png", 4, "1"));
-        result.put("list", list);
-        result.put("obtainedGift", list.size() - 1);
-        result.put("totalGift", list.size());
-        return R.ok(result);
     }