b2c / gateway · Commits

Commit 6d2bef7b330057d3e772764679566620e0912e1a

Authored by Jiang
1 parent 207329b4

整合订单RPC

Inline Side-by-side
Showing 14 changed files with 745 additions and 578 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PayOrderReq.java
  View file @6d2bef7
@@ -13,6 +13,8 @@ public class PayOrderReq extends BaseReq { @@ -13,6 +13,8 @@ public class PayOrderReq extends BaseReq {
13 13
14 @ApiModelProperty("订单id") 14 @ApiModelProperty("订单id")
15 private Long orderId; 15 private Long orderId;
  16 + @ApiModelProperty("买家id")
  17 + private Long shopBuyerId;
16 @ApiModelProperty("支付类型，10线上支付，20线下支付") 18 @ApiModelProperty("支付类型，10线上支付，20线下支付")
17 private Integer payType; 19 private Integer payType;
18 20
@@ -24,6 +26,14 @@ public class PayOrderReq extends BaseReq { @@ -24,6 +26,14 @@ public class PayOrderReq extends BaseReq {
24 this.orderId = orderId; 26 this.orderId = orderId;
25 } 27 }
26 28
  29 + public Long getShopBuyerId() {
  30 + return shopBuyerId;
  31 + }
  32 +
  33 + public void setShopBuyerId(Long shopBuyerId) {
  34 + this.shopBuyerId = shopBuyerId;
  35 + }
  36 +
27 public Integer getPayType() { 37 public Integer getPayType() {
28 return payType; 38 return payType;
29 } 39 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/GetOrderListReq.java
  View file @6d2bef7
1 package com.diligrp.mobsite.getway.domain.protocol.saler.order; 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2
3 import com.diligrp.mobsite.getway.domain.base.BaseListReq; 3 import com.diligrp.mobsite.getway.domain.base.BaseListReq;
4 -import io.swagger.annotations.ApiModelProperty;  
5 4
6 -import java.util.List; 5 +import io.swagger.annotations.ApiModelProperty;
7 6
8 public class GetOrderListReq extends BaseListReq { 7 public class GetOrderListReq extends BaseListReq {
9 8
10 -  
11 /** 9 /**
12 - * 订单状态 10 + *
13 */ 11 */
14 - @ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")  
15 - private Integer orderState; 12 + private static final long serialVersionUID = -8465618487898801860L;
16 /** 13 /**
17 - * 支付类型 14 + * 买家
18 */ 15 */
19 - @ApiModelProperty(value = "支付方式：10-在线支付,20-线下支付")  
20 - private List<Integer> payType; 16 + @ApiModelProperty(value = "买家id")
  17 + private Long shopBuyerId;
  18 + /**
  19 + * 卖家
  20 + */
  21 + @ApiModelProperty("卖家id")
  22 + private Long sellerId;
  23 + /** 订单状态 */
  24 + @ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
  25 + private Integer orderStatus;
  26 + @ApiModelProperty("每页显示记录数")
  27 + private Integer pageSize = 10;
  28 + @ApiModelProperty("第几页")
  29 + private Integer page = 1;
  30 + @ApiModelProperty("用户类型:买家，卖家")
  31 + private Integer userType;
  32 + @ApiModelProperty("订单查询参数")
  33 + private String queryString;
  34 +
  35 + public Long getShopBuyerId() {
  36 + return shopBuyerId;
  37 + }
  38 +
  39 + public void setShopBuyerId(Long shopBuyerId) {
  40 + this.shopBuyerId = shopBuyerId;
  41 + }
  42 +
  43 + public Long getSellerId() {
  44 + return sellerId;
  45 + }
  46 +
  47 + public void setSellerId(Long sellerId) {
  48 + this.sellerId = sellerId;
  49 + }
  50 +
  51 + public Integer getOrderStatus() {
  52 + return orderStatus;
  53 + }
  54 +
  55 + public void setOrderStatus(Integer orderStatus) {
  56 + this.orderStatus = orderStatus;
  57 + }
  58 +
  59 + public Integer getPageSize() {
  60 + return pageSize;
  61 + }
21 62
22 - public Integer getOrderState() {  
23 - return orderState; 63 + public void setPageSize(Integer pageSize) {
  64 + this.pageSize = pageSize;
24 } 65 }
25 66
26 - public void setOrderState(Integer orderState) {  
27 - this.orderState = orderState; 67 + public Integer getPage() {
  68 + return page;
28 } 69 }
29 70
30 - public List<Integer> getPayType() {  
31 - return payType; 71 + public void setPage(Integer page) {
  72 + this.page = page;
32 } 73 }
33 74
34 - public void setPayType(List<Integer> payType) {  
35 - this.payType = payType; 75 + public Integer getUserType() {
  76 + return userType;
36 } 77 }
  78 +
  79 + public void setUserType(Integer userType) {
  80 + this.userType = userType;
  81 + }
  82 +
  83 + public String getQueryString() {
  84 + return queryString;
  85 + }
  86 +
  87 + public void setQueryString(String queryString) {
  88 + this.queryString = queryString;
  89 + }
  90 +
37 } 91 }
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/SearchOrderListReq.java
  View file @6d2bef7
@@ -6,11 +6,50 @@ import io.swagger.annotations.ApiModelProperty; @@ -6,11 +6,50 @@ import io.swagger.annotations.ApiModelProperty;
6 public class SearchOrderListReq extends BaseListReq { 6 public class SearchOrderListReq extends BaseListReq {
7 7
8 /** 8 /**
  9 + *
  10 + */
  11 + private static final long serialVersionUID = 7749735032538430663L;
  12 +
  13 + @ApiModelProperty(value = "买家id")
  14 + private Long shopBuyerId;
  15 + /**
  16 + * 卖家
  17 + */
  18 + @ApiModelProperty("卖家id")
  19 + private Long sellerId;
  20 + /** 订单状态 */
  21 + @ApiModelProperty("订单状态")
  22 + private Integer orderStatus;
  23 + /**
9 * 订单状态 24 * 订单状态
10 */ 25 */
11 @ApiModelProperty(value = "搜索关键字：订单号等 ") 26 @ApiModelProperty(value = "搜索关键字：订单号等 ")
12 private String keyword; 27 private String keyword;
13 28
  29 + public Long getShopBuyerId() {
  30 + return shopBuyerId;
  31 + }
  32 +
  33 + public void setShopBuyerId(Long shopBuyerId) {
  34 + this.shopBuyerId = shopBuyerId;
  35 + }
  36 +
  37 + public Long getSellerId() {
  38 + return sellerId;
  39 + }
  40 +
  41 + public void setSellerId(Long sellerId) {
  42 + this.sellerId = sellerId;
  43 + }
  44 +
  45 + public Integer getOrderStatus() {
  46 + return orderStatus;
  47 + }
  48 +
  49 + public void setOrderStatus(Integer orderStatus) {
  50 + this.orderStatus = orderStatus;
  51 + }
  52 +
14 public String getKeyword() { 53 public String getKeyword() {
15 return keyword; 54 return keyword;
16 } 55 }
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/OrderRPC.java
  View file @6d2bef7
1 package com.diligrp.mobsite.getway.rpc; 1 package com.diligrp.mobsite.getway.rpc;
2 2
  3 +import java.util.List;
  4 +
3 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; 5 import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
4 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; 6 import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
5 -import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise; 7 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
  8 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
  9 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
6 import com.diligrp.titan.sdk.output.PageOutput; 10 import com.diligrp.titan.sdk.output.PageOutput;
7 11
8 -import java.util.List;  
9 -  
10 -  
11 /** 12 /**
12 * <B>Description</B> 订单 <br /> 13 * <B>Description</B> 订单 <br />
13 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 14 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  15 + * <br />
14 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 16 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
15 * <B>Company</B> 地利集团 17 * <B>Company</B> 地利集团
  18 + *
16 * @createTime 2014年9月1日 下午6:30:54 19 * @createTime 2014年9月1日 下午6:30:54
17 * @author zhangshirui 20 * @author zhangshirui
18 */ 21 */
19 public interface OrderRPC { 22 public interface OrderRPC {
20 23
21 - /**  
22 - * 获取订单列表  
23 - * @param input  
24 - * @param userId  
25 - * @return  
26 - * @createTime 2014年9月2日 下午2:36:47  
27 - * @author zhangshirui  
28 - */  
29 - PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId);  
30 -  
31 - /**  
32 - * 根据id查询订单详情  
33 - * @param orderId  
34 - * @param userId  
35 - * @createTime 2014年9月3日 上午11:08:03  
36 - * @author zhangshirui  
37 - * @return  
38 - */  
39 - OrderListResponseDto getOrderById(Long orderId, Long userId);  
40 -  
41 - /**  
42 - * 取消订单  
43 - * @param orderId  
44 - * @param reason  
45 - * @param userId  
46 - * @return  
47 - * @createTime 2014年9月3日 上午11:27:08  
48 - * @author zhangshirui  
49 - */  
50 - Integer cancelOrder(Long orderId, String reason, Long userId);  
51 -  
52 -  
53 - /**  
54 - * 确认提货  
55 - * @param orderId  
56 - * @param userId  
57 - * @return  
58 - * @createTime 2014年9月3日 下午4:46:26  
59 - * @author zhangshirui  
60 - */  
61 - Integer confirmPickUp(Long orderId, String paytoken, Long userId);  
62 -  
63 -  
64 -  
65 -  
66 - /**  
67 - * 发布商品评价  
68 - * @param productAppraises  
69 - * @param userId  
70 - */  
71 - void addComment(List<ProductAppraise> productAppraises, Long orderId, Long userId);  
72 -  
73 -  
74 -  
75 - 24 + /**
  25 + * 获取订单列表
  26 + *
  27 + * @param input
  28 + * @param userId
  29 + * @return
  30 + * @createTime 2014年9月2日 下午2:36:47
  31 + * @author zhangshirui
  32 + */
  33 + PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId);
  34 +
  35 + /**
  36 + * 根据id查询订单详情
  37 + *
  38 + * @param orderId
  39 + * @param userId
  40 + * @createTime 2014年9月3日 上午11:08:03
  41 + * @author zhangshirui
  42 + * @return
  43 + */
  44 + GetOrderDetailResp getOrderById(Long orderId, Long userId);
  45 +
  46 + /**
  47 + * 取消订单
  48 + *
  49 + * @param orderId
  50 + * @param userId
  51 + * @return
  52 + * @createTime 2014年9月3日 上午11:27:08
  53 + * @author zhangshirui
  54 + */
  55 + Integer cancelOrder(Long orderId, Long userId);
  56 +
  57 + /**
  58 + * 确认提货
  59 + *
  60 + * @param orderId
  61 + * @param userId
  62 + * @return
  63 + * @createTime 2014年9月3日 下午4:46:26
  64 + * @author zhangshirui
  65 + */
  66 + Integer confirmPickUp(Long orderId, Long userId);
  67 +
  68 + /**
  69 + * 确认收款
  70 + *
  71 + * @param orderId
  72 + * 订单id
  73 + * @param sellerId
  74 + * 卖家id
  75 + * @return
  76 + */
  77 + Integer confirmReceipt(Long orderId, Long sellerId);
  78 +
  79 + /**
  80 + * 支付
  81 + *
  82 + * @param orderId
  83 + * 订单id
  84 + * @param shopBuyerId
  85 + * 买家id
  86 + * @param payType
  87 + * TODO
  88 + * @return
  89 + */
  90 + Integer pay(Long orderId, Long shopBuyerId, Integer payType);
  91 +
  92 + /**
  93 + * 拒绝接单
  94 + *
  95 + * @param orderId
  96 + * 订单id
  97 + * @param sellerId
  98 + * 卖家id
  99 + * @param refuseReason
  100 + * 拒绝原因
  101 + * @return
  102 + */
  103 + Integer refuse(Long orderId, Long sellerId, String refuseReason);
  104 +
  105 + /**
  106 + * 删除订单
  107 + *
  108 + * @param orderId
  109 + * 订单id
  110 + * @param userId
  111 + * 用户id
  112 + * @param userType
  113 + * 用户类型:10买家，20卖家
  114 + * @return
  115 + */
  116 + Integer remove(Long orderId, Long userId, Integer userType);
  117 +
  118 + /**
  119 + * 提交订单
  120 + *
  121 + * @param req
  122 + * @return
  123 + */
  124 + SubmitOrderResp submit(SubmitOrderReq req);
  125 +
  126 + /**
  127 + * 接单
  128 + *
  129 + * @param orderId
  130 + * 订单id
  131 + * @param userId
  132 + * 卖家id
  133 + * @param pricePrivilege
  134 + * 修改后的价格
  135 + * @return
  136 + */
  137 + Integer take(Long orderId, Long userId, Long pricePrivilege);
76 } 138 }
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/BuyerOrderRPCService.java deleted 100644 → 0
  View file @207329b
1 -package com.diligrp.mobsite.getway.rpc.buyer;  
2 -  
3 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;  
4 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;  
5 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;  
6 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;  
7 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;  
8 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;  
9 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;  
10 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;  
11 -  
12 -public interface BuyerOrderRPCService {  
13 -  
14 - SubmitOrderResp submit(SubmitOrderReq req);  
15 -  
16 - PayOrderResp pay(PayOrderReq req);  
17 -  
18 - BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req);  
19 -  
20 - BuyerCancelOrderResp cancel(BuyerCancelOrderReq req);  
21 -  
22 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/BuyerOrderRPCServiceBean.java deleted 100644 → 0
  View file @207329b
1 -package com.diligrp.mobsite.getway.rpc.buyer.impl;  
2 -  
3 -import java.util.ArrayList;  
4 -import java.util.List;  
5 -  
6 -import javax.annotation.Resource;  
7 -  
8 -import org.springframework.stereotype.Service;  
9 -  
10 -import com.b2c.orders.domain.client.dto.request.BuyerCancelRequestDto;  
11 -import com.b2c.orders.domain.client.dto.request.BuyerConfirmRequestDto;  
12 -import com.b2c.orders.domain.client.dto.request.OrderItemDto;  
13 -import com.b2c.orders.domain.client.dto.request.PayOrderRequestDto;  
14 -import com.b2c.orders.domain.client.dto.request.SubmitOrderRequestDto;  
15 -import com.b2c.orders.domain.client.dto.response.ApiDataResponse;  
16 -import com.b2c.orders.domain.client.dto.response.ApiResponse;  
17 -import com.b2c.orders.domain.client.dto.response.SubmitOrderResponseDto;  
18 -import com.b2c.orders.domain.client.service.OrderService;  
19 -import com.diligrp.mobsite.getway.domain.common.ResultCode;  
20 -import com.diligrp.mobsite.getway.domain.protocol.OrderItem;  
21 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;  
22 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;  
23 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;  
24 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;  
25 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;  
26 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;  
27 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;  
28 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;  
29 -import com.diligrp.mobsite.getway.rpc.buyer.BuyerOrderRPCService;  
30 -  
31 -@Service  
32 -public class BuyerOrderRPCServiceBean implements BuyerOrderRPCService {  
33 -  
34 - @Resource  
35 - private OrderService orderService;  
36 -  
37 - @Override  
38 - public SubmitOrderResp submit(SubmitOrderReq req) {  
39 - SubmitOrderResp resp = new SubmitOrderResp();  
40 - SubmitOrderRequestDto request = new SubmitOrderRequestDto();  
41 - request.setBuyerMemo(req.getBuyerMemo());  
42 - request.setDeliveryAddress(req.getDeliveryAddress());  
43 - request.setDeliveryTime(req.getDeliveryTime());  
44 - request.setDeliveryType(req.getDeliveryType());  
45 - request.setMarketId(req.getMarketId());  
46 - List<OrderItemDto> orderItems = new ArrayList<>(req.getOrderItems().size());  
47 - for (OrderItem item : req.getOrderItems()) {  
48 - OrderItemDto dto = new OrderItemDto();  
49 - dto.setAmount(item.getAmount());  
50 - dto.setSku(item.getSku());  
51 - orderItems.add(dto);  
52 - }  
53 - request.setOrderItems(orderItems);  
54 - request.setReceiverName(req.getReceiverName());  
55 - request.setReceiverPhoneNumber(req.getReceiverPhoneNumber());  
56 - request.setReservationTime(req.getReservationTime());  
57 - request.setShopBuyerId(req.getShopBuyerId());  
58 - ApiDataResponse<SubmitOrderResponseDto> response = this.orderService.submit(request);  
59 - if (response == null) {  
60 - resp.setCode(ResultCode.NETWORK_FAILED);  
61 - return resp;  
62 - }  
63 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
64 - resp.setCode(ResultCode.SUCCESS);  
65 - SubmitOrderResponseDto data = response.getData();  
66 - resp.setOrderId(data.getOrderId());  
67 - } else {  
68 - resp.setCode(ResultCode.BUSINESS_FAILED);  
69 - }  
70 - resp.setMsg(response.getMessage());  
71 - return resp;  
72 - }  
73 -  
74 - @Override  
75 - public PayOrderResp pay(PayOrderReq req) {  
76 - PayOrderResp resp = new PayOrderResp();  
77 - PayOrderRequestDto request = new PayOrderRequestDto();  
78 - request.setOrderId(req.getOrderId());  
79 - request.setPayType(req.getPayType());  
80 - ApiResponse response = this.orderService.pay(request);  
81 - if (response == null) {  
82 - resp.setCode(ResultCode.NETWORK_FAILED);  
83 - return resp;  
84 - }  
85 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
86 - resp.setCode(ResultCode.SUCCESS);  
87 - } else {  
88 - resp.setCode(ResultCode.BUSINESS_FAILED);  
89 - }  
90 - resp.setMsg(response.getMessage());  
91 - return resp;  
92 - }  
93 -  
94 - @Override  
95 - public BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req) {  
96 - BuyerConfirmReceiptResp resp = new BuyerConfirmReceiptResp();  
97 - BuyerConfirmRequestDto request = new BuyerConfirmRequestDto();  
98 - request.setOrderId(req.getOrderId());  
99 - ApiResponse response = this.orderService.buyerConfirm(request);  
100 - if (response == null) {  
101 - resp.setCode(ResultCode.NETWORK_FAILED);  
102 - return resp;  
103 - }  
104 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
105 - resp.setCode(ResultCode.SUCCESS);  
106 - } else {  
107 - resp.setCode(ResultCode.BUSINESS_FAILED);  
108 - }  
109 - resp.setMsg(response.getMessage());  
110 - return resp;  
111 - }  
112 -  
113 - @Override  
114 - public BuyerCancelOrderResp cancel(BuyerCancelOrderReq req) {  
115 - BuyerCancelOrderResp resp = new BuyerCancelOrderResp();  
116 - BuyerCancelRequestDto request = new BuyerCancelRequestDto();  
117 - request.setOrderId(req.getOrderId());  
118 - request.setShopBuyerId(req.getShopBuyerId());  
119 - ApiResponse response = this.orderService.cancel(request);  
120 - if (response == null) {  
121 - resp.setCode(ResultCode.NETWORK_FAILED);  
122 - return resp;  
123 - }  
124 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
125 - resp.setCode(ResultCode.SUCCESS);  
126 - } else {  
127 - resp.setCode(ResultCode.BUSINESS_FAILED);  
128 - }  
129 - resp.setMsg(response.getMessage());  
130 - return resp;  
131 - }  
132 -  
133 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/OrderRPCImpl.java
  View file @6d2bef7
