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

Dev

See merge request quanshu/mp-server!796

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

@@ -375,11 +375,17 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 							deliverOrderExcel.setTel(deliverOrder.getTel());
 							deliverOrderExcel.setDeliveryFlowId(userDeliverOrderItem.getDeliveryFlowId());
 							deliverOrderExcel.setCompanyName(userDeliverOrderItem.getCompanyName());
+
+
+							int cost = 0;
+							Integer skuCost = userDeliverOrderItem.getSkuCost();
 							Integer goodsCost = userDeliverOrderItem.getGoodsCost();
-							if (Objects.isNull(goodsCost)) {
-								goodsCost = 0;
+							if (skuCost != null) {
+								cost = skuCost;
+							} else if (goodsCost != null){
+								cost = goodsCost;
 							}
-							deliverOrderExcel.setGoodsCost(BigDecimal.valueOf(goodsCost).divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP));
+							deliverOrderExcel.setGoodsCost(BigDecimal.valueOf(cost).divide(BigDecimal.valueOf(100),2, RoundingMode.HALF_UP));
 
 							String address = deliverOrder.getProvince() + deliverOrder.getCity()
 									+ deliverOrder.getArea() + deliverOrder.getAddress();

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

@@ -299,6 +299,30 @@ public class UserTicketController extends BaseApiController {
     }
 
     ticketBoxVO.setTicketAwardsLabelList(ticketAwardsLabelVOS);
+
+
+    // 轮播图的十个奖品
+    StringBuilder sb = new StringBuilder("FIELD(t1.awards_label,'");
+    int i = 0;
+    for (AwardsLabelEnum awardsLabelEnum : AwardsLabelEnum.values()) {
+      i++;
+      if (i == AwardsLabelEnum.values().length) {
+        sb.append(awardsLabelEnum.getValue()).append("'");
+      }else {
+        sb.append(awardsLabelEnum.getValue()).append("','");
+      }
+    }
+    sb.append(")");
+
+    List<TicketAwardsPrizeVO> ticketAwardsPrizeVOS = ticketAwardsPrizeService.listPrizeVO(new QueryWrapper<TicketAwardsPrize>()
+        .eq("t1.box_id", ticketBox.getBoxId())
+        .eq("t2.is_deleted", 0)
+        .orderByAsc(sb.toString())
+        .orderByAsc("t1.sort")
+        .orderByDesc("t2.sort_weight")
+        .orderByDesc("t2.value")
+        .last("limit 10"));
+    ticketBoxVO.setPrizeList(ticketAwardsPrizeVOS);
     return AjaxResult.success(ticketBoxVO);
   }
 

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

@@ -14,51 +14,53 @@ import lombok.Data;
  */
 @Data
 @ApiModel("用户提货订单项VO")
-public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
+public class UserDeliverOrderItemVO extends UserDeliverOrderItem {
 
-	@ApiModelProperty("商品编号")
-	private String goodsCode;
+    @ApiModelProperty("商品编号")
+    private String goodsCode;
 
-	@ApiModelProperty("sku编号")
-	private String skuCode;
+    @ApiModelProperty("sku编号")
+    private String skuCode;
 
-	@ApiModelProperty("金额")
-	private Integer price;
+    @ApiModelProperty("金额")
+    private Integer price;
 
-	@JSONField(serialize = false)
-	@ApiModelProperty("商品价值")
-	private Integer goodsValue;
+    @JSONField(serialize = false)
+    @ApiModelProperty("商品价值")
+    private Integer goodsValue;
 
-	@ApiModelProperty("商品成本")
-	private Integer goodsCost;
+    @ApiModelProperty("商品成本")
+    private Integer goodsCost;
 
-	@JSONField(serialize = false)
-	@ApiModelProperty("sku价值")
-	private Integer skuValue;
+    @JSONField(serialize = false)
+    @ApiModelProperty("sku价值")
+    private Integer skuValue;
 
-	@ApiModelProperty("供应商名称")
-	private String supplierName;
+    @ApiModelProperty("sku成本")
+    private Integer skuCost;
 
-	  // 物流公司名称
-	@ApiModelProperty("物流公司名称")
-	  private  String companyName;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 
-	  /**
-	   * 公司主页
-	   */
-	  @ApiModelProperty("公司主页")
-	  private String companyHomeUrl;
+    @ApiModelProperty("物流公司名称")
+    private String companyName;
 
-	  /**
-	   * 物流查询接口
-	   */
-	  @ApiModelProperty("物流查询接口")
-	  private String queryUrl;
+    /**
+     * 公司主页
+     */
+    @ApiModelProperty("公司主页")
+    private String companyHomeUrl;
 
-	public Integer getPrice() {
-		if (this.skuValue == null) {
-			return this.goodsValue;
-		}
-		return skuValue;
-	}
+    /**
+     * 物流查询接口
+     */
+    @ApiModelProperty("物流查询接口")
+    private String queryUrl;
+
+    public Integer getPrice() {
+        if (this.skuValue == null) {
+            return this.goodsValue;
+        }
+        return skuValue;
+    }
 }

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -47,7 +47,7 @@
 
     <select id="selectUserDeliverOrderItemVOListByQueryWrapper"
             resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
-        select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t4.value skuValue,t4.sku_code,t5.name supplierName
+        select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t4.value skuValue,t4.cost skuCost,t4.sku_code,t5.name supplierName
         from mp_user_deliver_order_item t1
         left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
         left join mp_goods t3 on t1.goods_id = t3.goods_id