[砍价][修改]:砍价人信息添加

mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java

@@ -57,8 +57,8 @@ public class WxCUser implements Serializable {
 	/*用户昵称**/
 	@io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName")
 	private String nickName;
-	/*用户头像地址**/
-	@io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="gender")
+	/*用户性别**/
+	@io.swagger.annotations.ApiModelProperty(value="用户性别",name="gender")
 	private Integer gender;
 	/*用户头像地址**/
 	@io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl")

mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java

@@ -55,7 +55,7 @@ public class WxOrderCouponPressVo extends WxOrder {
 
 	/**砍价信息列表*/
 	@io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList")
-	private List<WxOrderPress> orderPressList;
+	private List<WxOrderPressVo> orderPressList;
 
 	public Long getCouponOrderId() {
 		return couponOrderId;
@@ -163,11 +163,11 @@ public class WxOrderCouponPressVo extends WxOrder {
 		this.pressLimitNum = pressLimitNum;
 	}
 
-	public List<WxOrderPress> getOrderPressList() {
+	public List<WxOrderPressVo> getOrderPressList() {
 		return orderPressList;
 	}
 
-	public void setOrderPressList(List<WxOrderPress> orderPressList) {
+	public void setOrderPressList(List<WxOrderPressVo> orderPressList) {
 		this.orderPressList = orderPressList;
 	}
 

mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java

@@ -0,0 +1,20 @@
+package com.iformall.domain.vo;
+
+import com.iformall.domain.po.WxOrderPress;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class WxOrderPressVo extends WxOrderPress {
+
+    /**用户昵称**/
+    @io.swagger.annotations.ApiModelProperty(value="用户昵称",name="nickName")
+    private String nickName;
+    /**用户头像地址**/
+    @io.swagger.annotations.ApiModelProperty(value="用户头像地址",name="avatarUrl")
+    private String avatarUrl;
+
+}

mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java

@@ -3,11 +3,12 @@ package com.iformall.mapper;
 import java.util.*;
 import com.iformall.common.CommonMapper;
 import com.iformall.domain.po.WxOrderPress;
+import com.iformall.domain.vo.WxOrderPressVo;
 
 public interface WxOrderPressMapper extends CommonMapper<WxOrderPress, Long> {
 
 	List<WxOrderPress> findList(WxOrderPress wxOrderPress);
-	List<WxOrderPress> findPressList(Map paramMap);
+	List<WxOrderPressVo> findPressList(Map paramMap);
 	
 
 	

mallinkService/src/main/resources/mapper/WxOrderMapper.xml

@@ -620,7 +620,7 @@
         <result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/>
 
         <collection column="{orderId=order_number}" property="orderPressList"
-                    ofType="com.iformall.domain.po.WxOrderPress"
+                    ofType="com.iformall.domain.vo.WxOrderPressVo"
                     javaType="java.util.List"
                     select="com.iformall.mapper.WxOrderPressMapper.findPressList" >
         </collection>

mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml

@@ -48,11 +48,30 @@
 		<include refid="dynamicWhereConditions" />
 	</select>
 
-	<select id="findPressList" parameterType="com.iformall.domain.po.WxOrderPress" resultMap="BaseResultMap">
-		select <include refid="allColumns" />
-		from wx_order_press
-		where order_id = #{orderId}
-	</select>
+    <resultMap id="VoBaseResultMap" type="com.iformall.domain.vo.WxOrderPressVo">
+        <id column="id" jdbcType="BIGINT" property="id" />
+        <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
+        <result column="order_id" jdbcType="BIGINT" property="orderId" />
+        <result column="user_id" jdbcType="BIGINT" property="userId" />
+        <result column="press_value" jdbcType="INTEGER" property="pressValue" />
+        <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+
+        <result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
+        <result column="avatar_url" jdbcType="VARCHAR" property="avatarUrl"/>
+    </resultMap>
+
+    <sql id="allVoColumns">
+	    op.`id`,op.`order_id`,op.`user_id`,op.`press_value`,op.`create_date`,
+	    cu.`nick_name`, cu.`avatar_url`
+	</sql>
+
+    <select id="findPressList" parameterType="com.iformall.domain.vo.WxOrderPressVo" resultMap="VoBaseResultMap">
+        select <include refid="allVoColumns" />
+        from wx_order_press op
+        left join wx_c_user cu on cu.id = op.user_id
+        where op.`order_id` = #{orderId}
+        order by op.`create_date` desc
+    </select>