1 package com.diligrp.mobsite.getway.rpc.impl; 1 package com.diligrp.mobsite.getway.rpc.impl;
2 2
3 -import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;  
4 -import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;  
5 -import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise;  
6 -import com.diligrp.mobsite.getway.rpc.OrderRPC;  
7 -import com.diligrp.titan.sdk.output.PageOutput; 3 +import java.text.DateFormat;
  4 +import java.text.SimpleDateFormat;
  5 +import java.util.ArrayList;
  6 +import java.util.List;
  7 +
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 11
12 -import java.util.List;  
13 - 12 +import com.b2c.orders.domain.client.dto.request.BuyerCancelRequestDto;
  13 +import com.b2c.orders.domain.client.dto.request.BuyerConfirmRequestDto;
  14 +import com.b2c.orders.domain.client.dto.request.OrderDetailRequestDto;
  15 +import com.b2c.orders.domain.client.dto.request.OrderItemDto;
  16 +import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
  17 +import com.b2c.orders.domain.client.dto.request.OrderRemoveRequestDto;
  18 +import com.b2c.orders.domain.client.dto.request.PayOrderRequestDto;
  19 +import com.b2c.orders.domain.client.dto.request.SellerConfirmRequestDto;
  20 +import com.b2c.orders.domain.client.dto.request.SellerRefuseRequestDto;
  21 +import com.b2c.orders.domain.client.dto.request.SubmitOrderRequestDto;
  22 +import com.b2c.orders.domain.client.dto.request.TakeOrderRequestDto;
  23 +import com.b2c.orders.domain.client.dto.response.ApiDataResponse;
  24 +import com.b2c.orders.domain.client.dto.response.ApiPageDataResponse;
  25 +import com.b2c.orders.domain.client.dto.response.ApiResponse;
  26 +import com.b2c.orders.domain.client.dto.response.OrderDetailResponseDto;
  27 +import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
  28 +import com.b2c.orders.domain.client.dto.response.SubmitOrderResponseDto;
  29 +import com.b2c.orders.domain.client.service.OrderService;
  30 +import com.diligrp.mobsite.getway.domain.common.ResultCode;
  31 +import com.diligrp.mobsite.getway.domain.protocol.OrderItem;
  32 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
  33 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
  34 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
  35 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.model.SellerOrder;
  36 +import com.diligrp.mobsite.getway.rpc.OrderRPC;
  37 +import com.diligrp.titan.sdk.output.PageOutput;
