Merge branch 'dev' into 'mp-server-test'

回收订单列表

See merge request quanshu/mp-server!577

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserPrizeRecoveryMgrController.java

@@ -0,0 +1,63 @@
+package com.qs.mp.web.controller.api.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.mp.admin.domain.PrizeRecovery;
+import com.qs.mp.admin.domain.param.PrizeRecoveryListQueryParam;
+import com.qs.mp.admin.domain.vo.PrizeRecoveryListVO;
+import com.qs.mp.admin.service.IPrizeRecoveryService;
+import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.common.utils.StringUtils;
+import com.qs.mp.web.controller.common.BaseApiController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 用户中奖商品回收相关接口
+ * @author Cup
+ * @date 2022/5/25
+ */
+@RestController
+@RequestMapping("/api/v1/mp/admin/prize/recovery")
+@Api(tags = "用户奖品回收相关接口")
+public class UserPrizeRecoveryMgrController extends BaseApiController {
+
+    @Autowired
+    private IPrizeRecoveryService prizeRecoveryService;
+
+
+    @PostMapping("/list")
+    @PreAuthorize("@ss.hasPermi('business:recovery:list')")
+    @ApiOperation("回收订单列表,支持分页")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "成功", response = PrizeRecoveryListVO.class)
+    })
+    public TableDataInfo list(@RequestBody PrizeRecoveryListQueryParam prizeRecoveryListQueryParam) {
+        startPage();
+
+        QueryWrapper<PrizeRecovery> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(prizeRecoveryListQueryParam.getTitle())) {
+            queryWrapper.like("t1.title",prizeRecoveryListQueryParam.getTitle());
+        }
+        if (StringUtils.isNotBlank(prizeRecoveryListQueryParam.getUserPhone())) {
+            queryWrapper.eq("t2.phonenumber", prizeRecoveryListQueryParam.getUserPhone());
+        }
+        if (Objects.nonNull(prizeRecoveryListQueryParam.getStartTime()) && Objects.nonNull(prizeRecoveryListQueryParam.getEndTime())) {
+            queryWrapper.between("t1.created_time", prizeRecoveryListQueryParam.getStartTime(), prizeRecoveryListQueryParam.getEndTime());
+        }
+        queryWrapper.orderByDesc("t1.created_time");
+        List<PrizeRecoveryListVO> list =  prizeRecoveryService.listByWrapper(queryWrapper);
+
+        return getDataTable(list);
+    }
+}

mp-service/src/main/java/com/qs/mp/admin/domain/param/PrizeRecoveryListQueryParam.java

@@ -0,0 +1,30 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 回收列表查询入参类
+ * @author Cup
+ * @date 2022/5/25
+ */
+@ApiModel("回收列表查询入参类")
+@Data
+public class PrizeRecoveryListQueryParam {
+
+    @ApiModelProperty("商品名称")
+    private String title;
+
+    @ApiModelProperty("用户手机号")
+    private String userPhone;
+
+    @ApiModelProperty("开始时间")
+    private Date startTime;
+
+    @ApiModelProperty("结束时间")
+    private Date endTime;
+
+}

mp-service/src/main/java/com/qs/mp/admin/mapper/PrizeRecoveryMapper.java

@@ -1,7 +1,13 @@
 package com.qs.mp.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.PrizeRecovery;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qs.mp.admin.domain.vo.PrizeRecoveryListVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @auther quanshu
@@ -10,4 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PrizeRecoveryMapper extends BaseMapper<PrizeRecovery> {
 
+
+    /**
+     * 根据条件获取回收订单列表信息
+     * @param queryWrapper
+     * @return
+     */
+    List<PrizeRecoveryListVO> listByWrapper(@Param(Constants.WRAPPER) QueryWrapper<PrizeRecovery> queryWrapper);
+
 }

mp-service/src/main/java/com/qs/mp/admin/service/IPrizeRecoveryService.java

@@ -1,10 +1,14 @@
 package com.qs.mp.admin.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.PrizeRecovery;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qs.mp.admin.domain.vo.PrizeRecoveryListVO;
 import com.qs.mp.user.domain.param.UserPrizeRecoveryCreateParam;
 import com.qs.mp.user.domain.vo.PrizeRecoverySettleVO;
 
+import java.util.List;
+
 /**
  * <p>
  * 奖品回收表 服务类
@@ -22,4 +26,12 @@ public interface IPrizeRecoveryService extends IService<PrizeRecovery> {
      * @param settleVO
      */
     void submitRecovery(Long userId, PrizeRecoverySettleVO settleVO);
+
+    /**
+     * 根据条件获取回收列表信息
+     * @param queryWrapper
+     * @return
+     */
+    List<PrizeRecoveryListVO> listByWrapper(QueryWrapper<PrizeRecovery> queryWrapper);
+
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/PrizeRecoveryServiceImpl.java

@@ -1,9 +1,11 @@
 package com.qs.mp.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.PrizeRecovery;
+import com.qs.mp.admin.domain.vo.PrizeRecoveryListVO;
 import com.qs.mp.admin.mapper.PrizeRecoveryMapper;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IPrizeRecoveryService;
@@ -26,6 +28,7 @@ import org.springframework.util.Assert;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -42,12 +45,15 @@ public class PrizeRecoveryServiceImpl extends ServiceImpl<PrizeRecoveryMapper, P
     @Autowired
     private IUserPrizeStorageService userPrizeStorageService;
 
-    @Autowired
-    private IGoodsService goodsService;
-
     @Autowired
     private IUserCoinService userCoinService;
 
+
+    @Override
+    public List<PrizeRecoveryListVO> listByWrapper(QueryWrapper<PrizeRecovery> queryWrapper) {
+        return this.baseMapper.listByWrapper(queryWrapper);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void submitRecovery(Long userId, PrizeRecoverySettleVO settleVO) {

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserPrizeStorageVO.java

@@ -15,11 +15,4 @@ import java.math.BigDecimal;
 @ApiModel("用户事务奖品库出参类")
 @Data
 public class UserPrizeStorageVO extends UserPrizeStorage {
-
-    @ApiModelProperty("回收折扣")
-    private BigDecimal discountRate;
-
-    @ApiModelProperty("回收返还盲豆数")
-    private Integer returnCoin;
-
 }

mp-service/src/main/resources/mapper/admin/PrizeRecoveryMapper.xml

@@ -10,13 +10,14 @@
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
         <result column="num" property="num" />
-        <result column="ref_id" property="refId" />
-        <result column="prize_type" property="prizeType" />
+        <result column="goods_id" property="goodsId" />
+        <result column="sku_id" property="skuId" />
         <result column="discount_rate" property="discountRate" />
         <result column="return_coin" property="returnCoin" />
         <result column="is_deleted" property="isDeleted" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
+        <result column="properties" property="properties"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -24,4 +25,12 @@
         id, storage_id, user_id, title, pic_url, num, ref_id, prize_type, discount_rate, return_coin, is_deleted, created_time, updated_time
     </sql>
 
+    <select id="listByWrapper" resultType="com.qs.mp.admin.domain.vo.PrizeRecoveryListVO">
+        select t1.*,
+                t2.nick_name,
+                t2.phonenumber userPhone
+        from mp_prize_recovery t1
+        left join sys_user t2 on t1.user_id = t2.user_id;
+        ${ew.customSqlSegment}
+    </select>
 </mapper>