Commit 4abeafbd539703661d9e5a7dbde730bd6d251376
1 parent
7e2eb8e6
订单增加城市信息
Showing
18 changed files
with
493 additions
and
855 deletions
mobsite-getway-domain/pom.xml
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" | ||
3 | - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
4 | - <modelVersion>4.0.0</modelVersion> | ||
5 | - <!--<parent>--> | ||
6 | - <!--<groupId>com.diligrp.mobsite</groupId>--> | ||
7 | - <!--<artifactId>mobsite-getway</artifactId>--> | ||
8 | - <!--<version>0.0.1-SNAPSHOT</version>--> | ||
9 | - <!--</parent>--> | 2 | +<project |
3 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" | ||
4 | + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> | ||
5 | + <modelVersion>4.0.0</modelVersion> | ||
6 | + <parent> | ||
7 | + <groupId>com.diligrp.mobsite</groupId> | ||
8 | + <artifactId>mobsite-getway</artifactId> | ||
9 | + <version>0.0.1-SNAPSHOT</version> | ||
10 | + </parent> | ||
10 | 11 | ||
11 | 12 | ||
12 | - <groupId>com.b2c.mobsite</groupId> | ||
13 | - <artifactId>mobsite-getway-domain</artifactId> | ||
14 | - <version>0.0.1-SNAPSHOT</version> | ||
15 | - <name>mobsite-getway-domain</name> | ||
16 | - <url>http://maven.apache.org</url> | ||
17 | - <properties> | ||
18 | - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
19 | - </properties> | 13 | + <groupId>com.b2c.mobsite</groupId> |
14 | + <artifactId>mobsite-getway-domain</artifactId> | ||
15 | + <name>mobsite-getway-domain</name> | ||
16 | + <url>http://maven.apache.org</url> | ||
17 | + <properties> | ||
18 | + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
19 | + </properties> | ||
20 | 20 | ||
21 | </project> | 21 | </project> |
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
1 | package com.diligrp.mobsite.getway.domain.protocol; | 1 | package com.diligrp.mobsite.getway.domain.protocol; |
2 | 2 | ||
3 | import java.io.Serializable; | 3 | import java.io.Serializable; |
4 | -import java.util.Date; | ||
5 | - | ||
6 | -import com.b2c.orders.enums.DeliveryType; | ||
7 | -import com.b2c.orders.enums.OrderStatus; | ||
8 | -import com.b2c.orders.enums.PayStatus; | ||
9 | -import com.b2c.orders.enums.PayType; | ||
10 | -import com.fasterxml.jackson.annotation.JsonFormat; | ||
11 | 4 | ||
12 | /** | 5 | /** |
13 | * <B>Description</B> 订单 <br /> | 6 | * <B>Description</B> 订单 <br /> |
@@ -31,14 +24,6 @@ public class Order implements Serializable { | @@ -31,14 +24,6 @@ public class Order implements Serializable { | ||
31 | * 店铺id | 24 | * 店铺id |
32 | */ | 25 | */ |
33 | private Long shopId; | 26 | private Long shopId; |
34 | - /** | ||
35 | - * 商家id | ||
36 | - */ | ||
37 | - private Long sellerId; | ||
38 | - /** | ||
39 | - * 用户id | ||
40 | - */ | ||
41 | - private Long buyerId; | ||
42 | /** 配送类型 */ | 27 | /** 配送类型 */ |
43 | private Integer deliveryType; | 28 | private Integer deliveryType; |
44 | /** 订单状态 */ | 29 | /** 订单状态 */ |
@@ -55,8 +40,6 @@ public class Order implements Serializable { | @@ -55,8 +40,6 @@ public class Order implements Serializable { | ||
55 | private String deliveryTime; | 40 | private String deliveryTime; |
56 | /** 提货时间 */ | 41 | /** 提货时间 */ |
57 | private String reservationTime; | 42 | private String reservationTime; |
58 | - /** 买家确认收货时间 */ | ||
59 | - private String buyerConfirmTime; | ||
60 | /** 订单提交时间 */ | 43 | /** 订单提交时间 */ |
61 | private String submitTime; | 44 | private String submitTime; |
62 | /** 支付类型 */ | 45 | /** 支付类型 */ |
@@ -84,22 +67,6 @@ public class Order implements Serializable { | @@ -84,22 +67,6 @@ public class Order implements Serializable { | ||
84 | this.shopId = shopId; | 67 | this.shopId = shopId; |
85 | } | 68 | } |
86 | 69 | ||
87 | - public Long getSellerId() { | ||
88 | - return sellerId; | ||
89 | - } | ||
90 | - | ||
91 | - public void setSellerId(Long sellerId) { | ||
92 | - this.sellerId = sellerId; | ||
93 | - } | ||
94 | - | ||
95 | - public Long getBuyerId() { | ||
96 | - return buyerId; | ||
97 | - } | ||
98 | - | ||
99 | - public void setBuyerId(Long buyerId) { | ||
100 | - this.buyerId = buyerId; | ||
101 | - } | ||
102 | - | ||
103 | public Integer getDeliveryType() { | 70 | public Integer getDeliveryType() { |
104 | return deliveryType; | 71 | return deliveryType; |
105 | } | 72 | } |
@@ -156,14 +123,6 @@ public class Order implements Serializable { | @@ -156,14 +123,6 @@ public class Order implements Serializable { | ||
156 | this.reservationTime = reservationTime; | 123 | this.reservationTime = reservationTime; |
157 | } | 124 | } |
158 | 125 | ||
159 | - public String getBuyerConfirmTime() { | ||
160 | - return buyerConfirmTime; | ||
161 | - } | ||
162 | - | ||
163 | - public void setBuyerConfirmTime(String buyerConfirmTime) { | ||
164 | - this.buyerConfirmTime = buyerConfirmTime; | ||
165 | - } | ||
166 | - | ||
167 | public String getSubmitTime() { | 126 | public String getSubmitTime() { |
168 | return submitTime; | 127 | return submitTime; |
169 | } | 128 | } |
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/PickInfo.java
@@ -4,10 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | @@ -4,10 +4,10 @@ import io.swagger.annotations.ApiModelProperty; | ||
4 | 4 | ||
5 | import java.io.Serializable; | 5 | import java.io.Serializable; |
6 | 6 | ||
7 | - | ||
8 | /** | 7 | /** |
9 | * <B>Description</B> 提货人信息 <br /> | 8 | * <B>Description</B> 提货人信息 <br /> |
10 | - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> | 9 | + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. |
10 | + * <br /> | ||
11 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> | 11 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> |
12 | * <B>Company</B> 地利集团 | 12 | * <B>Company</B> 地利集团 |
13 | * | 13 | * |
@@ -15,117 +15,109 @@ import java.io.Serializable; | @@ -15,117 +15,109 @@ import java.io.Serializable; | ||
15 | * @createTime 2014/8/28 10:37 | 15 | * @createTime 2014/8/28 10:37 |
16 | */ | 16 | */ |
17 | public class PickInfo implements Serializable { | 17 | public class PickInfo implements Serializable { |
18 | - | ||
19 | - private static final long serialVersionUID = 8718494787385584082L; | ||
20 | - | ||
21 | - /** | ||
22 | - * 默认提货人-是 | ||
23 | - */ | ||
24 | - public static final int ISDEFAULT_YES = 1; | ||
25 | - /** | ||
26 | - * 默认提货人-否 | ||
27 | - */ | ||
28 | - public static final int ISDEFAULT_NO = 2; | ||
29 | - | ||
30 | - | ||
31 | - | ||
32 | - /** | ||
33 | - * id | ||
34 | - */ | ||
35 | - @ApiModelProperty(value = "收货人id") | ||
36 | - private Long id; | ||
37 | - /** | ||
38 | - * 用户姓名名字 | ||
39 | - */ | ||
40 | - @ApiModelProperty(value = "收货人姓名") | ||
41 | - private String name; | ||
42 | - /** | ||
43 | - * 电话 | ||
44 | - */ | ||
45 | - @ApiModelProperty(value = "收货人电话") | ||
46 | - private String mobile; | ||
47 | - | ||
48 | - /** | ||
49 | - * 是否为默认提货人 | ||
50 | - */ | ||
51 | - @ApiModelProperty(value = "是否为默认提货人:1-是,2-否") | ||
52 | - private Integer isDefault; | ||
53 | - | ||
54 | - | ||
55 | - /** | ||
56 | - * 城市地址 | ||
57 | - */ | ||
58 | - @ApiModelProperty(value = "城市id") | ||
59 | - private Integer cityId; | ||
60 | - /** | ||
61 | - * 城市地址 | ||
62 | - */ | ||
63 | - @ApiModelProperty(value = "城市描述") | ||
64 | - private String cityAddress; | ||
65 | - /** | ||
66 | - * 街道地址 | ||
67 | - */ | ||
68 | - @ApiModelProperty(value = "街道地址") | ||
69 | - private String streetAddress; | ||
70 | - | ||
71 | - | ||
72 | - public Integer getCityId() { | ||
73 | - return cityId; | ||
74 | - } | ||
75 | - | ||
76 | - public void setCityId(Integer cityId) { | ||
77 | - this.cityId = cityId; | ||
78 | - } | ||
79 | - | ||
80 | - public Long getId() { | ||
81 | - return id; | ||
82 | - } | ||
83 | - | ||
84 | - public void setId(Long id) { | ||
85 | - this.id = id; | ||
86 | - } | ||
87 | - | ||
88 | - public String getName() { | ||
89 | - return name; | ||
90 | - } | ||
91 | - | ||
92 | - public void setName(String name) { | ||
93 | - this.name = name; | ||
94 | - } | ||
95 | - | ||
96 | - public String getMobile() { | ||
97 | - return mobile; | ||
98 | - } | ||
99 | - | ||
100 | - public void setMobile(String mobile) { | ||
101 | - this.mobile = mobile; | ||
102 | - } | ||
103 | - | ||
104 | - public Integer getIsDefault() { | ||
105 | - return isDefault; | ||
106 | - } | ||
107 | - | ||
108 | - public void setIsDefault(Integer isDefault) { | ||
109 | - this.isDefault = isDefault; | ||
110 | - } | ||
111 | - | ||
112 | - | ||
113 | - public String getCityAddress() { | ||
114 | - return cityAddress; | ||
115 | - } | ||
116 | - | ||
117 | - | ||
118 | - public void setCityAddress(String cityAddress) { | ||
119 | - this.cityAddress = cityAddress; | ||
120 | - } | ||
121 | - | ||
122 | - | ||
123 | - public String getStreetAddress() { | ||
124 | - return streetAddress; | ||
125 | - } | ||
126 | - | ||
127 | - | ||
128 | - public void setStreetAddress(String streetAddress) { | ||
129 | - this.streetAddress = streetAddress; | ||
130 | - } | 18 | + |
19 | + private static final long serialVersionUID = 8718494787385584082L; | ||
20 | + | ||
21 | + /** | ||
22 | + * 默认提货人-是 | ||
23 | + */ | ||
24 | + public static final int ISDEFAULT_YES = 1; | ||
25 | + /** | ||
26 | + * 默认提货人-否 | ||
27 | + */ | ||
28 | + public static final int ISDEFAULT_NO = 2; | ||
29 | + | ||
30 | + /** | ||
31 | + * id | ||
32 | + */ | ||
33 | + @ApiModelProperty(value = "收货人id") | ||
34 | + private Long id; | ||
35 | + /** | ||
36 | + * 用户姓名名字 | ||
37 | + */ | ||
38 | + @ApiModelProperty(value = "收货人姓名") | ||
39 | + private String name; | ||
40 | + /** | ||
41 | + * 电话 | ||
42 | + */ | ||
43 | + @ApiModelProperty(value = "收货人电话") | ||
44 | + private String mobile; | ||
45 | + | ||
46 | + /** | ||
47 | + * 是否为默认提货人 | ||
48 | + */ | ||
49 | + @ApiModelProperty(value = "是否为默认提货人:1-是,2-否") | ||
50 | + private Integer isDefault; | ||
51 | + | ||
52 | + /** | ||
53 | + * 城市地址 | ||
54 | + */ | ||
55 | + @ApiModelProperty(value = "城市id") | ||
56 | + private Long cityId; | ||
57 | + /** | ||
58 | + * 城市地址 | ||
59 | + */ | ||
60 | + @ApiModelProperty(value = "城市描述") | ||
61 | + private String cityAddress; | ||
62 | + /** | ||
63 | + * 街道地址 | ||
64 | + */ | ||
65 | + @ApiModelProperty(value = "街道地址") | ||
66 | + private String streetAddress; | ||
67 | + | ||
68 | + public Long getCityId() { | ||
69 | + return cityId; | ||
70 | + } | ||
71 | + | ||
72 | + public void setCityId(Long cityId) { | ||
73 | + this.cityId = cityId; | ||
74 | + } | ||
75 | + | ||
76 | + public Long getId() { | ||
77 | + return id; | ||
78 | + } | ||
79 | + | ||
80 | + public void setId(Long id) { | ||
81 | + this.id = id; | ||
82 | + } | ||
83 | + | ||
84 | + public String getName() { | ||
85 | + return name; | ||
86 | + } | ||
87 | + | ||
88 | + public void setName(String name) { | ||
89 | + this.name = name; | ||
90 | + } | ||
91 | + | ||
92 | + public String getMobile() { | ||
93 | + return mobile; | ||
94 | + } | ||
95 | + | ||
96 | + public void setMobile(String mobile) { | ||
97 | + this.mobile = mobile; | ||
98 | + } | ||
99 | + | ||
100 | + public Integer getIsDefault() { | ||
101 | + return isDefault; | ||
102 | + } | ||
103 | + | ||
104 | + public void setIsDefault(Integer isDefault) { | ||
105 | + this.isDefault = isDefault; | ||
106 | + } | ||
107 | + | ||
108 | + public String getCityAddress() { | ||
109 | + return cityAddress; | ||
110 | + } | ||
111 | + | ||
112 | + public void setCityAddress(String cityAddress) { | ||
113 | + this.cityAddress = cityAddress; | ||
114 | + } | ||
115 | + | ||
116 | + public String getStreetAddress() { | ||
117 | + return streetAddress; | ||
118 | + } | ||
119 | + | ||
120 | + public void setStreetAddress(String streetAddress) { | ||
121 | + this.streetAddress = streetAddress; | ||
122 | + } | ||
131 | } | 123 | } |
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/GetOrderResp.java
@@ -3,22 +3,26 @@ package com.diligrp.mobsite.getway.domain.protocol.order; | @@ -3,22 +3,26 @@ package com.diligrp.mobsite.getway.domain.protocol.order; | ||
3 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; | 3 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; |
4 | import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail; | 4 | import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail; |
5 | 5 | ||
6 | - | ||
7 | /** | 6 | /** |
8 | * <B>Description</B> 根据id获取订单 <br /> | 7 | * <B>Description</B> 根据id获取订单 <br /> |
9 | - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> | 8 | + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. |
9 | + * <br /> | ||
10 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> | 10 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> |
11 | * <B>Company</B> 地利集团 | 11 | * <B>Company</B> 地利集团 |
12 | + * | ||
12 | * @createTime 2014年9月1日 下午6:36:42 | 13 | * @createTime 2014年9月1日 下午6:36:42 |
13 | * @author zhangshirui | 14 | * @author zhangshirui |
14 | */ | 15 | */ |
15 | -@SuppressWarnings("serial") | ||
16 | public class GetOrderResp extends BaseResp { | 16 | public class GetOrderResp extends BaseResp { |
17 | - | ||
18 | - /** | ||
19 | - * 订单详情 | ||
20 | - */ | ||
21 | - private OrderDetail order; | 17 | + |
18 | + /** | ||
19 | + * | ||
20 | + */ | ||
21 | + private static final long serialVersionUID = 8320936234572800014L; | ||
22 | + /** | ||
23 | + * 订单详情 | ||
24 | + */ | ||
25 | + private OrderDetail order; | ||
22 | 26 | ||
23 | public OrderDetail getOrder() { | 27 | public OrderDetail getOrder() { |
24 | return order; | 28 | return order; |
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/OrderDetail.java
@@ -17,6 +17,10 @@ public class OrderDetail extends Order{ | @@ -17,6 +17,10 @@ public class OrderDetail extends Order{ | ||
17 | 17 | ||
18 | 18 | ||
19 | /** | 19 | /** |
20 | + * | ||
21 | + */ | ||
22 | + private static final long serialVersionUID = -2957039480700213201L; | ||
23 | + /** | ||
20 | * 提货人信息 | 24 | * 提货人信息 |
21 | */ | 25 | */ |
22 | @ApiModelProperty(value = "收货人信息") | 26 | @ApiModelProperty(value = "收货人信息") |
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/takeOrderReq.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/TakeOrderReq.java
@@ -3,7 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.saler.order; | @@ -3,7 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.saler.order; | ||
3 | import com.diligrp.mobsite.getway.domain.protocol.BaseReq; | 3 | import com.diligrp.mobsite.getway.domain.protocol.BaseReq; |
4 | import io.swagger.annotations.ApiModelProperty; | 4 | import io.swagger.annotations.ApiModelProperty; |
5 | 5 | ||
6 | -public class takeOrderReq extends BaseReq { | 6 | +public class TakeOrderReq extends BaseReq { |
7 | /** | 7 | /** |
8 | * | 8 | * |
9 | */ | 9 | */ |
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/OrderRPC.java
1 | package com.diligrp.mobsite.getway.rpc; | 1 | package com.diligrp.mobsite.getway.rpc; |
2 | 2 | ||
3 | -import java.util.List; | ||
4 | - | ||
5 | import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; | 3 | import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; |
6 | -import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; | 4 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; |
7 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; | 5 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; |
8 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; | 6 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; |
9 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp; | ||
10 | -import com.diligrp.titan.sdk.output.PageOutput; | 7 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; |
11 | 8 | ||
12 | /** | 9 | /** |
13 | * <B>Description</B> 订单 <br /> | 10 | * <B>Description</B> 订单 <br /> |
@@ -25,12 +22,11 @@ public interface OrderRPC { | @@ -25,12 +22,11 @@ public interface OrderRPC { | ||
25 | * 获取订单列表 | 22 | * 获取订单列表 |
26 | * | 23 | * |
27 | * @param input | 24 | * @param input |
28 | - * @param userId | ||
29 | * @return | 25 | * @return |
30 | * @createTime 2014年9月2日 下午2:36:47 | 26 | * @createTime 2014年9月2日 下午2:36:47 |
31 | * @author zhangshirui | 27 | * @author zhangshirui |
32 | */ | 28 | */ |
33 | - PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId); | 29 | + SearchOrderListResp getOrders(OrderListRequestDto input); |
34 | 30 | ||
35 | /** | 31 | /** |
36 | * 根据id查询订单详情 | 32 | * 根据id查询订单详情 |
@@ -41,7 +37,7 @@ public interface OrderRPC { | @@ -41,7 +37,7 @@ public interface OrderRPC { | ||
41 | * @author zhangshirui | 37 | * @author zhangshirui |
42 | * @return | 38 | * @return |
43 | */ | 39 | */ |
44 | - GetOrderDetailResp getOrderById(Long orderId, Long userId); | 40 | + GetOrderResp getOrderById(Long orderId, Long userId); |
45 | 41 | ||
46 | /** | 42 | /** |
47 | * 取消订单 | 43 | * 取消订单 |
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/OrderRPCImpl.java
1 | package com.diligrp.mobsite.getway.rpc.impl; | 1 | package com.diligrp.mobsite.getway.rpc.impl; |
2 | 2 | ||
3 | -import java.text.DateFormat; | ||
4 | -import java.text.SimpleDateFormat; | ||
5 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
6 | import java.util.List; | 4 | import java.util.List; |
7 | 5 | ||
8 | import org.slf4j.Logger; | 6 | import org.slf4j.Logger; |
9 | import org.slf4j.LoggerFactory; | 7 | import org.slf4j.LoggerFactory; |
10 | import org.springframework.stereotype.Service; | 8 | import org.springframework.stereotype.Service; |
9 | +import org.springframework.util.CollectionUtils; | ||
11 | 10 | ||
12 | import com.b2c.orders.domain.client.dto.request.BuyerCancelRequestDto; | 11 | import com.b2c.orders.domain.client.dto.request.BuyerCancelRequestDto; |
13 | import com.b2c.orders.domain.client.dto.request.BuyerConfirmRequestDto; | 12 | import com.b2c.orders.domain.client.dto.request.BuyerConfirmRequestDto; |
@@ -28,13 +27,15 @@ import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; | @@ -28,13 +27,15 @@ import com.b2c.orders.domain.client.dto.response.OrderListResponseDto; | ||
28 | import com.b2c.orders.domain.client.dto.response.SubmitOrderResponseDto; | 27 | import com.b2c.orders.domain.client.dto.response.SubmitOrderResponseDto; |
29 | import com.b2c.orders.domain.client.service.OrderService; | 28 | import com.b2c.orders.domain.client.service.OrderService; |
30 | import com.diligrp.mobsite.getway.domain.common.ResultCode; | 29 | import com.diligrp.mobsite.getway.domain.common.ResultCode; |
30 | +import com.diligrp.mobsite.getway.domain.protocol.Order; | ||
31 | import com.diligrp.mobsite.getway.domain.protocol.OrderItem; | 31 | import com.diligrp.mobsite.getway.domain.protocol.OrderItem; |
32 | +import com.diligrp.mobsite.getway.domain.protocol.PickInfo; | ||
33 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
32 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; | 34 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; |
33 | import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; | 35 | 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.domain.protocol.order.model.OrderDetail; |
37 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | ||
36 | import com.diligrp.mobsite.getway.rpc.OrderRPC; | 38 | import com.diligrp.mobsite.getway.rpc.OrderRPC; |
37 | -import com.diligrp.titan.sdk.output.PageOutput; | ||
38 | 39 | ||
39 | /** | 40 | /** |
40 | * <B>Description</B> 订单rpc <br /> | 41 | * <B>Description</B> 订单rpc <br /> |
@@ -57,8 +58,8 @@ public class OrderRPCImpl implements OrderRPC { | @@ -57,8 +58,8 @@ public class OrderRPCImpl implements OrderRPC { | ||
57 | private OrderService orderService; | 58 | private OrderService orderService; |
58 | 59 | ||
59 | @Override | 60 | @Override |
60 | - public PageOutput<List<OrderListResponseDto>> getOrders(OrderListRequestDto input, Long userId) { | ||
61 | - PageOutput<List<OrderListResponseDto>> output = new PageOutput<>(); | 61 | + public SearchOrderListResp getOrders(OrderListRequestDto input) { |
62 | + SearchOrderListResp output = new SearchOrderListResp(); | ||
62 | ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(input); | 63 | ApiPageDataResponse<OrderListResponseDto> response = this.orderService.list(input); |
63 | if (response == null) { | 64 | if (response == null) { |
64 | output.setCode(ResultCode.NETWORK_FAILED); | 65 | output.setCode(ResultCode.NETWORK_FAILED); |
@@ -66,36 +67,38 @@ public class OrderRPCImpl implements OrderRPC { | @@ -66,36 +67,38 @@ public class OrderRPCImpl implements OrderRPC { | ||
66 | } | 67 | } |
67 | if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) { | 68 | if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) { |
68 | output.setCode(ResultCode.SUCCESS); | 69 | 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()); | 70 | + output.setMaxPageNum(response.getTotalPage()); |
71 | + if (!CollectionUtils.isEmpty(response.getList())) { | ||
72 | + List<Order> orders = new ArrayList<>(response.getList().size()); | ||
73 | + for (OrderListResponseDto dto : response.getList()) { | ||
74 | + Order order = this.convertToOrder(dto); | ||
75 | + orders.add(order); | ||
76 | + } | ||
77 | + output.setOrders(orders); | ||
78 | + } | ||
74 | } else { | 79 | } else { |
75 | output.setCode(ResultCode.BUSINESS_FAILED); | 80 | output.setCode(ResultCode.BUSINESS_FAILED); |
76 | } | 81 | } |
82 | + output.setMsg(response.getMessage()); | ||
77 | return output; | 83 | return output; |
78 | } | 84 | } |
79 | 85 | ||
80 | @Override | 86 | @Override |
81 | - public GetOrderDetailResp getOrderById(Long orderId, Long userId) { | 87 | + public GetOrderResp getOrderById(Long orderId, Long userId) { |
82 | OrderDetailRequestDto request = new OrderDetailRequestDto(); | 88 | OrderDetailRequestDto request = new OrderDetailRequestDto(); |
83 | request.setOrderId(orderId); | 89 | request.setOrderId(orderId); |
84 | ApiDataResponse<OrderDetailResponseDto> response = this.orderService.detail(request); | 90 | ApiDataResponse<OrderDetailResponseDto> response = this.orderService.detail(request); |
85 | - GetOrderDetailResp resp = new GetOrderDetailResp(); | 91 | + GetOrderResp resp = new GetOrderResp(); |
86 | if (response == null) { | 92 | if (response == null) { |
87 | resp.setCode(ResultCode.NETWORK_FAILED); | 93 | resp.setCode(ResultCode.NETWORK_FAILED); |
88 | return resp; | 94 | return resp; |
89 | } | 95 | } |
90 | if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) { | 96 | if (response.getCode() == ApiResponse.RESPONSE_CODE_SUCCESS) { |
91 | resp.setCode(ResultCode.SUCCESS); | 97 | 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(); | 98 | OrderDetailResponseDto dto = response.getData(); |
99 | + OrderDetail order = new OrderDetail(); | ||
95 | order.setBuyerMemo(dto.getBuyerMemo()); | 100 | order.setBuyerMemo(dto.getBuyerMemo()); |
96 | - if (dto.getDeliveryTime() != null) { | ||
97 | - order.setDeliveryTime(df.format(dto.getDeliveryTime())); | ||
98 | - } | 101 | + order.setDeliveryTime(dto.getDeliveryTime()); |
99 | order.setDeliveryType(dto.getDeliveryType()); | 102 | order.setDeliveryType(dto.getDeliveryType()); |
100 | order.setId(dto.getId()); | 103 | order.setId(dto.getId()); |
101 | order.setOrderStatus(dto.getOrderStatus()); | 104 | order.setOrderStatus(dto.getOrderStatus()); |
@@ -103,8 +106,16 @@ public class OrderRPCImpl implements OrderRPC { | @@ -103,8 +106,16 @@ public class OrderRPCImpl implements OrderRPC { | ||
103 | order.setPayType(dto.getPayType()); | 106 | order.setPayType(dto.getPayType()); |
104 | order.setRealTotalPrice(dto.getRealTotalPrice()); | 107 | order.setRealTotalPrice(dto.getRealTotalPrice()); |
105 | order.setReservationTime(dto.getReservationTime()); | 108 | order.setReservationTime(dto.getReservationTime()); |
106 | - order.setSubmitTime(df.format(dto.getSubmitTime())); | 109 | + order.setSubmitTime(dto.getSubmitTime()); |
107 | order.setTotalPrice(dto.getTotalPrice()); | 110 | order.setTotalPrice(dto.getTotalPrice()); |
111 | + PickInfo pickInfo = new PickInfo(); | ||
112 | + pickInfo.setCityAddress(dto.getCityName()); | ||
113 | + pickInfo.setCityId(dto.getCityId()); | ||
114 | + pickInfo.setMobile(dto.getReceiverPhoneNumber()); | ||
115 | + pickInfo.setName(dto.getReceiverName()); | ||
116 | + pickInfo.setStreetAddress(dto.getDeliveryAddress()); | ||
117 | + order.setPickInfo(pickInfo); | ||
118 | + resp.setOrder(order); | ||
108 | } else { | 119 | } else { |
109 | resp.setCode(ResultCode.BUSINESS_FAILED); | 120 | resp.setCode(ResultCode.BUSINESS_FAILED); |
110 | } | 121 | } |
@@ -265,4 +276,22 @@ public class OrderRPCImpl implements OrderRPC { | @@ -265,4 +276,22 @@ public class OrderRPCImpl implements OrderRPC { | ||
265 | } | 276 | } |
266 | } | 277 | } |
267 | 278 | ||
279 | + private Order convertToOrder(OrderListResponseDto dto) { | ||
280 | + Order order = new Order(); | ||
281 | + order.setBuyerMemo(dto.getBuyerMemo()); | ||
282 | + order.setDeliveryTime(dto.getDeliveryTime()); | ||
283 | + order.setDeliveryType(dto.getDeliveryType()); | ||
284 | + order.setId(dto.getId()); | ||
285 | + order.setOrderStatus(dto.getOrderStatus()); | ||
286 | + order.setPayStatus(dto.getPayStatus()); | ||
287 | + order.setPayTime(dto.getPayTime()); | ||
288 | + order.setPayType(dto.getPayType()); | ||
289 | + order.setRealTotalPrice(dto.getRealTotalPrice()); | ||
290 | + order.setReservationTime(dto.getReservationTime()); | ||
291 | + order.setShopId(dto.getShopId()); | ||
292 | + order.setSubmitTime(dto.getSubmitTime()); | ||
293 | + order.setTotalPrice(dto.getTotalPrice()); | ||
294 | + return order; | ||
295 | + } | ||
296 | + | ||
268 | } | 297 | } |
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/BuyerOrderService.java deleted
100644 → 0
1 | -package com.diligrp.mobsite.getway.service.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 | -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; | ||
15 | - | ||
16 | -public interface BuyerOrderService { | ||
17 | - | ||
18 | - /** | ||
19 | - * 提交订单 | ||
20 | - * | ||
21 | - * @param req | ||
22 | - * @return | ||
23 | - */ | ||
24 | - SubmitOrderResp submit(SubmitOrderReq req); | ||
25 | - | ||
26 | - /** | ||
27 | - * 支付 | ||
28 | - * | ||
29 | - * @param req | ||
30 | - * @return | ||
31 | - */ | ||
32 | - PayOrderResp pay(PayOrderReq req); | ||
33 | - | ||
34 | - /** | ||
35 | - * 确认收货 | ||
36 | - * | ||
37 | - * @param req | ||
38 | - * @return | ||
39 | - */ | ||
40 | - BuyerConfirmReceiptResp confirmReceipt(BuyerConfirmReceiptReq req); | ||
41 | - | ||
42 | - /** | ||
43 | - * 取消订单 | ||
44 | - * | ||
45 | - * @param req | ||
46 | - * @return | ||
47 | - */ | ||
48 | - BuyerCancelOrderResp cancel(BuyerCancelOrderReq req); | ||
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 | - | ||
66 | -} |
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/impl/BuyerOrderServiceImpl.java deleted
100644 → 0
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/buyer/user/OrderService.java
1 | package com.diligrp.mobsite.getway.service.buyer.user; | 1 | package com.diligrp.mobsite.getway.service.buyer.user; |
2 | 2 | ||
3 | import com.diligrp.mobsite.getway.domain.protocol.order.*; | 3 | import com.diligrp.mobsite.getway.domain.protocol.order.*; |
4 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; | ||
5 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | ||
4 | 6 | ||
5 | 7 | ||
6 | /** | 8 | /** |
@@ -20,7 +22,7 @@ public interface OrderService { | @@ -20,7 +22,7 @@ public interface OrderService { | ||
20 | * @createTime 2014年9月1日 下午6:18:36 | 22 | * @createTime 2014年9月1日 下午6:18:36 |
21 | * @author zhangshirui | 23 | * @author zhangshirui |
22 | */ | 24 | */ |
23 | - SearchOrderResp getOrders(SearchOrderReq req); | 25 | + SearchOrderListResp getOrders(SearchOrderListReq req); |
24 | 26 | ||
25 | 27 | ||
26 | /** | 28 | /** |
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/OrderServiceImpl.java
1 | package com.diligrp.mobsite.getway.service.buyer.user.impl; | 1 | package com.diligrp.mobsite.getway.service.buyer.user.impl; |
2 | 2 | ||
3 | +import javax.annotation.Resource; | ||
3 | 4 | ||
4 | -import com.diligrp.mobsite.getway.domain.protocol.order.*; | ||
5 | -import com.diligrp.mobsite.getway.rpc.*; | ||
6 | -import com.diligrp.mobsite.getway.service.buyer.user.OrderService; | ||
7 | -import com.diligrp.website.util.redis.RedisUtil; | ||
8 | -import com.diligrp.website.web.interfaces.WebsiteClient; | ||
9 | -import com.yqyw.filter.client.KeyWordsClient; | ||
10 | import org.apache.log4j.Logger; | 5 | import org.apache.log4j.Logger; |
11 | import org.springframework.beans.factory.annotation.Autowired; | 6 | import org.springframework.beans.factory.annotation.Autowired; |
12 | import org.springframework.stereotype.Service; | 7 | import org.springframework.stereotype.Service; |
13 | 8 | ||
14 | -import javax.annotation.Resource; | ||
15 | - | 9 | +import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; |
10 | +import com.b2c.orders.enums.UserType; | ||
11 | +import com.diligrp.mobsite.getway.domain.protocol.order.AppraiseGoodsReq; | ||
12 | +import com.diligrp.mobsite.getway.domain.protocol.order.AppraiseGoodsResp; | ||
13 | +import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderReq; | ||
14 | +import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderResp; | ||
15 | +import com.diligrp.mobsite.getway.domain.protocol.order.ConfirmPickUpReq; | ||
16 | +import com.diligrp.mobsite.getway.domain.protocol.order.ConfirmPickUpResp; | ||
17 | +import com.diligrp.mobsite.getway.domain.protocol.order.DelOrderReq; | ||
18 | +import com.diligrp.mobsite.getway.domain.protocol.order.DelOrderResp; | ||
19 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq; | ||
20 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
21 | +import com.diligrp.mobsite.getway.domain.protocol.order.PaymentReq; | ||
22 | +import com.diligrp.mobsite.getway.domain.protocol.order.PaymentResp; | ||
23 | +import com.diligrp.mobsite.getway.domain.protocol.order.SendTradeCodeReq; | ||
24 | +import com.diligrp.mobsite.getway.domain.protocol.order.SendTradeCodeResp; | ||
25 | +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; | ||
26 | +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; | ||
27 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; | ||
28 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | ||
29 | +import com.diligrp.mobsite.getway.rpc.ConfigRPC; | ||
30 | +import com.diligrp.mobsite.getway.rpc.GoodsRPC; | ||
31 | +import com.diligrp.mobsite.getway.rpc.MarketRPC; | ||
32 | +import com.diligrp.mobsite.getway.rpc.MessageRPC; | ||
33 | +import com.diligrp.mobsite.getway.rpc.OrderRPC; | ||
34 | +import com.diligrp.mobsite.getway.rpc.ShopRPC; | ||
35 | +import com.diligrp.mobsite.getway.rpc.UserRPC; | ||
36 | +import com.diligrp.mobsite.getway.service.buyer.user.OrderService; | ||
37 | +import com.diligrp.website.util.redis.RedisUtil; | ||
38 | +import com.diligrp.website.web.interfaces.WebsiteClient; | ||
39 | +import com.yqyw.filter.client.KeyWordsClient; | ||
16 | 40 | ||
17 | /** | 41 | /** |
18 | * <B>Description</B> 订单 <br /> | 42 | * <B>Description</B> 订单 <br /> |
19 | - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> | 43 | + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. |
44 | + * <br /> | ||
20 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> | 45 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> |
21 | * <B>Company</B> 地利集团 | 46 | * <B>Company</B> 地利集团 |
22 | * | 47 | * |
@@ -32,8 +57,8 @@ public class OrderServiceImpl implements OrderService { | @@ -32,8 +57,8 @@ public class OrderServiceImpl implements OrderService { | ||
32 | private GoodsRPC goodsRPC; | 57 | private GoodsRPC goodsRPC; |
33 | @Autowired | 58 | @Autowired |
34 | private MessageRPC messageRPC; | 59 | private MessageRPC messageRPC; |
35 | - //@Resource | ||
36 | - //private ServiceRPC serviceRPC; | 60 | + // @Resource |
61 | + // private ServiceRPC serviceRPC; | ||
37 | @Resource | 62 | @Resource |
38 | private MarketRPC marketRPC; | 63 | private MarketRPC marketRPC; |
39 | @Resource | 64 | @Resource |
@@ -43,8 +68,8 @@ public class OrderServiceImpl implements OrderService { | @@ -43,8 +68,8 @@ public class OrderServiceImpl implements OrderService { | ||
43 | 68 | ||
44 | @Resource | 69 | @Resource |
45 | private ShopRPC shopRPC; | 70 | private ShopRPC shopRPC; |
46 | - | ||
47 | - | 71 | + @Resource |
72 | + private OrderRPC orderRPC; | ||
48 | 73 | ||
49 | @Resource | 74 | @Resource |
50 | private KeyWordsClient keyWordsClient; | 75 | private KeyWordsClient keyWordsClient; |
@@ -53,42 +78,52 @@ public class OrderServiceImpl implements OrderService { | @@ -53,42 +78,52 @@ public class OrderServiceImpl implements OrderService { | ||
53 | private WebsiteClient websiteClient; | 78 | private WebsiteClient websiteClient; |
54 | 79 | ||
55 | /* | 80 | /* |
56 | - * 订单查询类型:简单查询-1 | ||
57 | - * 订单查询类型:详细查询-2 | ||
58 | - */ | 81 | + * 订单查询类型:简单查询-1 订单查询类型:详细查询-2 |
82 | + */ | ||
59 | public static final int SEARCH_TYPE_SIMPLE = 1; | 83 | public static final int SEARCH_TYPE_SIMPLE = 1; |
60 | public static final int SEARCH_TYPE_DETAIL = 2; | 84 | public static final int SEARCH_TYPE_DETAIL = 2; |
61 | - /*成功标志*/ | 85 | + /* 成功标志 */ |
62 | public static final int SUCCESS_FLAG = 1; | 86 | public static final int SUCCESS_FLAG = 1; |
63 | 87 | ||
64 | private static final int DELAY_PICKUP_DAYS = 3; | 88 | private static final int DELAY_PICKUP_DAYS = 3; |
65 | 89 | ||
66 | private static Logger log = Logger.getLogger(OrderServiceImpl.class); | 90 | private static Logger log = Logger.getLogger(OrderServiceImpl.class); |
67 | 91 | ||
68 | - | ||
69 | @Override | 92 | @Override |
70 | - public SearchOrderResp getOrders(SearchOrderReq req) { | ||
71 | - return null; | 93 | + public SearchOrderListResp getOrders(SearchOrderListReq req) { |
94 | + OrderListRequestDto input = new OrderListRequestDto(); | ||
95 | + input.setOrderStatus(req.getOrderStatus()); | ||
96 | + input.setPage(req.getPageNum()); | ||
97 | + input.setQueryString(req.getKeyword()); | ||
98 | + input.setShopBuyerId(req.getShopBuyerId()); | ||
99 | + input.setUserType(UserType.BUYER.getIndex()); | ||
100 | + return this.orderRPC.getOrders(input); | ||
72 | } | 101 | } |
73 | 102 | ||
74 | @Override | 103 | @Override |
75 | public SubmitOrderResp submitOrderNew(SubmitOrderReq req) { | 104 | public SubmitOrderResp submitOrderNew(SubmitOrderReq req) { |
76 | - return null; | 105 | + return this.orderRPC.submit(req); |
77 | } | 106 | } |
78 | 107 | ||
79 | @Override | 108 | @Override |
80 | public CancelOrderResp cancelOrder(CancelOrderReq req) { | 109 | public CancelOrderResp cancelOrder(CancelOrderReq req) { |
81 | - return null; | 110 | + Integer result = this.orderRPC.cancelOrder(req.getOrderId(), req.getUserId()); |
111 | + CancelOrderResp resp = new CancelOrderResp(); | ||
112 | + resp.setCode(result); | ||
113 | + return resp; | ||
82 | } | 114 | } |
83 | 115 | ||
84 | @Override | 116 | @Override |
85 | public ConfirmPickUpResp confirmPickUp(ConfirmPickUpReq req) { | 117 | public ConfirmPickUpResp confirmPickUp(ConfirmPickUpReq req) { |
86 | - return null; | 118 | + Integer result = this.orderRPC.confirmPickUp(req.getOrderId(), req.getUserId()); |
119 | + ConfirmPickUpResp resp = new ConfirmPickUpResp(); | ||
120 | + resp.setCode(result); | ||
121 | + return resp; | ||
87 | } | 122 | } |
88 | 123 | ||
89 | @Override | 124 | @Override |
90 | public GetOrderResp getOrderById(GetOrderReq req) { | 125 | public GetOrderResp getOrderById(GetOrderReq req) { |
91 | - return null; | 126 | + return this.orderRPC.getOrderById(req.getOrderId(), req.getUserId()); |
92 | } | 127 | } |
93 | 128 | ||
94 | @Override | 129 | @Override |
@@ -103,12 +138,19 @@ public class OrderServiceImpl implements OrderService { | @@ -103,12 +138,19 @@ public class OrderServiceImpl implements OrderService { | ||
103 | 138 | ||
104 | @Override | 139 | @Override |
105 | public PaymentResp payment(PaymentReq req) { | 140 | public PaymentResp payment(PaymentReq req) { |
106 | - return null; | 141 | + Integer result = this.orderRPC.pay(req.getOrderId(), req.getUserId(), req.getPayType()); |
142 | + PaymentResp resp = new PaymentResp(); | ||
143 | + resp.setCode(result); | ||
144 | + return resp; | ||
107 | } | 145 | } |
108 | 146 | ||
109 | @Override | 147 | @Override |
110 | public DelOrderResp delOrder(DelOrderReq req) { | 148 | public DelOrderResp delOrder(DelOrderReq req) { |
111 | - return null; | 149 | + for (Long id : req.getOrderIds()) { |
150 | + this.orderRPC.remove(id, req.getUserId(), UserType.BUYER.getIndex()); | ||
151 | + } | ||
152 | + DelOrderResp resp = new DelOrderResp(); | ||
153 | + return resp; | ||
112 | } | 154 | } |
113 | 155 | ||
114 | } | 156 | } |
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerOrderService.java
1 | package com.diligrp.mobsite.getway.service.seller; | 1 | package com.diligrp.mobsite.getway.service.seller; |
2 | 2 | ||
3 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; | 3 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; |
4 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq; | ||
5 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
4 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.*; | 6 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.*; |
5 | 7 | ||
6 | - | ||
7 | /** | 8 | /** |
8 | * <B>Description</B> 订单 <br /> | 9 | * <B>Description</B> 订单 <br /> |
9 | - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> | 10 | + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. |
11 | + * <br /> | ||
10 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> | 12 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> |
11 | * <B>Company</B> 地利集团 | 13 | * <B>Company</B> 地利集团 |
14 | + * | ||
12 | * @createTime 2014年9月1日 下午5:34:20 | 15 | * @createTime 2014年9月1日 下午5:34:20 |
13 | * @author zhangshirui | 16 | * @author zhangshirui |
14 | */ | 17 | */ |
15 | public interface SellerOrderService { | 18 | public interface SellerOrderService { |
16 | 19 | ||
17 | - /** | ||
18 | - * 获取订单列表 | ||
19 | - * @param req | ||
20 | - * @return | ||
21 | - * @createTime 2014年9月1日 下午6:18:36 | ||
22 | - * @author weili | ||
23 | - */ | ||
24 | - GetOrderListResp getOrders(GetOrderListReq req) throws Exception; | ||
25 | - | ||
26 | - /** | ||
27 | - * 根据id获取订单 | ||
28 | - * @param req | ||
29 | - * @return | ||
30 | - * @createTime 2014年9月1日 下午6:39:42 | ||
31 | - * @author weili | ||
32 | - */ | ||
33 | - GetOrderDetailResp getOrderById(GetOrderDetailReq req); | ||
34 | - | ||
35 | - | ||
36 | - | ||
37 | - /** | ||
38 | - * 确认收款 | ||
39 | - * @param req | ||
40 | - * @return | ||
41 | - * @createTime 2014年9月1日 下午6:18:29 | ||
42 | - * @author weili | ||
43 | - */ | ||
44 | - ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req); | ||
45 | - | ||
46 | - | ||
47 | - /** | ||
48 | - * 修改订单信息 | ||
49 | - * @param req | ||
50 | - * @return | ||
51 | - * @createTime 2014年9月1日 下午6:18:29 | ||
52 | - * @author weili | ||
53 | - */ | ||
54 | - BaseResp takeOrder(takeOrderReq req); | 20 | + /** |
21 | + * 获取订单列表 | ||
22 | + * | ||
23 | + * @param req | ||
24 | + * @return | ||
25 | + * @createTime 2014年9月1日 下午6:18:36 | ||
26 | + * @author weili | ||
27 | + */ | ||
28 | + SearchOrderListResp getOrders(SearchOrderListReq req) throws Exception; | ||
55 | 29 | ||
30 | + /** | ||
31 | + * 根据id获取订单 | ||
32 | + * | ||
33 | + * @param req | ||
34 | + * @return | ||
35 | + * @createTime 2014年9月1日 下午6:39:42 | ||
36 | + * @author weili | ||
37 | + */ | ||
38 | + GetOrderResp getOrderById(GetOrderReq req); | ||
56 | 39 | ||
40 | + /** | ||
41 | + * 确认收款 | ||
42 | + * | ||
43 | + * @param req | ||
44 | + * @return | ||
45 | + * @createTime 2014年9月1日 下午6:18:29 | ||
46 | + * @author weili | ||
47 | + */ | ||
48 | + ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req); | ||
57 | 49 | ||
50 | + /** | ||
51 | + * 修改订单信息 | ||
52 | + * | ||
53 | + * @param req | ||
54 | + * @return | ||
55 | + * @createTime 2014年9月1日 下午6:18:29 | ||
56 | + * @author weili | ||
57 | + */ | ||
58 | + BaseResp takeOrder(TakeOrderReq req); | ||
58 | 59 | ||
59 | - /** | ||
60 | - * 拒绝订单 | ||
61 | - * @param req | ||
62 | - * @return | ||
63 | - * @createTime 2014年10月21日 下午4:40:17 | ||
64 | - * @author weili | ||
65 | - */ | ||
66 | - RefuseQuoteResp refuseOrder(RefuseQuoteReq req); | 60 | + /** |
61 | + * 拒绝订单 | ||
62 | + * | ||
63 | + * @param req | ||
64 | + * @return | ||
65 | + * @createTime 2014年10月21日 下午4:40:17 | ||
66 | + * @author weili | ||
67 | + */ | ||
68 | + RefuseQuoteResp refuseOrder(RefuseQuoteReq req); | ||
67 | 69 | ||
68 | - SearchOrderListResp searchOrders(SearchOrderListReq req); | ||
69 | } | 70 | } |
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerOrderServiceImpl.java
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 | - | ||
6 | import javax.annotation.Resource; | 3 | import javax.annotation.Resource; |
7 | 4 | ||
8 | -import org.springframework.util.CollectionUtils; | ||
9 | - | ||
10 | import com.b2c.orders.domain.client.dto.request.OrderListRequestDto; | 5 | 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; | 6 | +import com.b2c.orders.enums.UserType; |
13 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; | 7 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; |
14 | -import com.diligrp.mobsite.getway.domain.protocol.Order; | 8 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq; |
9 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
15 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq; | 10 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyReq; |
16 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp; | 11 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.ConfirmReceiptMoneyResp; |
17 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq; | ||
18 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp; | ||
19 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListReq; | ||
20 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderListResp; | ||
21 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq; | 12 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteReq; |
22 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp; | 13 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.RefuseQuoteResp; |
23 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; | 14 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; |
24 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | 15 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; |
25 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.takeOrderReq; | 16 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.TakeOrderReq; |
26 | import com.diligrp.mobsite.getway.rpc.OrderRPC; | 17 | import com.diligrp.mobsite.getway.rpc.OrderRPC; |
27 | import com.diligrp.mobsite.getway.service.seller.SellerOrderService; | 18 | import com.diligrp.mobsite.getway.service.seller.SellerOrderService; |
28 | -import com.diligrp.titan.sdk.output.PageOutput; | ||
29 | 19 | ||
30 | /** | 20 | /** |
31 | * <B>Description</B> 订单 <br /> | 21 | * <B>Description</B> 订单 <br /> |
@@ -44,58 +34,18 @@ public class SellerOrderServiceImpl implements SellerOrderService { | @@ -44,58 +34,18 @@ public class SellerOrderServiceImpl implements SellerOrderService { | ||
44 | private OrderRPC orderRPC; | 34 | private OrderRPC orderRPC; |
45 | 35 | ||
46 | @Override | 36 | @Override |
47 | - public GetOrderListResp getOrders(GetOrderListReq req) throws Exception { | ||
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; | 37 | + public SearchOrderListResp getOrders(SearchOrderListReq req) throws Exception { |
38 | + OrderListRequestDto input = new OrderListRequestDto(); | ||
39 | + input.setOrderStatus(req.getOrderStatus()); | ||
40 | + input.setPage(req.getPageNum()); | ||
41 | + input.setQueryString(req.getKeyword()); | ||
42 | + input.setSellerId(req.getSellerId()); | ||
43 | + input.setUserType(UserType.SELLER.getIndex()); | ||
44 | + return this.orderRPC.getOrders(input); | ||
95 | } | 45 | } |
96 | 46 | ||
97 | @Override | 47 | @Override |
98 | - public GetOrderDetailResp getOrderById(GetOrderDetailReq req) { | 48 | + public GetOrderResp getOrderById(GetOrderReq req) { |
99 | return this.orderRPC.getOrderById(req.getOrderId(), req.getUserId()); | 49 | return this.orderRPC.getOrderById(req.getOrderId(), req.getUserId()); |
100 | } | 50 | } |
101 | 51 | ||
@@ -108,7 +58,7 @@ public class SellerOrderServiceImpl implements SellerOrderService { | @@ -108,7 +58,7 @@ public class SellerOrderServiceImpl implements SellerOrderService { | ||
108 | } | 58 | } |
109 | 59 | ||
110 | @Override | 60 | @Override |
111 | - public BaseResp takeOrder(takeOrderReq req) { | 61 | + public BaseResp takeOrder(TakeOrderReq req) { |
112 | BaseResp resp = new BaseResp(); | 62 | BaseResp resp = new BaseResp(); |
113 | Integer result = this.orderRPC.take(req.getOrderId(), req.getUserId(), req.getPricePrivilege()); | 63 | Integer result = this.orderRPC.take(req.getOrderId(), req.getUserId(), req.getPricePrivilege()); |
114 | resp.setCode(result); | 64 | resp.setCode(result); |
@@ -123,32 +73,4 @@ public class SellerOrderServiceImpl implements SellerOrderService { | @@ -123,32 +73,4 @@ public class SellerOrderServiceImpl implements SellerOrderService { | ||
123 | return resp; | 73 | return resp; |
124 | } | 74 | } |
125 | 75 | ||
126 | - @Override | ||
127 | - public SearchOrderListResp searchOrders(SearchOrderListReq 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; | ||
153 | - } | ||
154 | } | 76 | } |
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/order/BuyerOrderController.java deleted
100644 → 0
1 | -package com.diligrp.mobsite.getway.web.api.buyer.order; | ||
2 | - | ||
3 | -import javax.annotation.Resource; | ||
4 | - | ||
5 | -import org.slf4j.Logger; | ||
6 | -import org.slf4j.LoggerFactory; | ||
7 | -import org.springframework.http.MediaType; | ||
8 | -import org.springframework.web.bind.annotation.RequestBody; | ||
9 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
10 | -import org.springframework.web.bind.annotation.RequestMethod; | ||
11 | -import org.springframework.web.bind.annotation.RestController; | ||
12 | - | ||
13 | -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderReq; | ||
14 | -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerCancelOrderResp; | ||
15 | -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptReq; | ||
16 | -import com.diligrp.mobsite.getway.domain.protocol.order.BuyerConfirmReceiptResp; | ||
17 | -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderReq; | ||
18 | -import com.diligrp.mobsite.getway.domain.protocol.order.PayOrderResp; | ||
19 | -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; | ||
20 | -import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; | ||
21 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailReq; | ||
22 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.GetOrderDetailResp; | ||
23 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; | ||
24 | -import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | ||
25 | -import com.diligrp.mobsite.getway.service.buyer.BuyerOrderService; | ||
26 | -import com.diligrp.mobsite.getway.web.api.base.BaseApiController; | ||
27 | - | ||
28 | -import io.swagger.annotations.Api; | ||
29 | - | ||
30 | -@RestController | ||
31 | -@RequestMapping(value = "/mobsiteApp/buyer/order", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) | ||
32 | -@Api(value = "/mobsiteApp-order-buyer", description = "订单接口-买家") | ||
33 | -public class BuyerOrderController extends BaseApiController { | ||
34 | - | ||
35 | - private static final Logger log = LoggerFactory.getLogger(BuyerOrderController.class); | ||
36 | - | ||
37 | - @Resource | ||
38 | - private BuyerOrderService buyerOrderService; | ||
39 | - | ||
40 | - /** | ||
41 | - * 提交订单 | ||
42 | - * | ||
43 | - * @param req | ||
44 | - */ | ||
45 | - @RequestMapping(value = "/submit", method = RequestMethod.POST) | ||
46 | - public void submit(@RequestBody SubmitOrderReq req) { | ||
47 | - try { | ||
48 | - SubmitOrderResp resp = buyerOrderService.submit(req); | ||
49 | - super.sendSuccessResp(resp); | ||
50 | - } catch (Exception e) { | ||
51 | - log.error("提交订单失败", e); | ||
52 | - super.sendError(e.getMessage()); | ||
53 | - } | ||
54 | - } | ||
55 | - | ||
56 | - @RequestMapping(value = "/pay", method = RequestMethod.POST) | ||
57 | - public void pay(@RequestBody PayOrderReq req) { | ||
58 | - try { | ||
59 | - PayOrderResp resp = buyerOrderService.pay(req); | ||
60 | - super.sendSuccessResp(resp); | ||
61 | - } catch (Exception e) { | ||
62 | - log.error("提交订单失败", e); | ||
63 | - super.sendError(e.getMessage()); | ||
64 | - } | ||
65 | - } | ||
66 | - | ||
67 | - @RequestMapping(value = "/confirmReceipt") | ||
68 | - public void confirmReceipt(@RequestBody BuyerConfirmReceiptReq req) { | ||
69 | - try { | ||
70 | - BuyerConfirmReceiptResp resp = buyerOrderService.confirmReceipt(req); | ||
71 | - super.sendSuccessResp(resp); | ||
72 | - } catch (Exception e) { | ||
73 | - log.error("提交订单失败", e); | ||
74 | - super.sendError(e.getMessage()); | ||
75 | - } | ||
76 | - } | ||
77 | - | ||
78 | - @RequestMapping(value = "/cancel", method = RequestMethod.POST) | ||
79 | - public void cancel(@RequestBody BuyerCancelOrderReq req) { | ||
80 | - try { | ||
81 | - BuyerCancelOrderResp resp = buyerOrderService.cancel(req); | ||
82 | - super.sendSuccessResp(resp); | ||
83 | - } catch (Exception e) { | ||
84 | - log.error("提交订单失败", e); | ||
85 | - super.sendError(e.getMessage()); | ||
86 | - } | ||
87 | - } | ||
88 | - | ||
89 | - @RequestMapping(value = "/detail", method = RequestMethod.POST) | ||
90 | - public void detail(@RequestBody GetOrderDetailReq req) { | ||
91 | - try { | ||
92 | - GetOrderDetailResp resp = buyerOrderService.getOrderById(req); | ||
93 | - super.sendSuccessResp(resp); | ||
94 | - } catch (Exception e) { | ||
95 | - log.error("提交订单失败", e); | ||
96 | - super.sendError(e.getMessage()); | ||
97 | - } | ||
98 | - } | ||
99 | - | ||
100 | - @RequestMapping(value = "/list", method = RequestMethod.POST) | ||
101 | - public void list(@RequestBody SearchOrderListReq req) { | ||
102 | - try { | ||
103 | - SearchOrderListResp resp = this.buyerOrderService.searchOrders(req); | ||
104 | - super.sendSuccessResp(resp); | ||
105 | - } catch (Exception e) { | ||
106 | - log.error("提交订单失败", e); | ||
107 | - super.sendError(e.getMessage()); | ||
108 | - } | ||
109 | - } | ||
110 | -} |
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/order/OrderController.java renamed to mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/order/OrderController.java
1 | -package com.diligrp.mobsite.getway.web.api.seller.order; | 1 | +package com.diligrp.mobsite.getway.web.api.buyer.order; |
2 | + | ||
3 | +import javax.annotation.Resource; | ||
4 | +import javax.servlet.http.HttpServletRequest; | ||
5 | + | ||
6 | +import org.apache.log4j.Logger; | ||
7 | +import org.springframework.stereotype.Controller; | ||
8 | +import org.springframework.web.bind.annotation.RequestBody; | ||
9 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
10 | +import org.springframework.web.bind.annotation.RequestMethod; | ||
11 | +import org.springframework.web.bind.annotation.ResponseBody; | ||
2 | 12 | ||
3 | import com.diligrp.mobsite.getway.domain.except.ServiceException; | 13 | import com.diligrp.mobsite.getway.domain.except.ServiceException; |
4 | -import com.diligrp.mobsite.getway.domain.protocol.order.*; | 14 | +import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderReq; |
15 | +import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderResp; | ||
16 | +import com.diligrp.mobsite.getway.domain.protocol.order.ConfirmPickUpReq; | ||
17 | +import com.diligrp.mobsite.getway.domain.protocol.order.ConfirmPickUpResp; | ||
18 | +import com.diligrp.mobsite.getway.domain.protocol.order.DelOrderReq; | ||
19 | +import com.diligrp.mobsite.getway.domain.protocol.order.DelOrderResp; | ||
20 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq; | ||
21 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
22 | +import com.diligrp.mobsite.getway.domain.protocol.order.PaymentReq; | ||
23 | +import com.diligrp.mobsite.getway.domain.protocol.order.PaymentResp; | ||
24 | +import com.diligrp.mobsite.getway.domain.protocol.order.SearchOrderReq; | ||
25 | +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderReq; | ||
26 | +import com.diligrp.mobsite.getway.domain.protocol.order.SubmitOrderResp; | ||
27 | +import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListReq; | ||
5 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; | 28 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.SearchOrderListResp; |
6 | import com.diligrp.mobsite.getway.service.buyer.user.OrderService; | 29 | import com.diligrp.mobsite.getway.service.buyer.user.OrderService; |
7 | import com.diligrp.mobsite.getway.web.api.base.BaseApiController; | 30 | import com.diligrp.mobsite.getway.web.api.base.BaseApiController; |
8 | import com.diligrp.mobsite.getway.web.utils.BeanValidator; | 31 | import com.diligrp.mobsite.getway.web.utils.BeanValidator; |
32 | + | ||
9 | import io.swagger.annotations.Api; | 33 | import io.swagger.annotations.Api; |
10 | import io.swagger.annotations.ApiImplicitParam; | 34 | import io.swagger.annotations.ApiImplicitParam; |
11 | import io.swagger.annotations.ApiImplicitParams; | 35 | import io.swagger.annotations.ApiImplicitParams; |
12 | import io.swagger.annotations.ApiOperation; | 36 | import io.swagger.annotations.ApiOperation; |
13 | -import org.apache.log4j.Logger; | ||
14 | -import org.springframework.stereotype.Controller; | ||
15 | -import org.springframework.web.bind.annotation.*; | ||
16 | - | ||
17 | -import javax.annotation.Resource; | ||
18 | -import javax.servlet.http.HttpServletRequest; | ||
19 | 37 | ||
20 | /** | 38 | /** |
21 | * <B>Description</B> 订单操作 <br /> | 39 | * <B>Description</B> 订单操作 <br /> |
@@ -52,7 +70,7 @@ public class OrderController extends BaseApiController { | @@ -52,7 +70,7 @@ public class OrderController extends BaseApiController { | ||
52 | @ResponseBody | 70 | @ResponseBody |
53 | public void getOrders(@RequestBody SearchOrderReq temp) { | 71 | public void getOrders(@RequestBody SearchOrderReq temp) { |
54 | 72 | ||
55 | - SearchOrderReq req = super.getRequest(SearchOrderReq.class); | 73 | + SearchOrderListReq req = super.getRequest(SearchOrderListReq.class); |
56 | try { | 74 | try { |
57 | SearchOrderListResp resp = orderService.getOrders(req); | 75 | SearchOrderListResp resp = orderService.getOrders(req); |
58 | super.sendSuccessResp(resp); | 76 | super.sendSuccessResp(resp); |
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/order/SellerOrderController.java
@@ -3,6 +3,8 @@ package com.diligrp.mobsite.getway.web.api.seller.order; | @@ -3,6 +3,8 @@ package com.diligrp.mobsite.getway.web.api.seller.order; | ||
3 | import com.diligrp.mobsite.getway.domain.except.ServiceException; | 3 | import com.diligrp.mobsite.getway.domain.except.ServiceException; |
4 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; | 4 | import com.diligrp.mobsite.getway.domain.protocol.BaseResp; |
5 | import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderResp; | 5 | import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderResp; |
6 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderReq; | ||
7 | +import com.diligrp.mobsite.getway.domain.protocol.order.GetOrderResp; | ||
6 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.*; | 8 | import com.diligrp.mobsite.getway.domain.protocol.saler.order.*; |
7 | import com.diligrp.mobsite.getway.service.seller.SellerOrderService; | 9 | import com.diligrp.mobsite.getway.service.seller.SellerOrderService; |
8 | import com.diligrp.mobsite.getway.web.api.base.BaseApiController; | 10 | import com.diligrp.mobsite.getway.web.api.base.BaseApiController; |
@@ -17,12 +19,13 @@ import org.springframework.web.bind.annotation.ResponseBody; | @@ -17,12 +19,13 @@ import org.springframework.web.bind.annotation.ResponseBody; | ||
17 | 19 | ||
18 | import javax.annotation.Resource; | 20 | import javax.annotation.Resource; |
19 | 21 | ||
20 | - | ||
21 | /** | 22 | /** |
22 | * <B>Description</B> 订单操作 <br /> | 23 | * <B>Description</B> 订单操作 <br /> |
23 | - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br /> | 24 | + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. |
25 | + * <br /> | ||
24 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> | 26 | * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br /> |
25 | * <B>Company</B> 地利集团 | 27 | * <B>Company</B> 地利集团 |
28 | + * | ||
26 | * @createTime 2014年9月1日 下午2:30:41 | 29 | * @createTime 2014年9月1日 下午2:30:41 |
27 | * @author weili | 30 | * @author weili |
28 | */ | 31 | */ |
@@ -30,175 +33,137 @@ import javax.annotation.Resource; | @@ -30,175 +33,137 @@ import javax.annotation.Resource; | ||
30 | @RequestMapping("/mobsiteApp/seller/order") | 33 | @RequestMapping("/mobsiteApp/seller/order") |
31 | @Api(value = "/mobsiteApp-order-seller", description = "订单接口-卖家") | 34 | @Api(value = "/mobsiteApp-order-seller", description = "订单接口-卖家") |
32 | public class SellerOrderController extends BaseApiController { | 35 | public class SellerOrderController extends BaseApiController { |
33 | - @Resource | ||
34 | - private SellerOrderService sellerOrderService; | ||
35 | - | ||
36 | - private static Logger log = Logger.getLogger(SellerOrderController.class); | ||
37 | - | ||
38 | - /** | ||
39 | - * 获取订单列表 | ||
40 | - * <p/> | ||
41 | - * 请求协议体:GetOrderListReq | ||
42 | - * 返回协议体:GetOrderListResp | ||
43 | - * | ||
44 | - * @return | ||
45 | - * @createTime 2017年1月3日 下午5:32:02 | ||
46 | - * @author weili | ||
47 | - */ | ||
48 | - @ApiOperation(value = "获取订单列表", httpMethod = "POST",response = GetOrderListResp.class) | ||
49 | - @RequestMapping(value = "/getOrders",method = RequestMethod.POST) | ||
50 | - @ResponseBody | ||
51 | - public void getOrders(@RequestBody GetOrderListReq temp) { | ||
52 | - | ||
53 | - GetOrderListReq req = super.getRequest(GetOrderListReq.class); | ||
54 | - try { | ||
55 | - GetOrderListResp resp = sellerOrderService.getOrders(req); | ||
56 | - super.sendSuccessResp(resp); | ||
57 | - } catch (ServiceException e) { | ||
58 | - log.error("获取订单列表出现业务异常", e); | ||
59 | - super.sendError(e.getCode(), e.getMessage()); | ||
60 | - } catch (Exception e) { | ||
61 | - log.error("获取订单列表失败", e); | ||
62 | - super.sendError(e.getMessage()); | ||
63 | - } | ||
64 | - } | ||
65 | - | ||
66 | - /** | ||
67 | - * 根据订单id查询订单 | ||
68 | - * <p/> | ||
69 | - * 请求协议体:GetOrderReq | ||
70 | - * 返回协议体:GetOrderResp | ||
71 | - * | ||
72 | - * @createTime 2014年9月1日 下午6:39:10 | ||
73 | - * @author weili | ||
74 | - */ | ||
75 | - @ApiOperation(value = "根据订单id查询订单", httpMethod = "POST",response = GetOrderDetailResp.class) | ||
76 | - @RequestMapping(value = "/getOrderById",method = RequestMethod.POST) | ||
77 | - @ResponseBody | ||
78 | - public void getOrderById(@RequestBody GetOrderDetailReq temp) { | ||
79 | - | ||
80 | - GetOrderDetailReq req = super.getRequest(GetOrderDetailReq.class); | ||
81 | - try { | ||
82 | - GetOrderDetailResp resp = sellerOrderService.getOrderById(req); | ||
83 | - super.sendSuccessResp(resp); | ||
84 | - } catch (ServiceException e) { | ||
85 | - log.error("获取订单详情出现业务异常", e); | ||
86 | - super.sendError(e.getCode(), e.getMessage()); | ||
87 | - } catch (Exception e) { | ||
88 | - log.error("获取订单详情失败", e); | ||
89 | - super.sendError(e.getMessage()); | ||
90 | - } | ||
91 | - } | ||
92 | - | ||
93 | - | ||
94 | - /** | ||
95 | - * 搜索订单列表 | ||
96 | - * <p/> | ||
97 | - * 请求协议体:GetOrderListReq | ||
98 | - * 返回协议体:GetOrderListResp | ||
99 | - * | ||
100 | - * @return | ||
101 | - * @createTime 2017年1月3日 下午5:32:02 | ||
102 | - * @author weili | ||
103 | - */ | ||
104 | - @ApiOperation(value = "搜索订单列表", httpMethod = "POST",response = SearchOrderListResp.class) | ||
105 | - @RequestMapping(value = "/searchOrders",method = RequestMethod.POST) | ||
106 | - @ResponseBody | ||
107 | - public void searchOrders(@RequestBody SearchOrderListReq temp) { | ||
108 | - | ||
109 | - SearchOrderListReq req = super.getRequest(SearchOrderListReq.class); | ||
110 | - try { | ||
111 | - SearchOrderListResp resp = sellerOrderService.searchOrders(req); | ||
112 | - super.sendSuccessResp(resp); | ||
113 | - } catch (ServiceException e) { | ||
114 | - log.error("获取订单列表出现业务异常", e); | ||
115 | - super.sendError(e.getCode(), e.getMessage()); | ||
116 | - } catch (Exception e) { | ||
117 | - log.error("获取订单列表失败", e); | ||
118 | - super.sendError(e.getMessage()); | ||
119 | - } | ||
120 | - } | ||
121 | - | ||
122 | - /** | ||
123 | - * 确认收款 | ||
124 | - * <p/> | ||
125 | - * 请求协议体:OperateOrderCommonReq | ||
126 | - * 返回协议体:OperateOrderCommonResp | ||
127 | - * | ||
128 | - * @createTime 2014年9月1日 下午6:16:05 | ||
129 | - * @author weili | ||
130 | - */ | ||
131 | - @ApiOperation(value = "确认收款", httpMethod = "POST",response = ConfirmReceiptMoneyResp.class) | ||
132 | - @RequestMapping(value = "/comfirmReceiveMoney",method = RequestMethod.POST) | ||
133 | - @ResponseBody | ||
134 | - public void comfirmReceiveMoney(@RequestBody ConfirmReceiptMoneyReq temp) { | ||
135 | - ConfirmReceiptMoneyReq req = super.getRequest(ConfirmReceiptMoneyReq.class); | ||
136 | - try { | ||
137 | - ConfirmReceiptMoneyResp resp = sellerOrderService.comfirmReceiveMoney(req); | ||
138 | - super.sendSuccessResp(resp); | ||
139 | - } catch (ServiceException e) { | ||
140 | - log.error("确认收款异常", e); | ||
141 | - super.sendError(e.getCode(), e.getMessage()); | ||
142 | - } catch (Exception e) { | ||
143 | - log.error("确认收款失败", e); | ||
144 | - super.sendError(e.getMessage()); | ||
145 | - } | ||
146 | - } | ||
147 | - | ||
148 | - | ||
149 | - | ||
150 | - | ||
151 | - /** | ||
152 | - * 接单 | ||
153 | - * <p/> | ||
154 | - * 请求协议体:takeOrderReq | ||
155 | - * 返回协议体:OperateOrderCommonResp | ||
156 | - * | ||
157 | - * @createTime 2014年9月1日 下午6:16:05 | ||
158 | - * @author weili | ||
159 | - */ | ||
160 | - @ApiOperation(value = "接单", httpMethod = "POST",response = CancelOrderResp.class) | ||
161 | - @RequestMapping(value = "/takeOrder",method = RequestMethod.POST) | ||
162 | - @ResponseBody | ||
163 | - public void takeOrder(@RequestBody takeOrderReq temp) { | ||
164 | - takeOrderReq req = super.getRequest(takeOrderReq.class); | ||
165 | - try { | ||
166 | - BaseResp resp = sellerOrderService.takeOrder(req); | ||
167 | - super.sendSuccessResp(resp); | ||
168 | - } catch (ServiceException e) { | ||
169 | - log.error("接单异常", e); | ||
170 | - super.sendError(e.getCode(), e.getMessage()); | ||
171 | - } catch (Exception e) { | ||
172 | - log.error("接单失败", e); | ||
173 | - super.sendError(e.getMessage()); | ||
174 | - } | ||
175 | - } | ||
176 | - | 36 | + @Resource |
37 | + private SellerOrderService sellerOrderService; | ||
38 | + | ||
39 | + private static Logger log = Logger.getLogger(SellerOrderController.class); | ||
40 | + | ||
41 | + /** | ||
42 | + * 获取订单列表 | ||
43 | + * <p/> | ||
44 | + * 请求协议体:GetOrderListReq 返回协议体:GetOrderListResp | ||
45 | + * | ||
46 | + * @return | ||
47 | + * @createTime 2017年1月3日 下午5:32:02 | ||
48 | + * @author weili | ||
49 | + */ | ||
50 | + @ApiOperation(value = "获取订单列表", httpMethod = "POST", response = GetOrderListResp.class) | ||
51 | + @RequestMapping(value = "/getOrders", method = RequestMethod.POST) | ||
52 | + @ResponseBody | ||
53 | + public void getOrders(@RequestBody GetOrderListReq temp) { | ||
54 | + | ||
55 | + SearchOrderListReq req = super.getRequest(SearchOrderListReq.class); | ||
56 | + try { | ||
57 | + SearchOrderListResp resp = sellerOrderService.getOrders(req); | ||
58 | + super.sendSuccessResp(resp); | ||
59 | + } catch (ServiceException e) { | ||
60 | + log.error("获取订单列表出现业务异常", e); | ||
61 | + super.sendError(e.getCode(), e.getMessage()); | ||
62 | + } catch (Exception e) { | ||
63 | + log.error("获取订单列表失败", e); | ||
64 | + super.sendError(e.getMessage()); | ||
65 | + } | ||
66 | + } | ||
67 | + | ||
68 | + /** | ||
69 | + * 根据订单id查询订单 | ||
70 | + * <p/> | ||
71 | + * 请求协议体:GetOrderReq 返回协议体:GetOrderResp | ||
72 | + * | ||
73 | + * @createTime 2014年9月1日 下午6:39:10 | ||
74 | + * @author weili | ||
75 | + */ | ||
76 | + @ApiOperation(value = "根据订单id查询订单", httpMethod = "POST", response = GetOrderDetailResp.class) | ||
77 | + @RequestMapping(value = "/getOrderById", method = RequestMethod.POST) | ||
78 | + @ResponseBody | ||
79 | + public void getOrderById(@RequestBody GetOrderDetailReq temp) { | ||
80 | + | ||
81 | + GetOrderReq req = super.getRequest(GetOrderReq.class); | ||
82 | + try { | ||
83 | + GetOrderResp resp = sellerOrderService.getOrderById(req); | ||
84 | + super.sendSuccessResp(resp); | ||
85 | + } catch (ServiceException e) { | ||
86 | + log.error("获取订单详情出现业务异常", e); | ||
87 | + super.sendError(e.getCode(), e.getMessage()); | ||
88 | + } catch (Exception e) { | ||
89 | + log.error("获取订单详情失败", e); | ||
90 | + super.sendError(e.getMessage()); | ||
91 | + } | ||
92 | + } | ||
93 | + | ||
94 | + /** | ||
95 | + * 确认收款 | ||
96 | + * <p/> | ||
97 | + * 请求协议体:OperateOrderCommonReq 返回协议体:OperateOrderCommonResp | ||
98 | + * | ||
99 | + * @createTime 2014年9月1日 下午6:16:05 | ||
100 | + * @author weili | ||
101 | + */ | ||
102 | + @ApiOperation(value = "确认收款", httpMethod = "POST", response = ConfirmReceiptMoneyResp.class) | ||
103 | + @RequestMapping(value = "/comfirmReceiveMoney", method = RequestMethod.POST) | ||
104 | + @ResponseBody | ||
105 | + public void comfirmReceiveMoney(@RequestBody ConfirmReceiptMoneyReq temp) { | ||
106 | + ConfirmReceiptMoneyReq req = super.getRequest(ConfirmReceiptMoneyReq.class); | ||
107 | + try { | ||
108 | + ConfirmReceiptMoneyResp resp = sellerOrderService.comfirmReceiveMoney(req); | ||
109 | + super.sendSuccessResp(resp); | ||
110 | + } catch (ServiceException e) { | ||
111 | + log.error("确认收款异常", e); | ||
112 | + super.sendError(e.getCode(), e.getMessage()); | ||
113 | + } catch (Exception e) { | ||
114 | + log.error("确认收款失败", e); | ||
115 | + super.sendError(e.getMessage()); | ||
116 | + } | ||
117 | + } | ||
118 | + | ||
119 | + /** | ||
120 | + * 接单 | ||
121 | + * <p/> | ||
122 | + * 请求协议体:takeOrderReq 返回协议体:OperateOrderCommonResp | ||
123 | + * | ||
124 | + * @createTime 2014年9月1日 下午6:16:05 | ||
125 | + * @author weili | ||
126 | + */ | ||
127 | + @ApiOperation(value = "接单", httpMethod = "POST", response = CancelOrderResp.class) | ||
128 | + @RequestMapping(value = "/takeOrder", method = RequestMethod.POST) | ||
129 | + @ResponseBody | ||
130 | + public void takeOrder(@RequestBody TakeOrderReq temp) { | ||
131 | + TakeOrderReq req = super.getRequest(TakeOrderReq.class); | ||
132 | + try { | ||
133 | + BaseResp resp = sellerOrderService.takeOrder(req); | ||
134 | + super.sendSuccessResp(resp); | ||
135 | + } catch (ServiceException e) { | ||
136 | + log.error("接单异常", e); | ||
137 | + super.sendError(e.getCode(), e.getMessage()); | ||
138 | + } catch (Exception e) { | ||
139 | + log.error("接单失败", e); | ||
140 | + super.sendError(e.getMessage()); | ||
141 | + } | ||
142 | + } | ||
143 | + | ||
144 | + /** | ||
145 | + * 拒绝接单 | ||
146 | + * <p/> | ||
147 | + * 请求协议体:takeOrderReq 返回协议体:OperateOrderCommonResp | ||
148 | + * | ||
149 | + * @createTime 2014年9月1日 下午6:16:05 | ||
150 | + * @author weili | ||
151 | + */ | ||
152 | + @ApiOperation(value = "拒绝接单", httpMethod = "POST", response = CancelOrderResp.class) | ||
153 | + @RequestMapping(value = "/refuseOrder", method = RequestMethod.POST) | ||
154 | + @ResponseBody | ||
155 | + public void refuseOrder(@RequestBody RefuseQuoteReq temp) { | ||
156 | + RefuseQuoteReq req = super.getRequest(RefuseQuoteReq.class); | ||
157 | + try { | ||
158 | + RefuseQuoteResp resp = sellerOrderService.refuseOrder(req); | ||
159 | + super.sendSuccessResp(resp); | ||
160 | + } catch (ServiceException e) { | ||
161 | + log.error("接单异常", e); | ||
162 | + super.sendError(e.getCode(), e.getMessage()); | ||
163 | + } catch (Exception e) { | ||
164 | + log.error("接单失败", e); | ||
165 | + super.sendError(e.getMessage()); | ||
166 | + } | ||
167 | + } | ||
177 | 168 | ||
178 | - /** | ||
179 | - * 拒绝接单 | ||
180 | - * <p/> | ||
181 | - * 请求协议体:takeOrderReq | ||
182 | - * 返回协议体:OperateOrderCommonResp | ||
183 | - * | ||
184 | - * @createTime 2014年9月1日 下午6:16:05 | ||
185 | - * @author weili | ||
186 | - */ | ||
187 | - @ApiOperation(value = "拒绝接单", httpMethod = "POST",response = CancelOrderResp.class) | ||
188 | - @RequestMapping(value = "/refuseOrder",method = RequestMethod.POST) | ||
189 | - @ResponseBody | ||
190 | - public void refuseOrder(@RequestBody RefuseQuoteReq temp) { | ||
191 | - RefuseQuoteReq req = super.getRequest(RefuseQuoteReq.class); | ||
192 | - try { | ||
193 | - RefuseQuoteResp resp = sellerOrderService.refuseOrder(req); | ||
194 | - super.sendSuccessResp(resp); | ||
195 | - } catch (ServiceException e) { | ||
196 | - log.error("接单异常", e); | ||
197 | - super.sendError(e.getCode(), e.getMessage()); | ||
198 | - } catch (Exception e) { | ||
199 | - log.error("接单失败", e); | ||
200 | - super.sendError(e.getMessage()); | ||
201 | - } | ||
202 | - } | ||
203 | - | ||
204 | } | 169 | } |
205 | \ No newline at end of file | 170 | \ No newline at end of file |
pom.xml
@@ -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.2-SNAPSHOT</version> | 368 | + <version>0.0.3-SNAPSHOT</version> |
369 | </dependency> | 369 | </dependency> |
370 | 370 | ||
371 | <!--商品库sdk--> | 371 | <!--商品库sdk--> |