14 38
15 /** 39 /**
16 * <B>Description</B> 订单rpc <br /> 40 * <B>Description</B> 订单rpc <br />
17 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> 41 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.
  42 + * <br />
18 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> 43 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
19 * <B>Company</B> 地利集团 44 * <B>Company</B> 地利集团
20 * 45 *
@@ -24,34 +49,220 @@ import java.util.List; @@ -24,34 +49,220 @@ import java.util.List;
24 @Service("orderRPC") 49 @Service("orderRPC")
25 public class OrderRPCImpl implements OrderRPC { 50 public class OrderRPCImpl implements OrderRPC {
26 51
27 - public static final long ORDER_USER_TYPE_BUYER = 10L;  
28 - public static final long ORDER_USER_TYPE_SELLER = 20L; 52 + public static final long ORDER_USER_TYPE_BUYER = 10L;
  53 + public static final long ORDER_USER_TYPE_SELLER = 20L;
  54 +
  55 + private static final Logger logger = LoggerFactory.getLogger(OrderRPCImpl.class);
  56 +
  57 + private OrderService orderService;
  58 +
  59 + @Override
  60 + public PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId) {
  61 + PageOutput<List<OrderListResponseDto>> output = new PageOutput<>();
  62 + ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(input);
  63 + if (response == null) {
  64 + output.setCode(ResultCode.NETWORK_FAILED);
  65 + return output;
  66 + }
  67 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  68 + output.setCode(ResultCode.SUCCESS);
  69 + output.setPageSize(response.getPageSize());
  70 + output.setPage(response.getCurrentPage());
  71 + output.setTotalPage(response.getTotalPage());
  72 + output.setResult(response.getMessage());
  73 + output.setData(response.getList());
  74 + } else {
  75 + output.setCode(ResultCode.BUSINESS_FAILED);
  76 + }
  77 + return output;
  78 + }
  79 +
  80 + @Override
  81 + public GetOrderDetailResp getOrderById(Long orderId, Long userId) {
  82 + OrderDetailRequestDto request = new OrderDetailRequestDto();
  83 + request.setOrderId(orderId);
  84 + ApiDataResponse<OrderDetailResponseDto> response = this.orderService.detail(request);
  85 + GetOrderDetailResp resp = new GetOrderDetailResp();
  86 + if (response == null) {
  87 + resp.setCode(ResultCode.NETWORK_FAILED);
  88 + return resp;
  89 + }
  90 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  91 + resp.setCode(ResultCode.SUCCESS);
  92 + SellerOrder order = new SellerOrder();
  93 + DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  94 + OrderDetailResponseDto dto = response.getData();
  95 + order.setBuyerMemo(dto.getBuyerMemo());
  96 + if (dto.getDeliveryTime() != null) {
  97 + order.setDeliveryTime(df.format(dto.getDeliveryTime()));
  98 + }
  99 + order.setDeliveryType(dto.getDeliveryType());
  100 + order.setId(dto.getId());
  101 + order.setOrderStatus(dto.getOrderStatus());
  102 + order.setPayStatus(dto.getPayStatus());
  103 + order.setPayType(dto.getPayType());
  104 + order.setRealTotalPrice(dto.getRealTotalPrice());
  105 + order.setReservationTime(dto.getReservationTime());
  106 + order.setSubmitTime(df.format(dto.getSubmitTime()));
  107 + order.setTotalPrice(dto.getTotalPrice());
  108 + } else {
  109 + resp.setCode(ResultCode.BUSINESS_FAILED);
  110 + }
  111 + resp.setMsg(response.getMessage());
  112 + return resp;
  113 + }
  114 +
  115 + @Override
  116 + public Integer cancelOrder(Long orderId, Long userId) {
  117 + BuyerCancelRequestDto request = new BuyerCancelRequestDto();
  118 + request.setOrderId(orderId);
  119 + request.setShopBuyerId(userId);
  120 + ApiResponse response = this.orderService.cancel(request);
  121 + if (response == null) {
  122 + return ResultCode.NETWORK_FAILED;
  123 + }
  124 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  125 + return ResultCode.SUCCESS;
  126 + } else {
  127 + return ResultCode.BUSINESS_FAILED;
  128 + }
  129 + }
  130 +
  131 + @Override
  132 + public Integer confirmPickUp(Long orderId, Long userId) {
  133 + BuyerConfirmRequestDto request = new BuyerConfirmRequestDto();
  134 + request.setOrderId(orderId);
  135 + request.setShopBuyerId(userId);
  136 + ApiResponse response = this.orderService.buyerConfirm(request);
  137 + if (response == null) {
  138 + return ResultCode.NETWORK_FAILED;
  139 + }
  140 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  141 + return ResultCode.SUCCESS;
  142 + } else {
  143 + return ResultCode.BUSINESS_FAILED;
  144 + }
  145 + }
29 146
30 - private static final Logger logger = LoggerFactory.getLogger(OrderRPCImpl.class); 147 + @Override
  148 + public Integer confirmReceipt(Long orderId, Long sellerId) {
  149 + SellerConfirmRequestDto request = new SellerConfirmRequestDto();
  150 + request.setOrderId(orderId);
  151 + request.setSellerId(sellerId);
  152 + ApiResponse response = this.orderService.sellerConfirm(request);
  153 + if (response == null) {
  154 + return ResultCode.NETWORK_FAILED;
  155 + }
  156 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  157 + return ResultCode.SUCCESS;
  158 + } else {
  159 + return ResultCode.BUSINESS_FAILED;
  160 + }
  161 + }
31 162
  163 + @Override
  164 + public Integer pay(Long orderId, Long shopBuyerId, Integer payType) {
  165 + PayOrderRequestDto request = new PayOrderRequestDto();
  166 + request.setOrderId(orderId);
  167 + request.setShopBuyerId(shopBuyerId);
  168 + request.setPayType(payType);
  169 + ApiResponse response = this.orderService.pay(request);
  170 + if (response == null) {
  171 + return ResultCode.NETWORK_FAILED;
  172 + }
  173 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  174 + return ResultCode.SUCCESS;
  175 + } else {
  176 + return ResultCode.BUSINESS_FAILED;
  177 + }
  178 + }
32 179
33 - @Override  
34 - public PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId) {  
35 - return null;  
36 - } 180 + @Override
  181 + public Integer refuse(Long orderId, Long sellerId, String refuseReason) {
  182 + SellerRefuseRequestDto request = new SellerRefuseRequestDto();
  183 + request.setOrderId(orderId);
  184 + request.setRefuseReason(refuseReason);
  185 + request.setSellerId(sellerId);
  186 + ApiResponse response = this.orderService.refuse(request);
  187 + if (response == null) {
  188 + return ResultCode.NETWORK_FAILED;
  189 + }
  190 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  191 + return ResultCode.SUCCESS;
  192 + } else {
  193 + return ResultCode.BUSINESS_FAILED;
  194 + }
  195 + }
37 196
38 - @Override  
39 - public OrderListResponseDto getOrderById(Long orderId, Long userId) {  
40 - return null;  
41 - } 197 + @Override
  198 + public Integer remove(Long orderId, Long userId, Integer userType) {
  199 + OrderRemoveRequestDto request = new OrderRemoveRequestDto();
  200 + request.setOrderId(orderId);
  201 + request.setUserType(userType);
  202 + ApiResponse response = this.orderService.remove(request);
  203 + if (response == null) {
  204 + return ResultCode.NETWORK_FAILED;
  205 + }
  206 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  207 + return ResultCode.SUCCESS;
  208 + } else {
  209 + return ResultCode.BUSINESS_FAILED;
  210 + }
  211 + }
42 212
43 - @Override  
44 - public Integer cancelOrder(Long orderId, String reason, Long userId) {  
45 - return null;  
46 - } 213 + @Override
  214 + public SubmitOrderResp submit(SubmitOrderReq req) {
  215 + SubmitOrderResp resp = new SubmitOrderResp();
  216 + SubmitOrderRequestDto request = new SubmitOrderRequestDto();
  217 + request.setBuyerMemo(req.getBuyerMemo());
  218 + request.setDeliveryAddress(req.getDeliveryAddress());
  219 + request.setDeliveryTime(req.getDeliveryTime());
  220 + request.setDeliveryType(req.getDeliveryType());
  221 + request.setMarketId(req.getMarketId());
  222 + List<OrderItemDto> orderItems = new ArrayList<>(req.getOrderItems().size());
  223 + for (OrderItem item : req.getOrderItems()) {
  224 + OrderItemDto dto = new OrderItemDto();
  225 + dto.setAmount(item.getAmount());
  226 + dto.setSku(item.getSku());
  227 + orderItems.add(dto);
  228 + }
  229 + request.setOrderItems(orderItems);
  230 + request.setReceiverName(req.getReceiverName());
  231 + request.setReceiverPhoneNumber(req.getReceiverPhoneNumber());
  232 + request.setReservationTime(req.getReservationTime());
  233 + request.setShopBuyerId(req.getShopBuyerId());
  234 + ApiDataResponse<SubmitOrderResponseDto> response = this.orderService.submit(request);
  235 + if (response == null) {
  236 + resp.setCode(ResultCode.NETWORK_FAILED);
  237 + return resp;
  238 + }
  239 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  240 + resp.setCode(ResultCode.SUCCESS);
  241 + SubmitOrderResponseDto data = response.getData();
  242 + resp.setOrderId(data.getOrderId());
  243 + } else {
  244 + resp.setCode(ResultCode.BUSINESS_FAILED);
  245 + }
  246 + resp.setMsg(response.getMessage());
  247 + return resp;
47 248
48 - @Override  
49 - public Integer confirmPickUp(Long orderId, String paytoken, Long userId) {  
50 - return null;  
51 - } 249 + }
52 250
53 - @Override  
54 - public void addComment(List<ProductAppraise> productAppraises, Long orderId, Long userId) { 251 + @Override
  252 + public Integer take(Long orderId, Long userId, Long pricePrivilege) {
  253 + TakeOrderRequestDto request = new TakeOrderRequestDto();
  254 + request.setOrderId(orderId);
  255 + request.setSellerId(userId);
  256 + request.setTotalPrice(pricePrivilege);
  257 + ApiResponse response = this.orderService.take(request);
  258 + if (response == null) {
  259 + return ResultCode.NETWORK_FAILED;
  260 + }
  261 + if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {
  262 + return ResultCode.SUCCESS;
  263 + } else {
  264 + return ResultCode.BUSINESS_FAILED;
  265 + }
  266 + }
55 267
56 - }  
57 } 268 }
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/SellerOrderRPC.java deleted 100644 → 0
  View file @207329b
1 -package com.diligrp.mobsite.getway.rpc.seller;  
2 -  
3 -import com.diligrp.mobsite.getway.domain.protocol.BaseResp;  
4 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;  
5 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;  
6 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;  
7 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;  
8 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq;  
9 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp;  
10 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq;  
11 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;  
12 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;  
13 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;  
14 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;  
15 -  
16 -/**  
17 - * <B>Description</B> 订单 <br />  
18 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.  
19 - * <br />  
20 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
21 - * <B>Company</B> 地利集团  
22 - *  
23 - * @createTime 2014年9月1日 下午6:30:54  
24 - * @author duanyugen  
25 - */  
26 -public interface SellerOrderRPC {  
27 -  
28 - GetOrderListResp getOrders(GetOrderListReq req);  
29 -  
30 - GetOrderDetailResp getOrderById(GetOrderDetailReq req);  
31 -  
32 - SearchOrderListResp searchOrders(SearchOrderListReq req);  
33 -  
34 - ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req);  
35 -  
36 - BaseResp takeOrder(takeOrderReq req);  
37 -  
38 - RefuseQuoteResp refuseOrder(RefuseQuoteReq req);  
39 -  
40 -}  
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/seller/impl/SellerOrderRPCImpl.java deleted 100644 → 0
  View file @207329b
