diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java index 0b5c72a9c..9ce05a2cd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUser.java +++ b/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") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index 40aba8ca2..48665859f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/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 orderPressList; + private List orderPressList; public Long getCouponOrderId() { return couponOrderId; @@ -163,11 +163,11 @@ public class WxOrderCouponPressVo extends WxOrder { this.pressLimitNum = pressLimitNum; } - public List getOrderPressList() { + public List getOrderPressList() { return orderPressList; } - public void setOrderPressList(List orderPressList) { + public void setOrderPressList(List orderPressList) { this.orderPressList = orderPressList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderPressVo.java new file mode 100644 index 000000000..89638f808 --- /dev/null +++ b/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; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java index 20e57a903..7008c592c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java +++ b/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 { List findList(WxOrderPress wxOrderPress); - List findPressList(Map paramMap); + List findPressList(Map paramMap); diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 43edb6833..e22e65929 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -620,7 +620,7 @@ diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index 72a9aaf6b..73bcb6f92 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -48,11 +48,30 @@ - + + + + + + + + + + + + + + op.`id`,op.`order_id`,op.`user_id`,op.`press_value`,op.`create_date`, + cu.`nick_name`, cu.`avatar_url` + + +