b2c / gateway · Commits

Commit 44139aeb9cd1719a0c62618a075f6cbccb44d880

Authored by jiangchengyong
1 parent 5f299c54

收货地址update

Inline Side-by-side
Showing 16 changed files with 60 additions and 68 deletions
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ConsigneeInfo.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/PickInfo.java
  View file @44139ae
... ... @@ -14,7 +14,7 @@ import java.io.Serializable;
14 14 * @author wujianjun
15 15 * @createTime 2014/8/28 10:37
16 16 */
17   -public class ConsigneeInfo implements Serializable {
  17 +public class PickInfo implements Serializable {
18 18  
19 19 private static final long serialVersionUID = 8718494787385584082L;
20 20  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/cart/ConfirmCartResp.java
  View file @44139ae
... ... @@ -3,7 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.cart;
3 3 import java.util.List;
4 4  
5 5 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
6   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  6 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
7 7 import com.diligrp.mobsite.getway.domain.protocol.cart.model.ConfirmCartShopInfo;
8 8  
9 9  
... ... @@ -21,7 +21,7 @@ public class ConfirmCartResp extends BaseResp {
21 21 /**
22 22 * 提货人信息
23 23 */
24   - private ConsigneeInfo consigneeInfo;
  24 + private PickInfo pickInfo;
25 25  
26 26 /**
27 27 * 购物单店铺信息
... ... @@ -45,17 +45,17 @@ public class ConfirmCartResp extends BaseResp {
45 45 private Integer cartType;
46 46  
47 47 /**
48   - * @return the consigneeInfo
  48 + * @return the pickInfo
49 49 */
50   - public ConsigneeInfo getConsigneeInfo() {
51   - return consigneeInfo;
  50 + public PickInfo getPickInfo() {
  51 + return pickInfo;
52 52 }
53 53  
54 54 /**
55   - * @param consigneeInfo the consigneeInfo to set
  55 + * @param pickInfo the pickInfo to set
56 56 */
57   - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
58   - this.consigneeInfo = consigneeInfo;
  57 + public void setPickInfo(PickInfo pickInfo) {
  58 + this.pickInfo = pickInfo;
59 59 }
60 60  
61 61 /**
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/ClaimsInfoVO.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.order.model;
2 2  
3   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  3 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
4 4 import com.diligrp.mobsite.getway.domain.protocol.OrderProduct;
5 5  
6 6 import java.util.Date;
... ... @@ -114,7 +114,7 @@ public class ClaimsInfoVO {
114 114 /**
115 115 * 提货人信息
116 116 */
117   - private ConsigneeInfo consigneeInfo;
  117 + private PickInfo pickInfo;
118 118 /**
119 119 * 提货时间
120 120 */
... ... @@ -188,12 +188,12 @@ public class ClaimsInfoVO {
188 188 this.pickUserMsg = pickUserMsg;
189 189 }
190 190  
191   - public ConsigneeInfo getConsigneeInfo() {
192   - return consigneeInfo;
  191 + public PickInfo getPickInfo() {
  192 + return pickInfo;
193 193 }
194 194  
195   - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
196   - this.consigneeInfo = consigneeInfo;
  195 + public void setPickInfo(PickInfo pickInfo) {
  196 + this.pickInfo = pickInfo;
197 197 }
198 198  
199 199 public String getPickDate() {
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/OrderDetail.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.order.model;
2 2  
3   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  3 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
4 4 import com.diligrp.mobsite.getway.domain.protocol.Order;
5 5 import io.swagger.annotations.ApiModelProperty;
6 6  
... ... @@ -20,14 +20,14 @@ public class OrderDetail extends Order{
20 20 * 提货人信息
21 21 */
22 22 @ApiModelProperty(value = "收货人信息")
23   - private ConsigneeInfo consigneeInfo;
  23 + private PickInfo pickInfo;
24 24  
25 25  
26   - public ConsigneeInfo getConsigneeInfo() {
27   - return consigneeInfo;
  26 + public PickInfo getPickInfo() {
  27 + return pickInfo;
28 28 }
29 29  
30   - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
31   - this.consigneeInfo = consigneeInfo;
  30 + public void setPickInfo(PickInfo pickInfo) {
  31 + this.pickInfo = pickInfo;
32 32 }
33 33 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/AddPickInfoReq.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  4 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
5 5  
6 6 /**
7 7 * <B>Description</B> 添加提货人请求 <br />
... ... @@ -14,14 +14,14 @@ import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
14 14 */
15 15 @SuppressWarnings("serial")
16 16 public class AddPickInfoReq extends BaseReq {
17   - private ConsigneeInfo consigneeInfo;
  17 + private PickInfo pickInfo;
18 18  
19   - public ConsigneeInfo getConsigneeInfo() {
20   - return consigneeInfo;
  19 + public PickInfo getPickInfo() {
  20 + return pickInfo;
21 21 }
22 22  
23   - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
24   - this.consigneeInfo = consigneeInfo;
  23 + public void setPickInfo(PickInfo pickInfo) {
  24 + this.pickInfo = pickInfo;
25 25 }
26 26  
27 27 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/GetDefaultPickInfoResp.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
2 2  
3   -import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
4 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
5 5  
6 6 /**
7 7 * <B>Description</B> 获取默认提货人 <br />
... ... @@ -17,13 +17,13 @@ public class GetDefaultPickInfoResp extends BaseResp{
17 17 /**
18 18 * 提货人信息
19 19 */
20   - private PickingInfoOutput pickingInfoOutput;
  20 + private PickInfo pickInfo;
21 21  
22   - public PickingInfoOutput getPickingInfoOutput() {
23   - return pickingInfoOutput;
  22 + public PickInfo getPickingInfo() {
  23 + return pickInfo;
24 24 }
25 25  
26   - public void setPickingInfoOutput(PickingInfoOutput pickingInfoOutput) {
27   - this.pickingInfoOutput = pickingInfoOutput;
  26 + public void setPickingInfo(PickInfo pickInfo) {
  27 + this.pickInfo = pickInfo;
28 28 }
29 29 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/GetPickInfoListResp.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
2 2  
3   -import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
4 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
5 5  
6 6 import java.util.List;
7 7  
... ... @@ -19,6 +19,6 @@ public class GetPickInfoListResp extends BaseResp {
19 19 /**
20 20 * 提货人信息列表
21 21 */
22   - private List<PickingInfoOutput> pickInfos;
  22 + private List<PickInfo> pickInfos;
23 23  
24 24 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/GetPickInfoResp.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
2 2  
3   -import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
4 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
5 5  
6 6 /**
7 7 * <B>Description</B> 获取单个提货人响应 <br />
... ... @@ -17,13 +17,13 @@ public class GetPickInfoResp extends BaseResp {
17 17 /**
18 18 * 提货人信息
19 19 */
20   - private PickingInfoOutput pickingInfo;
  20 + private PickInfo pickingInfo;
21 21  
22   - public PickingInfoOutput getPickingInfo() {
  22 + public PickInfo getPickingInfo() {
23 23 return pickingInfo;
24 24 }
25 25  
26   - public void setPickingInfo(PickingInfoOutput pickingInfo) {
  26 + public void setPickingInfo(PickInfo pickingInfo) {
27 27 this.pickingInfo = pickingInfo;
28 28 }
29 29 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/pickinfo/UpdatePickInfoReq.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.domain.protocol.pickinfo;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  4 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
5 5  
6 6 /**
7 7 * <B>Description</B> 修改提货人信息请求 <br />
... ... @@ -17,13 +17,13 @@ public class UpdatePickInfoReq extends BaseReq{
17 17 /**
18 18 * 提货人信息
19 19 */
20   - private ConsigneeInfo consigneeInfo;
  20 + private PickInfo pickInfo;
21 21  
22   - public ConsigneeInfo getConsigneeInfo() {
23   - return consigneeInfo;
  22 + public PickInfo getPickInfo() {
  23 + return pickInfo;
24 24 }
25 25  
26   - public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
27   - this.consigneeInfo = consigneeInfo;
  26 + public void setPickInfo(PickInfo pickInfo) {
  27 + this.pickInfo = pickInfo;
28 28 }
29 29 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/PickInfoRPC.java
  View file @44139ae
... ... @@ -34,7 +34,7 @@ public interface PickInfoRPC {
34 34 /**
35 35 * @comment 根据买家id获取默认收货地址
36 36 * @param buyerId
37   - * @return PickingInfoOutput
  37 + * @return PickInfoOutput
38 38 * @author kelan
39 39 * @time 2016/12/15 10:38
40 40 */
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/SellerRPC.java
  View file @44139ae
... ... @@ -2,7 +2,7 @@ package com.diligrp.mobsite.getway.rpc;
2 2  
3 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 4 import com.b2c.myapp.common.api.sellerInfo.output.SellerInfoOutput;
5   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  5 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
6 6 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
7 7  
8 8 import java.util.List;
... ... @@ -54,17 +54,17 @@ public interface SellerRPC {
54 54 */
55 55 boolean modifyPwd(String accountName, String newPassword);
56 56  
57   - Long addConsignee(ConsigneeInfo consigneeInfo, Long userId);
  57 + Long addConsignee(PickInfo pickInfo, Long userId);
58 58  
59   - boolean updateConsignee(ConsigneeInfo consigneeInfo, Long userId);
  59 + boolean updateConsignee(PickInfo pickInfo, Long userId);
60 60  
61   - ConsigneeInfo getConsignee(Long id);
  61 + PickInfo getConsignee(Long id);
62 62  
63 63 boolean delConsignee(Long id);
64 64  
65   - List<ConsigneeInfo> getConsigneeByUserId(Long userId);
  65 + List<PickInfo> getConsigneeByUserId(Long userId);
66 66  
67   - ConsigneeInfo getDefaultConsignee(Long userId);
  67 + PickInfo getDefaultConsignee(Long userId);
68 68  
69 69 boolean setDefaultConsignee(Long id, Long userId);
70 70  
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/UserRPC.java
  View file @44139ae
... ... @@ -2,7 +2,6 @@ package com.diligrp.mobsite.getway.rpc;
2 2  
3 3 import com.b2c.myapp.common.api.buyerInfo.output.BuyerInfoOutput;
4 4 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
5   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
6 5 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
7 6  
8 7 import java.util.List;
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/SellerRPCImpl.java
  View file @44139ae
... ... @@ -7,7 +7,7 @@ import com.b2c.myapp.sdk.MyAppClient;
7 7 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
8 8 import com.diligrp.mobsite.getway.domain.common.ResultCode;
9 9 import com.diligrp.mobsite.getway.domain.except.ServiceException;
10   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
  10 +import com.diligrp.mobsite.getway.domain.protocol.PickInfo;
11 11 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
12 12 import com.diligrp.mobsite.getway.rpc.GoodsRPC;
13 13 import com.diligrp.mobsite.getway.rpc.SellerRPC;
... ... @@ -84,17 +84,17 @@ public class SellerRPCImpl implements SellerRPC {
84 84 }
85 85  
86 86 @Override
87   - public Long addConsignee(ConsigneeInfo consigneeInfo, Long userId) {
  87 + public Long addConsignee(PickInfo pickInfo, Long userId) {
88 88 return null;
89 89 }
90 90  
91 91 @Override
92   - public boolean updateConsignee(ConsigneeInfo consigneeInfo, Long userId) {
  92 + public boolean updateConsignee(PickInfo pickInfo, Long userId) {
93 93 return false;
94 94 }
95 95  
96 96 @Override
97   - public ConsigneeInfo getConsignee(Long id) {
  97 + public PickInfo getConsignee(Long id) {
98 98 return null;
99 99 }
100 100  
... ... @@ -104,12 +104,12 @@ public class SellerRPCImpl implements SellerRPC {
104 104 }
105 105  
106 106 @Override
107   - public List<ConsigneeInfo> getConsigneeByUserId(Long userId) {
  107 + public List<PickInfo> getConsigneeByUserId(Long userId) {
108 108 return null;
109 109 }
110 110  
111 111 @Override
112   - public ConsigneeInfo getDefaultConsignee(Long userId) {
  112 + public PickInfo getDefaultConsignee(Long userId) {
113 113 return null;
114 114 }
115 115  
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/impl/UserRPCImpl.java
  View file @44139ae
... ... @@ -7,7 +7,6 @@ import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
7 7 import com.diligrp.mobsite.getway.domain.common.ResultCode;
8 8 import com.diligrp.mobsite.getway.domain.except.ServiceException;
9 9 import com.diligrp.mobsite.getway.domain.protocol.AddCartProduct;
10   -import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
11 10 import com.diligrp.mobsite.getway.domain.protocol.cart.ModifyAmountReq;
12 11 import com.diligrp.mobsite.getway.rpc.GoodsRPC;
13 12 import com.diligrp.mobsite.getway.rpc.UserRPC;
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/pickinfo/PickInfoService.java
  View file @44139ae
1 1 package com.diligrp.mobsite.getway.service.buyer.pickinfo;
2 2  
3   -import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoSaveInput;
4   -import com.b2c.myapp.common.api.pickingInfo.input.PickingInfoUpdateInput;
5   -import com.b2c.myapp.common.api.pickingInfo.output.PickingInfoOutput;
6   -import com.diligrp.mobsite.getway.domain.protocol.cart.*;
7 3 import com.diligrp.mobsite.getway.domain.protocol.pickinfo.*;
8 4  
9   -import java.util.List;
10   -
11 5 /**
12 6 * Created by jiangchengyong on 2017/1/12.
13 7 */
... ... @@ -51,7 +45,7 @@ public interface PickInfoService {
51 45 /**
52 46 * @comment 根据买家id获取默认收货地址
53 47 * @param req
54   - * @return PickingInfoOutput
  48 + * @return PickInfo
55 49 * @author kelan
56 50 * @time 2016/12/15 10:38
57 51 */
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/pickinfo/impl/PickInfoServiceImpl.java
  View file @44139ae
... ... @@ -65,7 +65,7 @@ public class PickInfoServiceImpl implements PickInfoService{
65 65  
66 66 /**
67 67 * @param req
68   - * @return PickingInfoOutput
  68 + * @return PickInfo
69 69 * @comment 根据买家id获取默认收货地址
70 70 * @author kelan
71 71 * @time 2016/12/15 10:38
... ...