1 -package com.diligrp.mobsite.getway.rpc.seller.impl;  
2 -  
3 -import java.text.DateFormat;  
4 -import java.text.SimpleDateFormat;  
5 -import java.util.ArrayList;  
6 -import java.util.List;  
7 -  
8 -import javax.annotation.Resource;  
9 -  
10 -import org.springframework.stereotype.Service;  
11 -import org.springframework.util.CollectionUtils;  
12 -  
13 -import com.b2c.orders.domain.client.dto.request.OrderDetailRequestDto;  
14 -import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;  
15 -import com.b2c.orders.domain.client.dto.request.SellerConfirmRequestDto;  
16 -import com.b2c.orders.domain.client.dto.request.SellerRefuseRequestDto;  
17 -import com.b2c.orders.domain.client.dto.request.TakeOrderRequestDto;  
18 -import com.b2c.orders.domain.client.dto.response.ApiDataResponse;  
19 -import com.b2c.orders.domain.client.dto.response.ApiPageDataResponse;  
20 -import com.b2c.orders.domain.client.dto.response.ApiResponse;  
21 -import com.b2c.orders.domain.client.dto.response.OrderDetailResponseDto;  
22 -import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;  
23 -import com.b2c.orders.domain.client.service.OrderService;  
24 -import com.diligrp.mobsite.getway.domain.common.ResultCode;  
25 -import com.diligrp.mobsite.getway.domain.protocol.BaseResp;  
26 -import com.diligrp.mobsite.getway.domain.protocol.Order;  
27 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;  
28 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;  
29 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;  
30 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;  
31 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq;  
32 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp;  
33 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq;  
34 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;  
35 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;  
36 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;  
37 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;  
38 -import com.diligrp.mobsite.getway.domain.protocol.saler.order.model.SellerOrder;  
39 -import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC;  
40 -  
41 -/**  
42 - * <B>Description</B> 订单rpc <br />  
43 - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved.  
44 - * <br />  
45 - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />  
46 - * <B>Company</B> 地利集团  
47 - *  
48 - * @author duanyugen  
49 - * @createTime 2014年9月1日 下午6:31:13  
50 - */  
51 -@Service("sellerOrderRPC")  
52 -public class SellerOrderRPCImpl implements SellerOrderRPC {  
53 -  
54 - @Resource  
55 - private OrderService orderService;  
56 -  
57 - @Override  
58 - public GetOrderListResp getOrders(GetOrderListReq req) {  
59 - OrderListRequestDto request = new OrderListRequestDto();  
60 - ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(request);  
61 - GetOrderListResp resp = new GetOrderListResp();  
62 - if (response == null) {  
63 - resp.setCode(ResultCode.NETWORK_FAILED);  
64 - return resp;  
65 - }  
66 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
67 - resp.setCode(ResultCode.SUCCESS);  
68 - resp.setMaxPageNum(response.getTotalPage());  
69 - if (!CollectionUtils.isEmpty(response.getList())) {  
70 - List<Order> orders = new ArrayList<>(response.getList().size());  
71 - for (OrderListResponseDto dto : response.getList()) {  
72 - orders.add(this.convertToOrder(dto));  
73 - }  
74 - resp.setOrders(orders);  
75 - }  
76 - } else {  
77 - resp.setCode(ResultCode.BUSINESS_FAILED);  
78 - }  
79 - resp.setMsg(response.getMessage());  
80 - return resp;  
81 - }  
82 -  
83 - private Order convertToOrder(OrderListResponseDto dto) {  
84 - Order order = new Order();  
85 - order.setBuyerConfirmTime(dto.getBuyerConfirmTime());  
86 - order.setBuyerId(dto.getBuyerId());  
87 - order.setBuyerMemo(dto.getBuyerMemo());  
88 - order.setDeliveryTime(dto.getDeliveryTime());  
89 - order.setDeliveryType(dto.getDeliveryType());  
90 - order.setId(dto.getId());  
91 - order.setOrderStatus(dto.getOrderStatus());  
92 - order.setPayStatus(dto.getPayStatus());  
93 - order.setPayTime(dto.getPayTime());  
94 - order.setPayType(dto.getPayType());  
95 - order.setRealTotalPrice(dto.getRealTotalPrice());  
96 - order.setReservationTime(dto.getReservationTime());  
97 - order.setSellerId(dto.getSellerId());  
98 - order.setShopId(dto.getShopId());  
99 - order.setSubmitTime(dto.getSubmitTime());  
100 - order.setTotalPrice(dto.getTotalPrice());  
101 - return order;  
102 - }  
103 -  
104 - @Override  
105 - public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {  
106 - OrderDetailRequestDto request = new OrderDetailRequestDto();  
107 - request.setOrderId(req.getOrderId());  
108 - ApiDataResponse<OrderDetailResponseDto> response = this.orderService.detail(request);  
109 - GetOrderDetailResp resp = new GetOrderDetailResp();  
110 - if (response == null) {  
111 - resp.setCode(ResultCode.NETWORK_FAILED);  
112 - return resp;  
113 - }  
114 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
115 - resp.setCode(ResultCode.SUCCESS);  
116 - SellerOrder order = new SellerOrder();  
117 - DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");  
118 - OrderDetailResponseDto dto = response.getData();  
119 - order.setBuyerMemo(dto.getBuyerMemo());  
120 - if (dto.getDeliveryTime() != null) {  
121 - order.setDeliveryTime(df.format(dto.getDeliveryTime()));  
122 - }  
123 - order.setDeliveryType(dto.getDeliveryType());  
124 - order.setId(dto.getId());  
125 - order.setOrderStatus(dto.getOrderStatus());  
126 - order.setPayStatus(dto.getPayStatus());  
127 - order.setPayType(dto.getPayType());  
128 - order.setRealTotalPrice(dto.getRealTotalPrice());  
129 - order.setReservationTime(dto.getReservationTime());  
130 - order.setSubmitTime(df.format(dto.getSubmitTime()));  
131 - order.setTotalPrice(dto.getTotalPrice());  
132 - } else {  
133 - resp.setCode(ResultCode.BUSINESS_FAILED);  
134 - }  
135 - resp.setMsg(response.getMessage());  
136 - return resp;  
137 - }  
138 -  
139 - @Override  
140 - public SearchOrderListResp searchOrders(SearchOrderListReq req) {  
141 - SearchOrderListResp resp = new SearchOrderListResp();  
142 - OrderListRequestDto request = new OrderListRequestDto();  
143 - request.setPage(req.getPageNum());  
144 - request.setSellerId(req.getUserId());  
145 - ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(request);  
146 - if (response == null) {  
147 - resp.setCode(ResultCode.NETWORK_FAILED);  
148 - return resp;  
149 - }  
150 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
151 - resp.setCode(ResultCode.SUCCESS);  
152 - resp.setMaxPageNum(response.getTotalPage());  
153 - if (!CollectionUtils.isEmpty(response.getList())) {  
154 - List<Order> orders = new ArrayList<>(response.getList().size());  
155 - for (OrderListResponseDto dto : response.getList()) {  
156 - orders.add(this.convertToOrder(dto));  
157 - }  
158 - resp.setOrders(orders);  
159 - }  
160 - } else {  
161 - resp.setCode(ResultCode.BUSINESS_FAILED);  
162 - }  
163 - resp.setMsg(response.getMessage());  
164 - return resp;  
165 - }  
166 -  
167 - @Override  
168 - public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {  
169 - ConfirmReceiptMoneyResp resp = new ConfirmReceiptMoneyResp();  
170 - SellerConfirmRequestDto request = new SellerConfirmRequestDto();  
171 - request.setOrderId(req.getOrderId());  
172 - request.setSellerId(req.getUserId());  
173 - ApiResponse response = this.orderService.sellerConfirm(request);  
174 - if (response == null) {  
175 - resp.setCode(ResultCode.NETWORK_FAILED);  
176 - return resp;  
177 - }  
178 - if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
179 - resp.setCode(ResultCode.SUCCESS);  
180 - } else {  
181 - resp.setCode(ResultCode.BUSINESS_FAILED);  
182 - }  
183 - resp.setMsg(response.getMessage());  
184 - resp.setResp(response.getCode());  
185 - return resp;  
186 - }  
187 -  
188 - @Override  
189 - public BaseResp takeOrder(takeOrderReq req) {  
190 - BaseResp resp = new BaseResp();  
191 - TakeOrderRequestDto request = new TakeOrderRequestDto();  
192 - request.setOrderId(req.getOrderId());  
193 - request.setSellerId(req.getUserId());  
194 - request.setTotalPrice(req.getPricePrivilege());  
195 - ApiResponse response = this.orderService.take(request);  
196 - if (response != null && response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
197 - resp.setCode(ResultCode.SUCCESS);  
198 - } else {  
199 - resp.setCode(ResultCode.BUSINESS_FAILED);  
200 - }  
201 - resp.setMsg(response.getMessage());  
202 - return resp;  
203 - }  
204 -  
205 - @Override  
206 - public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {  
207 - RefuseQuoteResp resp = new RefuseQuoteResp();  
208 - SellerRefuseRequestDto request = new SellerRefuseRequestDto();  
209 - request.setOrderId(req.getOrderId());  
210 - request.setRefuseReason(req.getRefuseReason());  
211 - request.setSellerId(req.getUserId());  
212 - ApiResponse response = this.orderService.refuse(request);  
213 - if (response != null && response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) {  
214 - resp.setCode(ResultCode.SUCCESS);  
215 - resp.setResp(response.getCode());  
216 - } else {  
217 - resp.setCode(ResultCode.BUSINESS_FAILED);  
218 - }  
219 - resp.setMsg(response.getMessage());  
220 - return resp;  
221 - }  
222 -  
223 -}  
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/BuyerOrderService.java
  View file @6d2bef7
