cup 2 년 전
부모
커밋
95dce3511f

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

@@ -1,5 +1,6 @@
 package com.qs.mp.user.domain.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 
 import io.swagger.annotations.ApiModel;
@@ -20,9 +21,17 @@ public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 	@ApiModelProperty("sku编号")
 	private String skuCode;
 
-	@ApiModelProperty("商品金额")
+	@ApiModelProperty("金额")
 	private Integer price;
 
+	@JSONField(serialize = false)
+	@ApiModelProperty("商品价值")
+	private Integer goodsValue;
+
+	@JSONField(serialize = false)
+	@ApiModelProperty("sku价值")
+	private Integer skuValue;
+
 	@ApiModelProperty("供应商名称")
 	private String supplierName;
 
@@ -41,4 +50,11 @@ public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 	   */
 	  @ApiModelProperty("物流查询接口")
 	  private String queryUrl;
+
+	public Integer getPrice() {
+		if (this.skuValue == null) {
+			return this.goodsValue;
+		}
+		return skuValue;
+	}
 }

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

@@ -36,7 +36,7 @@
 	
 	 <!-- 查询用户订单明细列表 -->
     <select id="selectUserDeliverOrderItemVOList" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
-		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t4.sku_code,t5.name supplierName
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t4.value skuValue,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