cup há 2 anos atrás
pai
commit
77ca2eb44e

+ 1 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ExchangeBannerMgrController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @create 2022-04-07 23:45:48
  * @describe 商品banner管理前端控制器
  */
-@Api("商品banner管理API")
+@Api(tags = "商品banner管理API")
 @RestController
 @RequestMapping("/api/v1/mp/admin/goods/banner/*")
 @Component

+ 8 - 22
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserMineController.java

@@ -154,31 +154,17 @@ public class UserMineController extends BaseApiController {
   @PostMapping("/prize/list")
   @ApiOperation(value = "我的实物奖品库", notes = "获取我的实物奖品库")
   @ApiResponses(
-          @ApiResponse(code = 200, message = "成功", response = UserPrizeStorageVO.class)
+          @ApiResponse(code = 200, message = "成功", response = UserPrizeStorage.class)
   )
-  public TableDataInfo listPrize(@RequestBody UserPrizeStorageQueryParam userPrizeStorageQueryParam) {
+  public TableDataInfo listPrize(@RequestBody JSONObject param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
     startPage();
-    LambdaQueryWrapper<UserPrizeStorage> queryWrapper = new LambdaQueryWrapper<UserPrizeStorage>()
-            .eq(UserPrizeStorage::getUserId, userId)
-            .orderByDesc(UserPrizeStorage::getCreatedTime);
-    if (userPrizeStorageQueryParam.getStatus() != null && PrizeStorageStatusEnum.RECOVERY.getValue().equals(userPrizeStorageQueryParam.getStatus())) {
-      queryWrapper.eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.RECOVERY);
-    }else {
-      queryWrapper.eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.NOT_DISTRIBUTED);
-    }
-    List<UserPrizeStorage> userPrizeStorageList = userPrizeStorageService.list(queryWrapper);
-    List<UserPrizeStorageVO> userPrizeStorageVOS = new ArrayList<>();
-    if (!CollectionUtils.isEmpty(userPrizeStorageList)) {
-      for (UserPrizeStorage userPrizeStorage : userPrizeStorageList) {
-        UserPrizeStorageVO userPrizeStorageVO = new UserPrizeStorageVO();
-        BeanUtils.copyProperties(userPrizeStorage,userPrizeStorageVO);
-        userPrizeStorageVOS.add(userPrizeStorageVO);
-      }
-    }
-    TableDataInfo res = getDataTable(userPrizeStorageList);
-    res.setRows(userPrizeStorageVOS);
-    return res;
+    List<UserPrizeStorage> userPrizeStorageList = userPrizeStorageService.list(
+            new LambdaQueryWrapper<UserPrizeStorage>()
+                    .eq(UserPrizeStorage::getUserId, userId)
+                    .eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.NOT_DISTRIBUTED)
+                    .orderByDesc(UserPrizeStorage::getCreatedTime));
+    return getDataTable(userPrizeStorageList);
   }
 
   /**