@@ -8,15 +8,59 @@ import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq; @@ -8,15 +8,59 @@ import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
8 import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp; 8 import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
9 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; 9 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
10 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; 10 import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
  11 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
  12 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
  13 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
  14 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
11 15
12 public interface BuyerOrderService { 16 public interface BuyerOrderService {
13 17
  18 + /**
  19 + * 提交订单
  20 + *
  21 + * @param req
  22 + * @return
  23 + */
14 SubmitOrderResp submit(SubmitOrderReq req); 24 SubmitOrderResp submit(SubmitOrderReq req);
15 25
  26 + /**
  27 + * 支付
  28 + *
  29 + * @param req
  30 + * @return
  31 + */
16 PayOrderResp pay(PayOrderReq req); 32 PayOrderResp pay(PayOrderReq req);
17 33
  34 + /**
  35 + * 确认收货
  36 + *
  37 + * @param req
  38 + * @return
  39 + */
18 BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req); 40 BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req);
19 41
  42 + /**
  43 + * 取消订单
  44 + *
  45 + * @param req
  46 + * @return
  47 + */
20 BuyerCancelOrderResp cancel(BuyerCancelOrderReq req); 48 BuyerCancelOrderResp cancel(BuyerCancelOrderReq req);
21 49
  50 + /**
  51 + * 订单列表
  52 + *
  53 + * @param req
  54 + * @return
  55 + */
  56 + SearchOrderListResp searchOrders(SearchOrderListReq req);
  57 +
  58 + /**
  59 + * 订单详情
  60 + *
  61 + * @param req
  62 + * @return
  63 + */
  64 + GetOrderDetailResp getOrderById(GetOrderDetailReq req);
  65 +
