记得上下班打卡 | git大法好,push需谨慎

Commit e0f96e35 authored by wangyifan's avatar wangyifan

订单列表:增加物流方式响应、条件请求

订单详情:增加下单人信息响应
parent 2fb244b4
...@@ -64,6 +64,15 @@ public class GoblinStoreOrderListVo implements Cloneable { ...@@ -64,6 +64,15 @@ public class GoblinStoreOrderListVo implements Cloneable {
@ApiModelProperty(value = " sku相关") @ApiModelProperty(value = " sku相关")
private List<GoblinStoreOrderListSkuVo> storeOrderListSkuVoList; private List<GoblinStoreOrderListSkuVo> storeOrderListSkuVoList;
@ApiModelProperty(value = " 下单账号-UID")
private String userId;
@ApiModelProperty(value = " 下单账号-昵称")
private String userName;
@ApiModelProperty(value = " 下单账号-手机号")
private String userMobile;
private static final GoblinStoreOrderListVo obj = new GoblinStoreOrderListVo(); private static final GoblinStoreOrderListVo obj = new GoblinStoreOrderListVo();
......
...@@ -127,6 +127,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -127,6 +127,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
orderListSkuVos.add(itemSkuVo); orderListSkuVos.add(itemSkuVo);
} }
vo.setStoreOrderListSkuVoList(orderListSkuVos); vo.setStoreOrderListSkuVoList(orderListSkuVos);
// 增加物流信息
vo.setGoblinMailVoList(redisUtils.getGoblinMail(item.getOrderId()));
listVos.add(vo); listVos.add(vo);
} }
PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos); PageInfo<GoblinStoreOrderListVo> pageInfo = new PageInfo(listVos);
...@@ -148,6 +150,10 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -148,6 +150,10 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
} }
GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew(); GoblinStoreOrderListVo vo = GoblinStoreOrderListVo.getNew();
vo.setCreatedAt(orderVo.getCreatedAt()); vo.setCreatedAt(orderVo.getCreatedAt());
// 订单详情增加下单账号信息
vo.setUserId(orderVo.getUserId());
vo.setUserMobile(orderVo.getUserMobile());
vo.setUserName(orderVo.getUserName());
GoblinOrderAttrVo orderAttrVo = orderVo.getOrderAttrVo(); GoblinOrderAttrVo orderAttrVo = orderVo.getOrderAttrVo();
if (orderAttrVo != null) { if (orderAttrVo != null) {
vo.setExpressAddressDetail(orderAttrVo.getExpressAddressDetail()); vo.setExpressAddressDetail(orderAttrVo.getExpressAddressDetail());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment