Merge branch 'master' of codeup.aliyun.com:6618f834290482f52b27ebad/hucs-enterprise/peipei-backend

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java

@@ -2,13 +2,16 @@ package com.starry.admin.modules.clerk.module.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.starry.admin.common.conf.StringTypeHandler;
 import com.starry.common.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -218,6 +221,14 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
      **/
     private String alipayImage;
 
+
+    /**
+     * 创建时间
+     **/
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime addTime;
+
     /**
      * 最近一次登录token
      */

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java

@@ -1,10 +1,13 @@
 package com.starry.admin.modules.clerk.module.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -131,6 +134,11 @@ public class PlayClerkUserReturnVo {
      */
     private String address;
 
+    /**
+     * 地址
+     */
+    private String remark;
+
     /**
      * 订单列表
      */
@@ -152,5 +160,9 @@ public class PlayClerkUserReturnVo {
      */
     private BigDecimal orderTotalAmount;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime addTime;
+
 
 }

play-admin/src/main/java/com/starry/admin/modules/gift/service/IPlayGiftInfoService.java

@@ -54,7 +54,7 @@ public interface IPlayGiftInfoService extends IService<PlayGiftInfoEntity> {
      * @author admin
      * @since 2024/4/25 15:56
      **/
-    List<PlayClerkGiftReturnVo> customListByAll(String customId,String obtained,String history);
+    List<PlayClerkGiftReturnVo> customListByAll(String customId,String obtained);
 
     /**
      * 查询礼物列表

play-admin/src/main/java/com/starry/admin/modules/gift/service/impl/PlayGiftInfoServiceImpl.java

@@ -57,12 +57,11 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl<PlayGiftInfoMapper, Pla
 
 
     @Override
-    public List<PlayClerkGiftReturnVo> customListByAll(String customId, String obtained, String history) {
+    public List<PlayClerkGiftReturnVo> customListByAll(String customId, String obtained) {
         if ("0".equals(obtained)) {
             //查询所有礼物，然后减去已获得礼物
             MPJLambdaWrapper<PlayGiftInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
             lambdaWrapper.selectAll(PlayGiftInfoEntity.class);
-            lambdaWrapper.eq(PlayGiftInfoEntity::getHistory, history);
             List<PlayClerkGiftReturnVo> list = this.baseMapper.selectJoinList(PlayClerkGiftReturnVo.class, lambdaWrapper);
             List<PlayCustomGiftInfoEntity> giftInfoEntities = customGiftInfoService.selectBtyCustomId(customId);
             // 使用迭代器安全地移除元素

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

@@ -9,12 +9,13 @@ import com.starry.admin.common.exception.CustomException;
 import com.starry.admin.modules.gift.service.IPlayGiftInfoService;
 import com.starry.admin.modules.weichat.entity.PlayGiftInfoDto;
 import com.starry.admin.modules.weichat.entity.gift.PlayClerkGiftReturnVo;
-import com.starry.admin.modules.weichat.entity.gift.PlayCustomGiftQueryVo;
 import com.starry.common.result.R;
 import com.starry.common.utils.ConvertUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -67,9 +68,15 @@ public class WxGiftController {
      * @return 礼物列表
      */
     @CustomUserLogin
-    @PostMapping("/custom/listByAll")
+    @GetMapping("/custom/listByAll")
-    public R customListByAll(@Validated @RequestBody PlayCustomGiftQueryVo vo) {
+    public R customListByAll(@RequestParam("obtained") String obtained) {
-        List<PlayClerkGiftReturnVo> list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), vo.getObtained(), vo.getHistory());
+        if (StrUtil.isBlankIfStr(obtained)) {
+            throw new CustomException("obtained参数异常");
+        }
+        if (!"0".equals(obtained) && !"1".equals(obtained)) {
+            throw new CustomException("obtained参数异常");
+        }
+        List<PlayClerkGiftReturnVo> list = giftInfoService.customListByAll(ThreadLocalRequestDetail.getCustomUserInfo().getId(), obtained);
         return R.ok(list);
     }