22 } 66 }
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/impl/BuyerOrderServiceBean.java deleted 100644 → 0
  View file @207329b
1 -package com.diligrp.mobsite.getway.service.buyer.impl;  
2 -  
3 -import javax.annotation.Resource;  
4 -  
5 -import org.springframework.stereotype.Service;  
6 -  
7 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;  
8 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;  
9 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;  
10 -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;  
11 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;  
12 -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;  
13 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;  
14 -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;  
15 -import com.diligrp.mobsite.getway.rpc.buyer.BuyerOrderRPCService;  
16 -import com.diligrp.mobsite.getway.service.buyer.BuyerOrderService;  
17 -  
18 -@Service  
19 -public class BuyerOrderServiceBean implements BuyerOrderService {  
20 -  
21 - @Resource  
22 - private BuyerOrderRPCService buyerOrderService;  
23 -  
24 - @Override  
25 - public SubmitOrderResp submit(SubmitOrderReq req) {  
26 - return this.buyerOrderService.submit(req);  
27 - }  
28 -  
29 - @Override  
30 - public PayOrderResp pay(PayOrderReq req) {  
31 - return this.buyerOrderService.pay(req);  
32 - }  
33 -  
34 - @Override  
35 - public BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req) {  
36 - return this.buyerOrderService.confirmReceipt(req);  
37 - }  
38 -  
39 - @Override  
40 - public BuyerCancelOrderResp cancel(BuyerCancelOrderReq req) {  
41 - return this.buyerOrderService.cancel(req);  
42 - }  
43 -  
44 -}  
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/impl/BuyerOrderServiceImpl.java 0 → 100644
  View file @6d2bef7
  1 +package com.diligrp.mobsite.getway.service.buyer.impl;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.List;
  5 +
  6 +import javax.annotation.Resource;
  7 +
  8 +import org.springframework.stereotype.Service;
  9 +import org.springframework.util.CollectionUtils;
  10 +
  11 +import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
  12 +import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
  13 +import com.diligrp.mobsite.getway.domain.common.ResultCode;
  14 +import com.diligrp.mobsite.getway.domain.protocol.Order;
  15 +import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq;
  16 +import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp;
  17 +import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq;
  18 +import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp;
  19 +import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq;
  20 +import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp;
  21 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq;
  22 +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp;
  23 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
  24 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp;
  25 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
  26 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
  27 +import com.diligrp.mobsite.getway.rpc.OrderRPC;
  28 +import com.diligrp.mobsite.getway.service.buyer.BuyerOrderService;
  29 +import com.diligrp.titan.sdk.output.PageOutput;
  30 +
  31 +@Service
  32 +public class BuyerOrderServiceImpl implements BuyerOrderService {
  33 +
  34 + @Resource
  35 + private OrderRPC orderRPC;
  36 +
  37 + @Override
  38 + public SubmitOrderResp submit(SubmitOrderReq req) {
  39 + return this.orderRPC.submit(req);
  40 + }
  41 +
  42 + @Override
  43 + public PayOrderResp pay(PayOrderReq req) {
  44 + PayOrderResp resp = new PayOrderResp();
  45 + Integer result = this.orderRPC.pay(req.getOrderId(), req.getShopBuyerId(), req.getPayType());
  46 + resp.setCode(result);
  47 + return resp;
  48 + }
  49 +
  50 + @Override
  51 + public BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req) {
  52 + BuyerConfirmReceiptResp resp = new BuyerConfirmReceiptResp();
  53 + Integer result = this.orderRPC.confirmPickUp(req.getOrderId(), req.getBuyerId());
  54 + resp.setCode(result);
  55 + return resp;
  56 + }
  57 +
  58 + @Override
  59 + public BuyerCancelOrderResp cancel(BuyerCancelOrderReq req) {
  60 + BuyerCancelOrderResp resp = new BuyerCancelOrderResp();
  61 + Integer result = this.orderRPC.cancelOrder(req.getOrderId(), req.getShopBuyerId());
  62 + resp.setCode(result);
  63 + return resp;
  64 + }
  65 +
  66 + @Override
  67 + public SearchOrderListResp searchOrders(SearchOrderListReq req) {
  68 + SearchOrderListResp resp = new SearchOrderListResp();
  69 + OrderListRequestDto input = new OrderListRequestDto();
  70 + input.setOrderStatus(req.getOrderStatus());
  71 + input.setPage(req.getPageNum());
  72 + input.setQueryString(req.getKeyword());
  73 + input.setSellerId(req.getSellerId());
  74 + input.setShopBuyerId(req.getShopBuyerId());
  75 + PageOutput<List<OrderListResponseDto>> result = this.orderRPC.getOrders(input, req.getUserId());
  76 + if (result == null) {
  77 + resp.setCode(ResultCode.NETWORK_FAILED);
  78 + return resp;
  79 + }
  80 + if (result.getCode() == ResultCode.SUCCESS) {
  81 + if (!CollectionUtils.isEmpty(result.getData())) {
  82 + List<Order> orders = new ArrayList<>(result.getData().size());
  83 + for (OrderListResponseDto dto : result.getData()) {
  84 + Order order = this.convertToOrder(dto);
  85 + orders.add(order);
  86 + }
  87 + resp.setOrders(orders);
  88 + }
  89 + }
  90 + resp.setMaxPageNum(result.getTotalPage());
  91 + resp.setMsg(result.getResult());
  92 + return resp;
  93 + }
  94 +
  95 + @Override
  96 + public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
  97 + return this.orderRPC.getOrderById(req.getOrderId(), req.getUserId());
  98 + }
  99 +
  100 + private Order convertToOrder(OrderListResponseDto dto) {
  101 + Order order = new Order();
  102 + order.setBuyerConfirmTime(dto.getBuyerConfirmTime());
  103 + order.setBuyerId(dto.getBuyerId());
  104 + order.setBuyerMemo(dto.getBuyerMemo());
  105 + order.setDeliveryTime(dto.getDeliveryTime());
  106 + order.setDeliveryType(dto.getDeliveryType());
  107 + order.setId(dto.getId());
  108 + order.setOrderStatus(dto.getOrderStatus());
  109 + order.setPayStatus(dto.getPayStatus());
  110 + order.setPayTime(dto.getPayTime());
  111 + order.setPayType(dto.getPayType());
  112 + order.setRealTotalPrice(dto.getRealTotalPrice());
  113 + order.setReservationTime(dto.getReservationTime());
  114 + order.setSellerId(dto.getSellerId());
  115 + order.setShopId(dto.getShopId());
  116 + order.setSubmitTime(dto.getSubmitTime());
  117 + order.setTotalPrice(dto.getTotalPrice());
  118 + return order;
  119 + }
  120 +}
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerOrderServiceImpl.java
  View file @6d2bef7
