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

优化

See merge request quanshu/mp-server!579

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

@@ -116,6 +116,7 @@ public class UserPrizeRecoveryController extends BaseApiController {
 
         settleVO.setRefundCoin(refundNum);
         // 封装结算对象
+        settleVO.setExchangePrice(exchangePrice);
         settleVO.setStorageId(userPrizeStorage.getStorageId());
         settleVO.setGoodsId(userPrizeStorage.getGoodsId());
         settleVO.setTitle(userPrizeStorage.getTitle());

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

@@ -90,6 +90,10 @@ public class PrizeRecovery implements Serializable {
     @TableField("properties")
     private String properties;
 
+    @ApiModelProperty("兑换单价")
+    @TableField("exchange_price")
+    private Integer exchangePrice;
+
     /**
      * 回收折扣比例
      */

mp-service/src/main/java/com/qs/mp/admin/domain/excel/PrizeRecoveryExcel.java

@@ -0,0 +1,47 @@
+package com.qs.mp.admin.domain.excel;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Cup
+ * @date 2022/5/25
+ */
+@ApiModel("商品回收订单导出类")
+@Data
+public class PrizeRecoveryExcel {
+
+    @ApiModelProperty("回收时间")
+    private Date createdTime;
+
+    @ApiModelProperty("商品名称")
+    private String title;
+
+    @ApiModelProperty("商品sku")
+    private String properties;
+
+    @ApiModelProperty("商品单价(盲豆)")
+    private Integer exchangePrice;
+
+    @ApiModelProperty("数量")
+    private Integer num;
+
+    @ApiModelProperty("回收折扣(%)")
+    private BigDecimal discountRate;
+
+    @ApiModelProperty("返还盲豆数")
+    private Integer refundCoin;
+
+    @ApiModelProperty("用户昵称")
+    private String nickName;
+
+    @ApiModelProperty("用户手机号")
+    private String userPhone;
+
+
+}

mp-service/src/main/java/com/qs/mp/admin/domain/vo/PrizeRecoveryListVO.java

@@ -14,8 +14,11 @@ import lombok.Data;
 @Data
 public class PrizeRecoveryListVO extends PrizeRecovery {
 
+
+    @ApiModelProperty("用户昵称")
     private String nickName;
 
+    @ApiModelProperty("用户手机号")
     private String userPhone;
 
 }

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

@@ -43,5 +43,8 @@ public class PrizeRecoverySettleVO {
     @ApiModelProperty("回收折扣比例")
     private BigDecimal discountRate;
 
+    @ApiModelProperty("兑换单价")
+    private Integer exchangePrice;
+
 
 }