列表显示商品内容、添加用户UID返回
This commit is contained in:
parent
938f9702ea
commit
d9619e6fea
@ -23,6 +23,7 @@ public class OrderReqQuery extends BaseQueryParameterReq {
|
||||
private Long memberId;
|
||||
@ApiModelProperty("用户昵称")
|
||||
private String memberNickname;
|
||||
private String memberUid;
|
||||
@ApiModelProperty("用户真实名称")
|
||||
private String memberRealName;
|
||||
/**
|
||||
|
@ -22,8 +22,11 @@ public class OrderRespVO {
|
||||
private Long faceId;
|
||||
private String faceUrl;
|
||||
private Integer type;
|
||||
private String orderType;
|
||||
private String goodsName;
|
||||
@ApiModelProperty("用户昵称")
|
||||
private String memberNickname;
|
||||
private String memberUid;
|
||||
@ApiModelProperty("用户真实名称")
|
||||
private String memberRealName;
|
||||
/**
|
||||
|
@ -94,6 +94,31 @@ public class OrderServiceImpl implements OrderService {
|
||||
public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
|
||||
PageHelper.startPage(query.getPageNum(), query.getPageSize());
|
||||
List<OrderRespVO> list = orderMapper.list(query);
|
||||
list.forEach(item -> {
|
||||
if (Integer.valueOf(-1).equals(item.getType())) {
|
||||
item.setGoodsName("一口价");
|
||||
item.setOrderType("一口价");
|
||||
} else if (Integer.valueOf(0).equals(item.getType())) {
|
||||
// 单品,查询
|
||||
OrderAppRespVO orderAppRespVO = orderMapper.appDetail(item.getId());
|
||||
List<OrderItemVO> orderItemList = orderAppRespVO.getOrderItemList();
|
||||
if (!orderItemList.isEmpty()) {
|
||||
if (Integer.valueOf(1).equals(orderItemList.get(0).getGoodsType())) {
|
||||
item.setGoodsName("录像集");
|
||||
item.setOrderType("录像集");
|
||||
} else if (Integer.valueOf(2).equals(orderItemList.get(0).getGoodsType())) {
|
||||
item.setGoodsName("照片集");
|
||||
item.setOrderType("照片集");
|
||||
} else if (Integer.valueOf(0).equals(orderItemList.get(0).getGoodsType())) {
|
||||
item.setOrderType("旅行Vlog");
|
||||
item.setGoodsName(orderItemList.get(0).getGoodsName());
|
||||
} else {
|
||||
item.setGoodsName("未知商品");
|
||||
item.setOrderType("未知商品");
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
PageInfo<OrderRespVO> pageInfo = new PageInfo<>(list);
|
||||
return ApiResponse.success(pageInfo);
|
||||
}
|
||||
|
@ -7,6 +7,7 @@
|
||||
<result column="scenic_name" property="scenicName"/>
|
||||
<result column="member_id" property="memberId"/>
|
||||
<result column="nickname" property="memberNickname"/>
|
||||
<result column="uid" property="memberUid"/>
|
||||
<result column="real_name" property="memberRealName"/>
|
||||
<result column="openid" property="openId"/>
|
||||
<result column="price" property="price"/>
|
||||
@ -30,6 +31,7 @@
|
||||
<result column="scenic_name" property="scenicName"/>
|
||||
<result column="member_id" property="memberId"/>
|
||||
<result column="nickname" property="memberNickname"/>
|
||||
<result column="uid" property="memberUid"/>
|
||||
<result column="real_name" property="memberRealName"/>
|
||||
<result column="openid" property="openId"/>
|
||||
<result column="price" property="price"/>
|
||||
@ -227,7 +229,7 @@
|
||||
delete from `order` where id = #{id}
|
||||
</delete>
|
||||
<select id="list" resultMap="PCBaseResultListMap">
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname, m.uid,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
o.coupon_price,
|
||||
refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
|
||||
from `order` AS o
|
||||
@ -244,6 +246,9 @@
|
||||
<if test="memberNickname!= null and memberNickname!=''">
|
||||
and m.nickname like concat('%',#{memberNickname},'%')
|
||||
</if>
|
||||
<if test="memberUid!= null">
|
||||
and m.uid = #{memberUid}
|
||||
</if>
|
||||
<if test="memberRealName!= null and memberRealName!=''">
|
||||
and m.real_name like concat('%',#{memberRealName},'%')
|
||||
</if>
|
||||
@ -299,7 +304,7 @@
|
||||
order by o.create_at desc
|
||||
</select>
|
||||
<select id="listDetail" resultMap="PCBaseResultMap">
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname, m.uid,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
o.coupon_price,
|
||||
refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
|
||||
from `order` AS o
|
||||
@ -316,6 +321,9 @@
|
||||
<if test="memberNickname!= null and memberNickname!=''">
|
||||
and m.nickname like concat('%',#{memberNickname},'%')
|
||||
</if>
|
||||
<if test="memberUid!= null">
|
||||
and m.uid = #{memberUid}
|
||||
</if>
|
||||
<if test="memberRealName!= null and memberRealName!=''">
|
||||
and m.real_name like concat('%',#{memberRealName},'%')
|
||||
</if>
|
||||
@ -374,7 +382,7 @@
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id, o.type, o.openid, o.face_id, f.face_url, o.price, o.pay_price, o.remark, o.broker_id, o.promo_code, o.refund_reason,
|
||||
o.coupon_price,
|
||||
o.refund_status, o.status, o.create_at, o.update_at, o.pay_at, o.cancel_at, o.refund_at,
|
||||
m.nickname , m.real_name
|
||||
m.nickname, m.uid , m.real_name
|
||||
from `order` o
|
||||
left join face f on o.face_id = f.id
|
||||
left join member m on m.id = o.member_id
|
||||
@ -412,7 +420,7 @@
|
||||
where o.id = #{id}
|
||||
</select>
|
||||
<select id="refundList" resultType="com.ycwl.basic.model.pc.order.resp.OrderRespVO">
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname,m.uid ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
|
||||
refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
|
||||
from `order` AS o
|
||||
left join member m on o.member_id = m.id
|
||||
@ -428,6 +436,9 @@
|
||||
<if test="memberNickname!= null and memberNickname!=''">
|
||||
and m.nickname like concat('%',#{memberNickname},'%')
|
||||
</if>
|
||||
<if test="memberUid!= null">
|
||||
and m.uid = #{memberUid}
|
||||
</if>
|
||||
<if test="memberRealName!= null and memberRealName!=''">
|
||||
and m.real_name like concat('%',#{memberRealName},'%')
|
||||
</if>
|
||||
|
Loading…
x
Reference in New Issue
Block a user