1 package com.diligrp.mobsite.getway.service.seller.impl; 1 package com.diligrp.mobsite.getway.service.seller.impl;
2 2
  3 +import java.util.ArrayList;
  4 +import java.util.List;
  5 +
3 import javax.annotation.Resource; 6 import javax.annotation.Resource;
4 7
  8 +import org.springframework.util.CollectionUtils;
  9 +
  10 +import com.b2c.orders.domain.client.dto.request.OrderListRequestDto;
  11 +import com.b2c.orders.domain.client.dto.response.OrderListResponseDto;
  12 +import com.diligrp.mobsite.getway.domain.common.ResultCode;
5 import com.diligrp.mobsite.getway.domain.protocol.BaseResp; 13 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  14 +import com.diligrp.mobsite.getway.domain.protocol.Order;
6 import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq; 15 import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq;
7 import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp; 16 import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp;
8 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq; 17 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq;
@@ -14,8 +23,9 @@ import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp; @@ -14,8 +23,9 @@ import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp;
14 import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; 23 import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq;
15 import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; 24 import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp;
16 import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq; 25 import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq;
17 -import com.diligrp.mobsite.getway.rpc.seller.SellerOrderRPC; 26 +import com.diligrp.mobsite.getway.rpc.OrderRPC;
18 import com.diligrp.mobsite.getway.service.seller.SellerOrderService; 27 import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
  28 +import com.diligrp.titan.sdk.output.PageOutput;
19 29
20 /** 30 /**
21 * <B>Description</B> 订单 <br /> 31 * <B>Description</B> 订单 <br />
@@ -31,35 +41,114 @@ import com.diligrp.mobsite.getway.service.seller.SellerOrderService; @@ -31,35 +41,114 @@ import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
31 public class SellerOrderServiceImpl implements SellerOrderService { 41 public class SellerOrderServiceImpl implements SellerOrderService {
32 42
33 @Resource 43 @Resource
34 - private SellerOrderRPC sellerOrderRPCService; 44 + private OrderRPC orderRPC;
35 45
36 @Override 46 @Override
37 public GetOrderListResp getOrders(GetOrderListReq req) throws Exception { 47 public GetOrderListResp getOrders(GetOrderListReq req) throws Exception {
38 - return this.sellerOrderRPCService.getOrders(req); 48 + GetOrderListResp resp = new GetOrderListResp();
  49 + OrderListRequestDto request = new OrderListRequestDto();
  50 + request.setOrderStatus(req.getOrderStatus());
  51 + request.setPage(req.getPageNum());
  52 + request.setQueryString(req.getQueryString());
  53 + request.setSellerId(req.getSellerId());
  54 + request.setUserType(req.getUserType());
  55 + PageOutput<List<OrderListResponseDto>> result = this.orderRPC.getOrders(request, req.getUserId());
  56 + if (result == null) {
  57 + resp.setCode(ResultCode.NETWORK_FAILED);
  58 + return resp;
  59 + }
  60 + if (result.getCode() == ResultCode.SUCCESS) {
  61 + if (!CollectionUtils.isEmpty(result.getData())) {
  62 + List<Order> orderList = new ArrayList<>(result.getData().size());
  63 + for (OrderListResponseDto dto : result.getData()) {
  64 + Order order = this.convertToOrder(dto);
  65 + orderList.add(order);
  66 + }
  67 + resp.setOrders(orderList);
  68 + }
  69 + }
  70 + resp.setCode(result.getCode());
  71 + resp.setMaxPageNum(result.getTotalPage());
  72 + resp.setMsg(result.getResult());
  73 + return resp;
  74 + }
  75 +
  76 + private Order convertToOrder(OrderListResponseDto dto) {
  77 + Order order = new Order();
  78 + order.setBuyerConfirmTime(dto.getBuyerConfirmTime());
  79 + order.setBuyerId(dto.getBuyerId());
  80 + order.setBuyerMemo(dto.getBuyerMemo());
  81 + order.setDeliveryTime(dto.getDeliveryTime());
  82 + order.setDeliveryType(dto.getDeliveryType());
  83 + order.setId(dto.getId());
  84 + order.setOrderStatus(dto.getOrderStatus());
  85 + order.setPayStatus(dto.getPayStatus());
  86 + order.setPayTime(dto.getPayTime());
  87 + order.setPayType(dto.getPayType());
  88 + order.setRealTotalPrice(dto.getRealTotalPrice());
  89 + order.setReservationTime(dto.getReservationTime());
  90 + order.setSellerId(dto.getSellerId());
  91 + order.setShopId(dto.getShopId());
  92 + order.setSubmitTime(dto.getSubmitTime());
  93 + order.setTotalPrice(dto.getTotalPrice());
  94 + return order;
39 } 95 }
40 96
41 @Override 97 @Override
42 public GetOrderDetailResp getOrderById(GetOrderDetailReq req) { 98 public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
43 - return this.sellerOrderRPCService.getOrderById(req); 99 + return this.orderRPC.getOrderById(req.getOrderId(), req.getUserId());
44 } 100 }
45 101
46 @Override 102 @Override
47 public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) { 103 public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {
48 - return this.sellerOrderRPCService.comfirmReceiveMoney(req); 104 + ConfirmReceiptMoneyResp resp = new ConfirmReceiptMoneyResp();
  105 + Integer result = this.orderRPC.confirmReceipt(req.getOrderId(), req.getUserId());
  106 + resp.setCode(result);
  107 + return resp;
49 } 108 }
50 109
51 @Override 110 @Override
52 public BaseResp takeOrder(takeOrderReq req) { 111 public BaseResp takeOrder(takeOrderReq req) {
53 - return this.sellerOrderRPCService.takeOrder(req); 112 + BaseResp resp = new BaseResp();
  113 + Integer result = this.orderRPC.take(req.getOrderId(), req.getUserId(), req.getPricePrivilege());
  114 + resp.setCode(result);
  115 + return resp;
54 } 116 }
55 117
56 @Override 118 @Override
57 public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) { 119 public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {
58 - return this.sellerOrderRPCService.refuseOrder(req); 120 + RefuseQuoteResp resp = new RefuseQuoteResp();
  121 + Integer result = this.orderRPC.refuse(req.getOrderId(), req.getUserId(), req.getRefuseReason());
  122 + resp.setCode(result);
  123 + return resp;
59 } 124 }
60 125
61 @Override 126 @Override
62 public SearchOrderListResp searchOrders(SearchOrderListReq req) { 127 public SearchOrderListResp searchOrders(SearchOrderListReq req) {
63 - return this.sellerOrderRPCService.searchOrders(req); 128 + SearchOrderListResp resp = new SearchOrderListResp();
  129 + OrderListRequestDto input = new OrderListRequestDto();
  130 + input.setOrderStatus(req.getOrderStatus());
  131 + input.setPage(req.getPageNum());
  132 + input.setQueryString(req.getKeyword());
  133 + input.setSellerId(req.getSellerId());
  134 + input.setShopBuyerId(req.getShopBuyerId());
  135 + PageOutput<List<OrderListResponseDto>> result = this.orderRPC.getOrders(input, req.getUserId());
  136 + if (result == null) {
  137 + resp.setCode(ResultCode.NETWORK_FAILED);
  138 + return resp;
  139 + }
  140 + if (result.getCode() == ResultCode.SUCCESS) {
  141 + if (!CollectionUtils.isEmpty(result.getData())) {
  142 + List<Order> orders = new ArrayList<>(result.getData().size());
  143 + for (OrderListResponseDto dto : result.getData()) {
  144 + Order order = this.convertToOrder(dto);
  145 + orders.add(order);
  146 + }
  147 + resp.setOrders(orders);
  148 + }
  149 + }
  150 + resp.setMaxPageNum(result.getTotalPage());
  151 + resp.setMsg(result.getResult());
  152 + return resp;
64 } 153 }
65 } 154 }
@@ -365,7 +365,7 @@ @@ -365,7 +365,7 @@
365 <dependency> 365 <dependency>
366 <groupId>com.b2c.orders</groupId> 366 <groupId>com.b2c.orders</groupId>
367 <artifactId>b2c-orders-client</artifactId> 367 <artifactId>b2c-orders-client</artifactId>
368 - <version>0.0.1-SNAPSHOT</version> 368 + <version>0.0.2-SNAPSHOT</version>
369 </dependency> 369 </dependency>
370 370
371 <!--商品库sdk--> 371 <!--商品库sdk-->