b2c / gateway · Commits

Commit 63e8b057d88335f23aafb85d76d3e9cb2a25f33f

Authored by weiliwhereareyou@163.com
1 parent 376680f5
build: skipped

初始化工程-接口定义

Inline Side-by-side
Showing 84 changed files with 2014 additions and 1705 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 84 of 128 files are displayed.

mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/base/BaseListReq.java
  View file @63e8b05
... ... @@ -2,6 +2,7 @@
2 2 package com.diligrp.mobsite.getway.domain.base;
3 3  
4 4 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  5 +import io.swagger.annotations.ApiModelProperty;
5 6  
6 7 /**
7 8 * 列表请求基类
... ... @@ -20,6 +21,7 @@ public class BaseListReq extends BaseReq {
20 21 /**
21 22 * 页码
22 23 */
  24 + @ApiModelProperty(value = "页码",required = true)
23 25 private Integer pageNum;
24 26  
25 27 public Integer getPageNum() {
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Attribute.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
3 5 import java.util.List;
4 6  
5 7 /**
... ... @@ -15,17 +17,23 @@ public class Attribute {
15 17 /**
16 18 * 商品属性Id
17 19 */
  20 + @ApiModelProperty(value = "商品属性id")
18 21 private Long id;
19 22 /**
20 23 * 商品属性名称
21 24 */
  25 + @ApiModelProperty(value = "商品属性名称")
22 26 private String name;
23 27  
24 28 /**
25 29 * 属性取值
26 30 */
  31 + @ApiModelProperty(value = "商品属性值")
27 32 private List<AttributeValue> values;
28 33  
  34 +
  35 +
  36 +
29 37 /**
30 38 * get value of Attribute.id
31 39 * @return the id
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/AttributeValue.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3 3  
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
4 6 /**
5 7 * <B>Description</B> 属性值 <br />
6 8 * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
... ... @@ -24,10 +26,12 @@ public class AttributeValue {
24 26 /**
25 27 * 属性值ID
26 28 */
  29 + @ApiModelProperty(value = "属性值id")
27 30 private Long id;
28 31 /**
29 32 * 属性值名称
30 33 */
  34 + @ApiModelProperty(value = "属性值名称")
31 35 private String name;
32 36  
33 37 /**
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Category.java
  View file @63e8b05
... ... @@ -33,11 +33,9 @@ public class Category {
33 33 */
34 34 @ApiModelProperty(value = "分类图标")
35 35 private String imgUrl;
36   - /**
37   - * 关联分类id
38   - */
39   - @ApiModelProperty(value = "关联分类id")
40   - private Long relateId;
  36 +
  37 + @ApiModelProperty(value = "父分类id")
  38 + private Long parentId;
41 39 /**
42 40 * 分类级别
43 41 */
... ... @@ -70,12 +68,13 @@ public class Category {
70 68 this.imgUrl = imgUrl;
71 69 }
72 70  
73   - public Long getRelateId() {
74   - return relateId;
  71 +
  72 + public Long getParentId() {
  73 + return parentId;
75 74 }
76 75  
77   - public void setRelateId(Long relateId) {
78   - this.relateId = relateId;
  76 + public void setParentId(Long parentId) {
  77 + this.parentId = parentId;
79 78 }
80 79  
81 80 public String getLevel() {
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/ConsigneeInfo.java
  View file @63e8b05
... ... @@ -32,17 +32,17 @@ public class ConsigneeInfo implements Serializable {
32 32 /**
33 33 * id
34 34 */
35   - @ApiModelProperty(value = "id")
  35 + @ApiModelProperty(value = "收货人id")
36 36 private Long id;
37 37 /**
38 38 * 用户姓名名字
39 39 */
40   - @ApiModelProperty(value = "联系人姓名")
  40 + @ApiModelProperty(value = "收货人姓名")
41 41 private String name;
42 42 /**
43 43 * 电话
44 44 */
45   - @ApiModelProperty(value = "联系人电话")
  45 + @ApiModelProperty(value = "收货人电话")
46 46 private String mobile;
47 47  
48 48 /**
... ... @@ -51,10 +51,16 @@ public class ConsigneeInfo implements Serializable {
51 51 @ApiModelProperty(value = "是否为默认提货人:1-是，2-否")
52 52 private Integer isDefault;
53 53  
  54 +
54 55 /**
55 56 * 城市地址
56 57 */
57   - @ApiModelProperty(value = "城市地址")
  58 + @ApiModelProperty(value = "城市id")
  59 + private Integer cityId;
  60 + /**
  61 + * 城市地址
  62 + */
  63 + @ApiModelProperty(value = "城市描述")
58 64 private String cityAddress;
59 65 /**
60 66 * 街道地址
... ... @@ -63,11 +69,13 @@ public class ConsigneeInfo implements Serializable {
63 69 private String streetAddress;
64 70  
65 71  
  72 + public Integer getCityId() {
  73 + return cityId;
  74 + }
66 75  
67   -
68   -
69   -
70   -
  76 + public void setCityId(Integer cityId) {
  77 + this.cityId = cityId;
  78 + }
71 79  
72 80 public Long getId() {
73 81 return id;
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GetShopDeliveryTimeResp.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.shop.DeliveryTimeInfo;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
4 8  
5 9 /**
6 10 * Created by xxxzzz on 2016/12/21.
... ... @@ -9,7 +13,17 @@ public class GetShopDeliveryTimeResp extends BaseListResp {
9 13  
10 14  
11 15  
  16 + @ApiModelProperty(value = "时间段",required = true)
  17 + private List<DeliveryTimeInfo> deliveryTimeInfos;
  18 +
  19 +
  20 + public List<DeliveryTimeInfo> getDeliveryTimeInfos() {
  21 + return deliveryTimeInfos;
  22 + }
12 23  
  24 + public void setDeliveryTimeInfos(List<DeliveryTimeInfo> deliveryTimeInfos) {
  25 + this.deliveryTimeInfos = deliveryTimeInfos;
  26 + }
13 27  
14 28  
15 29 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/GoodsSuper.java
  View file @63e8b05
... ... @@ -15,69 +15,74 @@ import java.util.List;
15 15 * @author zhangshirui
16 16 */
17 17 public class GoodsSuper implements Serializable{
18   -
19   -
20   - /**
21   - * 商品ID
22   - */
23   - @ApiModelProperty(value = "商品id")
24   - private Long id;
25   - /**
26   - * 商品标题
27   - */
28   - @ApiModelProperty(value = "商品标题")
29   - private String title;
30   - /**
31   - * 商品默认图片
32   - */
33   - @ApiModelProperty(value = "商品默认图片")
  18 +
  19 +
  20 + @ApiModelProperty(value = "商品id" )
  21 + private Long pid;
  22 + @ApiModelProperty(value = "商品状态：-1删除,3在售,4下架" )
  23 + private Long state;
  24 + @ApiModelProperty(value = "商品名称",required = true)
  25 + private String name;
  26 + @ApiModelProperty(value = "商品单位",required = true)
  27 + private String unit;
  28 + @ApiModelProperty(value = "分类id",required = true)
  29 + private Integer cid;
  30 + @ApiModelProperty(value = "分类名称")
  31 + private String cname;
  32 + @ApiModelProperty(value = "商品类型：0普通商品,1促销商品",required = true)
  33 + private int productType;
  34 + @ApiModelProperty(value = "默认图片",required = true)
34 35 private String defaultPic;
35   - /**
36   - * 商品图片
37   - */
38   - @ApiModelProperty(value = "商品图片")
  36 + @ApiModelProperty(value = "商品图片",required = true)
39 37 private List<String> pictures;
40   - /**
41   - * 单位
42   - */
43   - @ApiModelProperty(value = "商品单位")
44   - private String unit;
  38 + @ApiModelProperty(value = "商品描述",required = true)
  39 + private String desc;
  40 + @ApiModelProperty(value = "skus",required = true)
  41 + private List<SKUInfo> skus;
  42 + @ApiModelProperty(value = "销售属性",required = true)
  43 + private List<Attribute> saleAtt;
  44 + @ApiModelProperty(value = "是否首页推荐：0是,1否",required = true)
  45 + private Integer indexTop;
  46 +
45 47  
  48 + public Long getState() {
  49 + return state;
  50 + }
  51 +
  52 + public void setState(Long state) {
  53 + this.state = state;
  54 + }
46 55  
47   - /**
48   - * 规格
49   - */
50   - @ApiModelProperty(value = "规格")
51   - private String standard;
  56 + public String getName() {
  57 + return name;
  58 + }
52 59  
53   - /**
54   - * 状态 -2=预览 -1=删除 1=待审核（新建）2=审核失败 3=在售 4=仓库中 5=待上架 6=过期下架 7=手动下架
55   - */
56   - @ApiModelProperty(value = "商品状态：-2=预览 -1=删除 1=待审核（新建）2=审核失败 3=在售 4=仓库中 5=待上架 6=过期下架 7=手动下架")
57   - private Integer state;
58   -
  60 + public void setName(String name) {
  61 + this.name = name;
  62 + }
59 63  
60   - /**
61   - * 价格
62   - */
63   - @ApiModelProperty(value = "商品价格")
64   - private Long price = 0L;
  64 + public Integer getCid() {
  65 + return cid;
  66 + }
65 67  
  68 + public void setCid(Integer cid) {
  69 + this.cid = cid;
  70 + }
66 71  
67   - public Long getId() {
68   - return id;
  72 + public String getCname() {
  73 + return cname;
69 74 }
70 75  
71   - public void setId(Long id) {
72   - this.id = id;
  76 + public void setCname(String cname) {
  77 + this.cname = cname;
73 78 }
74 79  
75   - public String getTitle() {
76   - return title;
  80 + public int getProductType() {
  81 + return productType;
77 82 }
78 83  
79   - public void setTitle(String title) {
80   - this.title = title;
  84 + public void setProductType(int productType) {
  85 + this.productType = productType;
81 86 }
82 87  
83 88 public String getDefaultPic() {
... ... @@ -96,27 +101,51 @@ public class GoodsSuper implements Serializable{
96 101 this.pictures = pictures;
97 102 }
98 103  
99   - public String getUnit() {
100   - return unit;
  104 + public String getDesc() {
  105 + return desc;
101 106 }
102 107  
103   - public void setUnit(String unit) {
104   - this.unit = unit;
  108 + public void setDesc(String desc) {
  109 + this.desc = desc;
105 110 }
106 111  
107   - public Integer getState() {
108   - return state;
  112 + public List<SKUInfo> getSkus() {
  113 + return skus;
109 114 }
110 115  
111   - public void setState(Integer state) {
112   - this.state = state;
  116 + public void setSkus(List<SKUInfo> skus) {
  117 + this.skus = skus;
  118 + }
  119 +
  120 + public List<Attribute> getSaleAtt() {
  121 + return saleAtt;
  122 + }
  123 +
  124 + public void setSaleAtt(List<Attribute> saleAtt) {
  125 + this.saleAtt = saleAtt;
  126 + }
  127 +
  128 + public Long getPid() {
  129 + return pid;
  130 + }
  131 +
  132 + public void setPid(Long pid) {
  133 + this.pid = pid;
  134 + }
  135 +
  136 + public Integer getIndexTop() {
  137 + return indexTop;
113 138 }
114 139  
115   - public Long getPrice() {
116   - return price;
  140 + public void setIndexTop(Integer indexTop) {
  141 + this.indexTop = indexTop;
117 142 }
118 143  
119   - public void setPrice(Long price) {
120   - this.price = price;
  144 + public String getUnit() {
  145 + return unit;
  146 + }
  147 +
  148 + public void setUnit(String unit) {
  149 + this.unit = unit;
121 150 }
122 151 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/Order.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3   -import com.diligrp.mobsite.getway.domain.protocol.order.model.MarketInfo;
4   -import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderSumInfo;
5 3 import io.swagger.annotations.ApiModelProperty;
6 4  
7 5 import java.io.Serializable;
... ... @@ -16,7 +14,7 @@ import java.util.List;
16 14 * @createTime 2014年9月1日 下午3:17:28
17 15 * @author zhangshirui
18 16 */
19   -public class Order extends OrderSumInfo implements Serializable{
  17 +public class Order implements Serializable{
20 18  
21 19 /**
22 20 * 是否已评论,1是,0否
... ... @@ -29,6 +27,12 @@ public class Order extends OrderSumInfo implements Serializable{
29 27  
30 28  
31 29 /**
  30 + * id,订单编号
  31 + */
  32 + @ApiModelProperty(value = "订单id")
  33 + private Long orderId;
  34 +
  35 + /**
32 36 * 订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成)
33 37 */
34 38 @ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
... ... @@ -65,15 +69,17 @@ public class Order extends OrderSumInfo implements Serializable{
65 69 */
66 70 @ApiModelProperty(value = "运费")
67 71 private Long postage;
68   - /**
69   - * 提交订单时间
70   - */
71   - private Long submitTime;
  72 +
72 73 /**
73 74 * 订单提交日期
74 75 */
75 76 @ApiModelProperty(value = "订单提交时间")
76   - private String submitDate;
  77 + private String submitTime;
  78 +
  79 +
  80 + @ApiModelProperty(value = "送达时间")
  81 + private String arriveTime;
  82 +
77 83 /**
78 84 * 订单详情页最上面
79 85 */
... ... @@ -84,144 +90,232 @@ public class Order extends OrderSumInfo implements Serializable{
84 90 */
85 91 @ApiModelProperty(value = "是否评论")
86 92 private Integer isCommented;
87   - /**
88   - * 卖家id
89   - */
90   - private Long sellerId;
  93 +
91 94  
92 95 /**
93 96 * 卖家姓名
94 97 */
  98 + @ApiModelProperty(value = "卖家姓名")
95 99 private String sellerName;
96 100 /**
97 101 * 卖家电话
98 102 */
  103 + @ApiModelProperty(value = "卖家电话")
99 104 private String sellerMobile;
100 105  
101 106 /**
102   - * 店铺id
103   - */
104   - private Long shopId;
105   - /**
106 107 * 店铺名称
107 108 */
  109 + @ApiModelProperty(value = "店铺名")
108 110 private String shopName;
109   - /**
110   - * 店铺联系电话
111   - */
112   - private String contactMobile;
  111 +
113 112 /**
114 113 * 订单商品列表
115 114 */
  115 + @ApiModelProperty(value = "商品列表")
116 116 private List<OrderProduct> orderProducts;
117 117 /**
118 118 * 提货留言
119 119 */
  120 + @ApiModelProperty(value = "提货备注留言")
120 121 private String pickUserMsg;
121   - /**
122   - * 提货人信息
123   - */
124   - private ConsigneeInfo consigneeInfo;
  122 +
125 123 /**
126 124 * 提货时间
127   - * TODO 后期需要删除
  125 + *
128 126 */
129   - @Deprecated
  127 + @ApiModelProperty(value = "提货时间")
130 128 private String pickDate;
131   - /**
132   - * 最晚提货时间
133   - */
134   - private Long pickupEndTime;
  129 +
135 130 /**
136 131 * 提货地点
137 132 */
  133 + @ApiModelProperty(value = "提货地点")
138 134 private String pickAddress;
139   - /**
140   - * 市场信息
141   - */
142   - private MarketInfo marketInfo;
143   - /**
144   - * 交易识别码
145   - */
146   - private String tradeCode;
147   - /**
148   - * 提货验证码
149   - */
150   - private String deliveryVerCode;
151   - /**
152   - * 申请退款id
153   - */
154   - private Long refundId;
155   - /**
156   - * 配送方式：10：上门自提，20送货上门
157   - */
158   - private Integer deliveryType;
  135 +
  136 +
159 137 /**
160 138 * 提货方式名称
161 139 */
  140 + @ApiModelProperty(value = "配送方式")
162 141 private String deliveryName;
163   - /**
164   - * 剩余提货时间
165   - */
166   - private Float remainPickTime;
167   - /**
168   - * 已经延期次数
169   - */
170   - private Integer delayedPickupNum;
171   -
172   - /**
173   - * 物流及验收备注
174   - */
175   - private String logisticsRemarks;
176 142  
177 143  
178   - /**
179   - * 店铺所在地省id
180   - */
181   - private Long shopLocationProvinceId;
182   - /**
183   - * 店铺所在地省name
184   - */
185   - private String shopLocationProvinceName;
186 144  
187 145 /**
188   - * 店铺所在地市id
189   - */
190   - private Long shopLocationCityId;
191   - /**
192   - * 店铺所在地市name
  146 + * 店铺地址
193 147 */
194   - private String shopLocationCityName;
  148 + @ApiModelProperty(value = "店铺地址")
  149 + private String shopAddr;
195 150  
196   - /**
197   - * 店铺所在地区id
198   - */
199   - private Long shopLocationRegionId;
200   - /**
201   - * 店铺所在地区name
202   - */
203   - private String shopLocationRegionName;
204 151  
205   - /**
206   - * 店铺发货地址
207   - */
208   - private String shopSendAddress;
  152 + public Long getOrderId() {
  153 + return orderId;
  154 + }
209 155  
  156 + public void setOrderId(Long orderId) {
  157 + this.orderId = orderId;
  158 + }
210 159  
  160 + public Integer getOrderState() {
  161 + return orderState;
  162 + }
211 163  
212   - /**
213   - * 物流信息
214   - */
215   - // private LogisticsInfo logisticsInfo;
  164 + public void setOrderState(Integer orderState) {
  165 + this.orderState = orderState;
  166 + }
216 167  
  168 + public String getStateName() {
  169 + return stateName;
  170 + }
217 171  
218   - /** 是否允许申请退款:1可以 0不可以 */
219   - private Integer refundFlag;
  172 + public void setStateName(String stateName) {
  173 + this.stateName = stateName;
  174 + }
220 175  
221   - /**
222   - * 退款单id，退款申请中时有值
223   - */
224   - private Long reOrderId;
  176 + public Integer getPayType() {
  177 + return payType;
  178 + }
  179 +
  180 + public void setPayType(Integer payType) {
  181 + this.payType = payType;
  182 + }
  183 +
  184 + public Long getTotalAmount() {
  185 + return totalAmount;
  186 + }
  187 +
  188 + public void setTotalAmount(Long totalAmount) {
  189 + this.totalAmount = totalAmount;
  190 + }
  191 +
  192 + public Long getRealPayAmount() {
  193 + return realPayAmount;
  194 + }
  195 +
  196 + public void setRealPayAmount(Long realPayAmount) {
  197 + this.realPayAmount = realPayAmount;
  198 + }
  199 +
  200 + public Long getDiscountAmount() {
  201 + return discountAmount;
  202 + }
  203 +
  204 + public void setDiscountAmount(Long discountAmount) {
  205 + this.discountAmount = discountAmount;
  206 + }
  207 +
  208 + public Long getPostage() {
  209 + return postage;
  210 + }
  211 +
  212 + public void setPostage(Long postage) {
  213 + this.postage = postage;
  214 + }
  215 +
  216 + public String getSubmitTime() {
  217 + return submitTime;
  218 + }
  219 +
  220 + public void setSubmitTime(String submitTime) {
  221 + this.submitTime = submitTime;
  222 + }
  223 +
  224 + public String getArriveTime() {
  225 + return arriveTime;
  226 + }
  227 +
  228 + public void setArriveTime(String arriveTime) {
  229 + this.arriveTime = arriveTime;
  230 + }
  231 +
  232 + public String getOrderDesc() {
  233 + return orderDesc;
  234 + }
  235 +
  236 + public void setOrderDesc(String orderDesc) {
  237 + this.orderDesc = orderDesc;
  238 + }
  239 +
  240 + public Integer getIsCommented() {
  241 + return isCommented;
  242 + }
  243 +
  244 + public void setIsCommented(Integer isCommented) {
  245 + this.isCommented = isCommented;
  246 + }
  247 +
  248 + public String getSellerName() {
  249 + return sellerName;
  250 + }
  251 +
  252 + public void setSellerName(String sellerName) {
  253 + this.sellerName = sellerName;
  254 + }
  255 +
  256 + public String getSellerMobile() {
  257 + return sellerMobile;
  258 + }
  259 +
  260 + public void setSellerMobile(String sellerMobile) {
  261 + this.sellerMobile = sellerMobile;
  262 + }
  263 +
  264 + public String getShopName() {
  265 + return shopName;
  266 + }
  267 +
  268 + public void setShopName(String shopName) {
  269 + this.shopName = shopName;
  270 + }
  271 +
  272 + public List<OrderProduct> getOrderProducts() {
  273 + return orderProducts;
  274 + }
  275 +
  276 + public void setOrderProducts(List<OrderProduct> orderProducts) {
  277 + this.orderProducts = orderProducts;
  278 + }
  279 +
  280 + public String getPickUserMsg() {
  281 + return pickUserMsg;
  282 + }
  283 +
  284 + public void setPickUserMsg(String pickUserMsg) {
  285 + this.pickUserMsg = pickUserMsg;
  286 + }
  287 +
  288 +
  289 +
  290 + public String getPickDate() {
  291 + return pickDate;
  292 + }
  293 +
  294 + public void setPickDate(String pickDate) {
  295 + this.pickDate = pickDate;
  296 + }
  297 +
  298 + public String getPickAddress() {
  299 + return pickAddress;
  300 + }
  301 +
  302 + public void setPickAddress(String pickAddress) {
  303 + this.pickAddress = pickAddress;
  304 + }
  305 +
  306 + public String getDeliveryName() {
  307 + return deliveryName;
  308 + }
  309 +
  310 + public void setDeliveryName(String deliveryName) {
  311 + this.deliveryName = deliveryName;
  312 + }
225 313  
  314 + public String getShopAddr() {
  315 + return shopAddr;
  316 + }
226 317  
  318 + public void setShopAddr(String shopAddr) {
  319 + this.shopAddr = shopAddr;
  320 + }
227 321 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderItem.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3 3  
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6 /**
6 7 * <B>Description</B> 订单具体项<br />
... ... @@ -12,39 +13,35 @@ package com.diligrp.mobsite.getway.domain.protocol;
12 13 */
13 14 public class OrderItem {
14 15  
15   - /**
16   - * 进货单id
17   - */
18   - private Long cartId;
  16 + ///**
  17 + // * 进货单id
  18 + // */
  19 + //@ApiModelProperty(value = "购物车id")
  20 + //private Long cartId;
19 21 /**
20 22 * 购买数量
21 23 */
  24 + @ApiModelProperty(value = "购买数量",required = true)
22 25 private Integer amount;
23 26 /**
24 27 * 价格-单位：分
25 28 */
  29 + @ApiModelProperty(value = "价格-单位:分",required = true)
26 30 private Long price;
27   - /**
28   - * 最新价格
29   - */
30   - private Long newPrice;
  31 +
31 32 /**
32 33 * 商品sku
33 34 */
  35 + @ApiModelProperty(value = "sku",required = true)
34 36 private String sku;
35 37  
36 38 /**
37 39 * 商品id
38 40 * */
  41 + @ApiModelProperty(value = "商品id",required = true)
39 42 private Long productId;
40 43  
41 44  
42   - /**
43   - * 是否为特价商品
44   - * */
45   - private Integer hasSpecial;
46   -
47   -
48 45 public Integer getAmount() {
49 46 return amount;
50 47 }
... ... @@ -52,46 +49,28 @@ public class OrderItem {
52 49 public void setAmount(Integer amount) {
53 50 this.amount = amount;
54 51 }
55   - public Long getPrice() {
56   - return price;
  52 +
  53 + public Long getProductId() {
  54 + return productId;
57 55 }
58   - public void setPrice(Long price) {
59   - this.price = price;
  56 +
  57 + public void setProductId(Long productId) {
  58 + this.productId = productId;
60 59 }
  60 +
61 61 public String getSku() {
62 62 return sku;
63 63 }
  64 +
64 65 public void setSku(String sku) {
65 66 this.sku = sku;
66 67 }
67   - public Long getCartId() {
68   - return cartId;
69   - }
70   - public void setCartId(Long cartId) {
71   - this.cartId = cartId;
72   - }
73   -
74   - public Long getNewPrice() {
75   - return newPrice;
76   - }
77   -
78   - public void setNewPrice(Long newPrice) {
79   - this.newPrice = newPrice;
80   - }
81   -
82   - public Long getProductId() {
83   - return productId;
84   - }
85 68  
86   - public void setProductId(Long productId) {
87   - this.productId = productId;
88   - }
89   -
90   - public Integer getHasSpecial() {
91   - return hasSpecial;
92   - }
  69 + public Long getPrice() {
  70 + return price;
  71 + }
93 72  
94   - public void setHasSpecial(Integer hasSpecial) {
95   - this.hasSpecial = hasSpecial;
96   - }
  73 + public void setPrice(Long price) {
  74 + this.price = price;
  75 + }
97 76 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/OrderProduct.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3   -import java.util.Map;
  3 +import io.swagger.annotations.ApiModelProperty;
4 4  
5 5  
6 6 /**
... ... @@ -16,83 +16,32 @@ public class OrderProduct extends GoodsSuper {
16 16 /**
17 17 * 购买数量
18 18 */
  19 + @ApiModelProperty(value = "购买数量")
19 20 private Integer buyNum;
20 21  
21   - /**
22   - * 商品属性map
23   - */
24   - private Map<String,String> attributeMap;
25   -
  22 +// /**
  23 +// * 商品属性map
  24 +// */
  25 +// private Map<String,String> attributeMap;
  26 +//
  27 +
  28 +//
26 29 // /**
27   -// * 商品服务列表
  30 +// * 商品sku
28 31 // */
29   -// private List<Service> serviceList;
30   -
31   - /**
32   - * 商品sku
33   - */
34   - private String sku;
  32 +// private String sku;
  33 +//
  34 +// /**
  35 +// *商品当前价格
  36 +// * */
  37 +// private Long currentPrice;
35 38  
36   - /**
37   - *商品当前价格
38   - * */
39   - private Long currentPrice;
40 39  
41   - /**
42   - * @return the buyNum
43   - */
44 40 public Integer getBuyNum() {
45 41 return buyNum;
46 42 }
47 43  
48   - /**
49   - * @param buyNum the buyNum to set
50   - */
51 44 public void setBuyNum(Integer buyNum) {
52 45 this.buyNum = buyNum;
53 46 }
54   -
55   - /**
56   - * @return the attributeMap
57   - */
58   - public Map<String, String> getAttributeMap() {
59   - return attributeMap;
60   - }
61   -
62   - /**
63   - * @param attributeMap the attributeMap to set
64   - */
65   - public void setAttributeMap(Map<String, String> attributeMap) {
66   - this.attributeMap = attributeMap;
67   - }
68   -
69   - /**
70   - * get value of OrderProduct.sku
71   - * @return the sku
72   - * @createTime 2014年10月22日 下午2:55:49
73   - * @author zhangshirui
74   - */
75   - public String getSku() {
76   - return sku;
77   - }
78   -
79   -
80   - /**
81   - * set value of OrderProduct.sku
82   - * @param sku the sku to set
83   - * @createTime 2014年10月22日 下午2:55:49
84   - * @author zhangshirui
85   - */
86   - public void setSku(String sku) {
87   - this.sku = sku;
88   - }
89   -
90   -
91   - public Long getCurrentPrice() {
92   - return currentPrice;
93   - }
94   -
95   - public void setCurrentPrice(Long currentPrice) {
96   - this.currentPrice = currentPrice;
97   - }
98 47 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/SKUInfo.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol;
2 2  
3   -import java.util.List;
  3 +import io.swagger.annotations.ApiModelProperty;
4 4  
5 5 /**
6 6 * <B>Description</B> 商品SKU信息 <br />
... ... @@ -12,151 +12,59 @@ import java.util.List;
12 12 * @createTime 2014/8/25 17:06
13 13 */
14 14 public class SKUInfo {
15   - /**
16   - * 最少起批量
17   - */
18   - private Integer minWholesale;
19   - /**
20   - * 库存
21   - */
22   - private Integer stockNum;
23   - /**
24   - * 属性组成的列表
25   - */
26   - private List<Long> sku;
27   - /**
28   - * 加密的sku
29   - */
30   - private String encodeSku;
31   - /**
32   - * 未加密的sku,规则：pid:attrId...
33   - * 1000003313:1270:1275
34   - */
  15 + @ApiModelProperty(value = "sku",required = true)
  16 + private String sku;
  17 +
  18 + @ApiModelProperty(value = "价格",required = true)
  19 + private int price;
  20 +
  21 + @ApiModelProperty(value = "商品id")
  22 + private long pid;
  23 +
35 24 private String decodeSku;
36   - /**
37   - * 价格
38   - */
39   - private Long price;
40   -
41   - /**
42   - * SKU版本
43   - */
  25 +
44 26 private Integer version;
45   - /**
46   - * sku状态
47   - */
  27 + @ApiModelProperty(value = "商品状态：1删除,3在售,4下架")
48 28 private Integer status;
49   - /**
50   - * SKU版本，添加进货单时需要回传
51   - *
52   - * @return
53   - */
54   - public Integer getVersion() {
55   - return version;
56   - }
57 29  
58   - /**
59   - * 设置SKU版本
60   - *
61   - * @param version
62   - */
63   - public void setVersion(Integer version) {
64   - this.version = version;
65   - }
66 30  
67   - /**
68   - * 剩余库存量
69   - *
70   - * @return
71   - */
72   - public Integer getStockNum() {
73   - return stockNum;
  31 + public int getPrice() {
  32 + return price;
74 33 }
75 34  
76   - /**
77   - * 剩余库存量
78   - *
79   - * @param stockNum
80   - */
81   - public void setStockNum(Integer stockNum) {
82   - this.stockNum = stockNum;
  35 + public void setPrice(int price) {
  36 + this.price = price;
83 37 }
84 38  
85   - /**
86   - * 由销售属性值ID组成的sku串
87   - *
88   - * @return
89   - */
90   - public List<Long> getSku() {
91   - return sku;
  39 + public long getPid() {
  40 + return pid;
92 41 }
93 42  
94   - /**
95   - * 由销售属性值ID组成的sku串
96   - *
97   - * @param sku
98   - */
99   - public void setSku(List<Long> sku) {
100   - this.sku = sku;
  43 + public void setPid(long pid) {
  44 + this.pid = pid;
101 45 }
102 46  
103   - /**
104   - * 价格
105   - *
106   - * @return
107   - */
108   - public Long getPrice() {
109   - return price;
  47 + public String getDecodeSku() {
  48 + return decodeSku;
110 49 }
111 50  
112   - /**
113   - * 价格
114   - *
115   - * @param price
116   - */
117   - public void setPrice(Long price) {
118   - this.price = price;
  51 + public void setDecodeSku(String decodeSku) {
  52 + this.decodeSku = decodeSku;
119 53 }
120 54  
121   -
122   - /**
123   - * 最少起批量
124   - * minWholesale
125   - */
126   - public Integer getMinWholesale() {
127   - return minWholesale;
  55 + public Integer getVersion() {
  56 + return version;
128 57 }
129 58  
130   -
131   - /**
132   - * 最少起批量
133   - * minWholesale
134   - */
135   - public void setMinWholesale(Integer minWholesale) {
136   - this.minWholesale = minWholesale;
  59 + public void setVersion(Integer version) {
  60 + this.version = version;
137 61 }
138 62  
139   - public String getEncodeSku() {
140   - return encodeSku;
141   - }
142   -
143   - public void setEncodeSku(String encodeSku) {
144   - this.encodeSku = encodeSku;
145   - }
146   -
147   - public String getDecodeSku() {
148   - return decodeSku;
149   - }
150   -
151   - public void setDecodeSku(String decodeSku) {
152   - this.decodeSku = decodeSku;
153   - }
154   -
155   - public Integer getStatus() {
156   - return status;
157   - }
  63 + public Integer getStatus() {
  64 + return status;
  65 + }
158 66  
159   - public void setStatus(Integer status) {
160   - this.status = status;
161   - }
  67 + public void setStatus(Integer status) {
  68 + this.status = status;
  69 + }
162 70 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/detail/BindToShopReq.java
  View file @63e8b05
... ... @@ -17,7 +17,7 @@ public class BindToShopReq extends BaseReq {
17 17 /**
18 18 * 店铺code
19 19 */
20   - @ApiModelProperty(value = "店铺code",required = true)
  20 + @ApiModelProperty(value = "店铺分享码",required = true)
21 21 private Integer shopAuthCode;
22 22  
23 23  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/FundTradeReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2017/1/3.
  8 + */
  9 +public class FundTradeReq extends BaseReq {
  10 +
  11 +
  12 +
  13 + @ApiModelProperty(value = "交易类型（1：充值 2：冻结4：消费）" ,required = true)
  14 + private Long tradeType;
  15 +
  16 +
  17 +
  18 + @ApiModelProperty(value = "交易金额",required = true)
  19 + private Long tradePrice;
  20 +
  21 +
  22 + public Long getTradeType() {
  23 + return tradeType;
  24 + }
  25 +
  26 + public void setTradeType(Long tradeType) {
  27 + this.tradeType = tradeType;
  28 + }
  29 +
  30 + public Long getTradePrice() {
  31 + return tradePrice;
  32 + }
  33 +
  34 + public void setTradePrice(Long tradePrice) {
  35 + this.tradePrice = tradePrice;
  36 + }
  37 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/FundTradeResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2017/1/3.
  7 + */
  8 +public class FundTradeResp extends BaseResp {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2017/1/3.
  7 + */
  8 +public class GetFundsReq extends BaseReq {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetFundsResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2017/1/3.
  8 + */
  9 +public class GetFundsResp extends BaseListResp {
  10 +
  11 +
  12 + @ApiModelProperty(value = "储值总金额")
  13 + private Long storedTotalPrice;
  14 +
  15 + @ApiModelProperty(value = "可用余额")
  16 + private Long residueTotalPrice;
  17 +
  18 + @ApiModelProperty(value = "冻结总金额")
  19 + private Long freezeTotalPrice;
  20 +
  21 + @ApiModelProperty(value = "用户名称")
  22 + private String userName ;
  23 +
  24 + @ApiModelProperty(value = "用户头像")
  25 + private String headImg ;
  26 +
  27 + public String getHeadImg() {
  28 + return headImg;
  29 + }
  30 +
  31 + public void setHeadImg(String headImg) {
  32 + this.headImg = headImg;
  33 + }
  34 +
  35 + public String getUserName() {
  36 + return userName;
  37 + }
  38 +
  39 + public void setUserName(String userName) {
  40 + this.userName = userName;
  41 + }
  42 +
  43 + public Long getStoredTotalPrice() {
  44 + return storedTotalPrice;
  45 + }
  46 +
  47 + public void setStoredTotalPrice(Long storedTotalPrice) {
  48 + this.storedTotalPrice = storedTotalPrice;
  49 + }
  50 +
  51 + public Long getResidueTotalPrice() {
  52 + return residueTotalPrice;
  53 + }
  54 +
  55 + public void setResidueTotalPrice(Long residueTotalPrice) {
  56 + this.residueTotalPrice = residueTotalPrice;
  57 + }
  58 +
  59 + public Long getFreezeTotalPrice() {
  60 + return freezeTotalPrice;
  61 + }
  62 +
  63 + public void setFreezeTotalPrice(Long freezeTotalPrice) {
  64 + this.freezeTotalPrice = freezeTotalPrice;
  65 + }
  66 +
  67 +
  68 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2017/1/3.
  8 + */
  9 +public class GetfundTradeRecordReq extends BaseListReq {
  10 +
  11 +
  12 + @ApiModelProperty(value = "查询类型（1：充值 2：冻结4：消费）" ,required = true)
  13 + private Long tradeType;
  14 +
  15 + public Long getTradeType() {
  16 + return tradeType;
  17 + }
  18 +
  19 + public void setTradeType(Long tradeType) {
  20 + this.tradeType = tradeType;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GetfundTradeRecordResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2017/1/3.
  8 + */
  9 +public class GetfundTradeRecordResp extends BaseListResp {
  10 +
  11 +
  12 + @ApiModelProperty(value = "储值金额/订单金额" ,required = true)
  13 + private Long tradePrice ;
  14 +
  15 +
  16 + @ApiModelProperty(value = "储值时间/消费时间")
  17 + private String tradeTime;
  18 +
  19 + //@ApiModelProperty(value = "储值余额/消费时间")
  20 + //private Long residueTotalPrice;
  21 +
  22 +
  23 + public Long getTradePrice() {
  24 + return tradePrice;
  25 + }
  26 +
  27 + public void setTradePrice(Long tradePrice) {
  28 + this.tradePrice = tradePrice;
  29 + }
  30 +
  31 + public String getTradeTime() {
  32 + return tradeTime;
  33 + }
  34 +
  35 + public void setTradeTime(String tradeTime) {
  36 + this.tradeTime = tradeTime;
  37 + }
  38 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/out/GuardRequest.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/GuardRequest.java
  View file @63e8b05
1   -package com.diligrp.mobsite.getway.domain.protocol.out;
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GuardBaseQueryReq;
4 4  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/out/SignRequest.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/SignRequest.java
  View file @63e8b05
1   -package com.diligrp.mobsite.getway.domain.protocol.out;
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.saler.order.GuardOperateCommonReq;
4 4  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/out/SignRsponse.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/fund/SignRsponse.java
  View file @63e8b05
1   -package com.diligrp.mobsite.getway.domain.protocol.out;
  1 +package com.diligrp.mobsite.getway.domain.protocol.fund;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4 4  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/CancelOrderReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6  
6 7 /**
... ... @@ -17,12 +18,14 @@ public class CancelOrderReq extends BaseReq {
17 18 /**
18 19 * 订单id
19 20 */
  21 + @ApiModelProperty(value = "订单id",required = true)
20 22 private Long orderId;
21 23  
22   - /**
23   - * 取消原因
24   - */
25   - private String reason;
  24 + ///**
  25 + // * 取消原因
  26 + // */
  27 + //@ApiModelProperty(value = "取消原因",required = true)
  28 + //private String reason;
26 29  
27 30  
28 31 /**
... ... @@ -47,41 +50,4 @@ public class CancelOrderReq extends BaseReq {
47 50 }
48 51  
49 52  
50   - /* (non-Javadoc)
51   - * @see java.lang.Object#toString()
52   - */
53   - @Override
54   - public String toString() {
55   - StringBuilder builder = new StringBuilder();
56   - builder.append("CancelOrderReq [orderId=");
57   - builder.append(orderId);
58   - builder.append(", reason=");
59   - builder.append(reason);
60   - builder.append("]");
61   - return builder.toString();
62   - }
63   -
64   -
65   -
66   - /**
67   - * get value of CancelOrderReq.reason
68   - * @return the reason
69   - * @createTime 2014年9月3日 下午5:19:33
70   - * @author zhangshirui
71   - */
72   - public String getReason() {
73   - return reason;
74   - }
75   -
76   -
77   -
78   - /**
79   - * set value of CancelOrderReq.reason
80   - * @param reason the reason to set
81   - * @createTime 2014年9月3日 下午5:19:33
82   - * @author zhangshirui
83   - */
84   - public void setReason(String reason) {
85   - this.reason = reason;
86   - }
87 53 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/CancelOrderResp.java
  View file @63e8b05
... ... @@ -14,6 +14,6 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
14 14 @SuppressWarnings("serial")
15 15 public class CancelOrderResp extends BaseResp {
16 16  
17   - public static final int CANCEL_RESULT_FAILED = 520;
  17 +
18 18  
19 19 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/ConfirmPickUpReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6  
6 7 /**
... ... @@ -17,12 +18,10 @@ public class ConfirmPickUpReq extends BaseReq {
17 18 /**
18 19 * 订单id
19 20 */
  21 + @ApiModelProperty(value = "订单id",required = true)
20 22 private Long orderId;
21 23  
22   - /**
23   - * 支付密码
24   - */
25   - private String payToken;
  24 +
26 25  
27 26  
28 27 /**
... ... @@ -46,27 +45,6 @@ public class ConfirmPickUpReq extends BaseReq {
46 45 this.orderId = orderId;
47 46 }
48 47  
49   -
50   - public String getPayToken() {
51   - return payToken;
52   - }
53   -
54   -
55   - public void setPayToken(String payToken) {
56   - this.payToken = payToken;
57   - }
58 48  
59   -
60   - /* (non-Javadoc)
61   - * @see java.lang.Object#toString()
62   - */
63   - @Override
64   - public String toString() {
65   - StringBuilder builder = new StringBuilder();
66   - builder.append("PickUpOrderReq [orderId=");
67   - builder.append(orderId);
68   - builder.append("]");
69   - return builder.toString();
70   - }
71 49  
72 50 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/ConfirmPickUpResp.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4   -import com.diligrp.mobsite.getway.domain.protocol.Order;
5   -import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail;
6 4  
7 5  
8 6 /**
... ... @@ -19,14 +17,14 @@ public class ConfirmPickUpResp extends BaseResp {
19 17 /**
20 18 * 订单
21 19 */
22   - private OrderDetail order;
23   -
24   - public OrderDetail getOrder() {
25   - return order;
26   - }
27   -
28   - public void setOrder(OrderDetail order) {
29   - this.order = order;
30   - }
  20 + //private OrderDetail order;
  21 + //
  22 + //public OrderDetail getOrder() {
  23 + // return order;
  24 + //}
  25 + //
  26 + //public void setOrder(OrderDetail order) {
  27 + // this.order = order;
  28 + //}
31 29  
32 30 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/DelOrderReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.order;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +
  8 +
  9 +/**
  10 + * <B>Description</B> 取消订单请求 <br />
  11 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  12 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  13 + * <B>Company</B> 地利集团
  14 + * @createTime 2014年9月1日 下午2:42:17
  15 + * @author zhangshirui
  16 + */
  17 +@SuppressWarnings("serial")
  18 +public class DelOrderReq extends BaseReq {
  19 +
  20 + /**
  21 + * 订单id
  22 + */
  23 + @ApiModelProperty(value = "订单id",required = true)
  24 + private List<Long> orderIds;
  25 +
  26 +
  27 + public List<Long> getOrderIds() {
  28 + return orderIds;
  29 + }
  30 +
  31 + public void setOrderIds(List<Long> orderIds) {
  32 + this.orderIds = orderIds;
  33 + }
  34 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/DelOrderResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.order;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +
  6 +/**
  7 + * <B>Description</B> 取消订单响应 <br />
  8 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  9 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  10 + * <B>Company</B> 地利集团
  11 + * @createTime 2014年9月1日 下午2:43:08
  12 + * @author zhangshirui
  13 + */
  14 +@SuppressWarnings("serial")
  15 +public class DelOrderResp extends BaseResp {
  16 +
  17 +
  18 +
  19 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/GetOrderReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6  
6 7 /**
... ... @@ -17,6 +18,7 @@ public class GetOrderReq extends BaseReq {
17 18 /**
18 19 * 订单id
19 20 */
  21 + @ApiModelProperty(value = "订单id",required = true)
20 22 private Long orderId;
21 23  
22 24  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/GetOrderResp.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4   -import com.diligrp.mobsite.getway.domain.protocol.Order;
5 4 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderDetail;
6 5  
7 6  
... ... @@ -19,9 +18,9 @@ public class GetOrderResp extends BaseResp {
19 18 /**
20 19 * 订单详情
21 20 */
22   - private Order order;
  21 + private OrderDetail order;
23 22  
24   - public Order getOrder() {
  23 + public OrderDetail getOrder() {
25 24 return order;
26 25 }
27 26  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PaymentReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.order;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/9/7.
  8 + */
  9 +public class PaymentReq extends BaseReq{
  10 +
  11 + /**
  12 + * 订单id
  13 + */
  14 + @ApiModelProperty(value = "订单id",required = true)
  15 + private Long orderId;
  16 + @ApiModelProperty(value = "支付方式:10线上付款,20线下付款",required = true)
  17 + private Integer payType;
  18 +
  19 +
  20 + public Long getOrderId() {
  21 + return orderId;
  22 + }
  23 +
  24 + public void setOrderId(Long orderId) {
  25 + this.orderId = orderId;
  26 + }
  27 +
  28 + public Integer getPayType() {
  29 + return payType;
  30 + }
  31 +
  32 + public void setPayType(Integer payType) {
  33 + this.payType = payType;
  34 + }
  35 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PayofflineResp.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PaymentResp.java
  View file @63e8b05
... ... @@ -5,5 +5,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
5 5 /**
6 6 * Created by xxxzzz on 2016/9/7.
7 7 */
8   -public class PayofflineResp extends BaseResp{
  8 +public class PaymentResp extends BaseResp{
9 9 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/PayofflineReq.java deleted 100644 → 0
  View file @376680f
1   -package com.diligrp.mobsite.getway.domain.protocol.order;
2   -
3   -import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4   -
5   -import javax.validation.constraints.NotNull;
6   -
7   -/**
8   - * Created by xxxzzz on 2016/9/7.
9   - */
10   -public class PayofflineReq extends BaseReq{
11   -
12   - /**
13   - * 订单id
14   - */
15   - private Long orderId;
16   -
17   - /**
18   - * 汇款人姓名
19   - */
20   - private String remitPersonName;
21   -
22   - /**
23   - * 收款金额
24   - */
25   - private Long receiptAmount;
26   -
27   - /**
28   - * 汇款人账号或地址
29   - */
30   - private String remitPersonInfo;
31   -
32   - /**
33   - * 汇款凭证url
34   - */
35   - @NotNull(message = "汇款凭证不能为空")
36   - private String remitUrl;
37   -
38   - public Long getOrderId() {
39   - return orderId;
40   - }
41   -
42   - public void setOrderId(Long orderId) {
43   - this.orderId = orderId;
44   - }
45   -
46   - public String getRemitPersonName() {
47   - return remitPersonName;
48   - }
49   -
50   - public void setRemitPersonName(String remitPersonName) {
51   - this.remitPersonName = remitPersonName;
52   - }
53   -
54   - public Long getReceiptAmount() {
55   - return receiptAmount;
56   - }
57   -
58   - public void setReceiptAmount(Long receiptAmount) {
59   - this.receiptAmount = receiptAmount;
60   - }
61   -
62   - public String getRemitPersonInfo() {
63   - return remitPersonInfo;
64   - }
65   -
66   - public void setRemitPersonInfo(String remitPersonInfo) {
67   - this.remitPersonInfo = remitPersonInfo;
68   - }
69   -
70   - public String getRemitUrl() {
71   - return remitUrl;
72   - }
73   -
74   - public void setRemitUrl(String remitUrl) {
75   - this.remitUrl = remitUrl;
76   - }
77   -}
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/SubmitOrderReq.java
  View file @63e8b05
... ... @@ -3,6 +3,7 @@ package com.diligrp.mobsite.getway.domain.protocol.order;
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
4 4 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
5 5 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderShopInfo;
  6 +import io.swagger.annotations.ApiModelProperty;
6 7  
7 8 import javax.validation.Valid;
8 9 import javax.validation.constraints.NotNull;
... ... @@ -23,105 +24,121 @@ public class SubmitOrderReq extends BaseReq {
23 24 * 提货人信息
24 25 */
25 26 @Valid @NotNull(message = "联系人不能为空")
  27 + @ApiModelProperty(value = "收货人信息",required = true)
26 28 private ConsigneeInfo consigneeInfo;
27 29  
28   - ///**
29   - // * 提货人信息
30   - // */
31   - //private DeliveryConsigneeInfo deliveryConsigneeInfo;
32 30  
33 31 /**
34   - * 支付方式:10线上付款,20线下付款,30提货付款
  32 + * 支付方式:10线上付款,20线下付款
35 33 */
36 34 @NotNull(message = "支付方式不能为空")
  35 + @ApiModelProperty(value = "支付方式:10线上付款,20线下付款",required = true)
37 36 private Integer payType;
38 37 /**
39 38 * 送货方式:10:自提,20:送货上门
40 39 */
41 40 @NotNull(message = "送货方式不能为空")
  41 + @ApiModelProperty(value = "送货方式:10自提、20送货上门",required = true)
42 42 private Integer deliveryType;
  43 +
  44 + @ApiModelProperty(value = "送达时间" )
  45 + private String arriveTime;
  46 +
  47 + @ApiModelProperty(value = "提货时间" )
  48 + private String reservationTime;
  49 +
  50 + @ApiModelProperty(value = "市场id" )
  51 + private Long marketId;
  52 +
43 53 /**
44   - * 是否市场内交割:1:市场内交割,2:市场外交割
  54 + * 买家留言
45 55 */
46   - @NotNull(message = "交割方式不能为空")
47   - private Integer marketDeliveryType;
48   -
  56 + @ApiModelProperty(value = "买家留言")
  57 + private String remark;
49 58  
50 59 /**
51   - * 物流及验收备注
  60 + * 邮费
52 61 */
53   - private String logisticsRemarks;
  62 + @ApiModelProperty(value = "邮费")
  63 + private Long postage = 0L;
  64 +
54 65 /**
55 66 * 店铺商品信息
56 67 */
57 68 @Valid @NotNull(message = "商品不能为空")
  69 + @ApiModelProperty(value = "商品列表")
58 70 private List<OrderShopInfo> orderShopInfos;
59 71  
60 72  
61   -
62   - ///**
63   - // * 物流订单信息
64   - // */
65   - //private SaveLogisticsOrderReq logisticsOrderReq;
66   -
67   -
68   - //public DeliveryConsigneeInfo getDeliveryConsigneeInfo() {
69   - // return deliveryConsigneeInfo;
70   - //}
71   - //
72   - //public void setDeliveryConsigneeInfo(DeliveryConsigneeInfo deliveryConsigneeInfo) {
73   - // this.deliveryConsigneeInfo = deliveryConsigneeInfo;
74   - //}
75   -
76   - public Integer getMarketDeliveryType() {
77   - return marketDeliveryType;
78   - }
79   -
80   - public void setMarketDeliveryType(Integer marketDeliveryType) {
81   - this.marketDeliveryType = marketDeliveryType;
82   - }
83   -
84 73 public ConsigneeInfo getConsigneeInfo() {
85 74 return consigneeInfo;
86 75 }
87   -
  76 +
88 77 public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
89 78 this.consigneeInfo = consigneeInfo;
90 79 }
91   -
  80 +
92 81 public Integer getPayType() {
93 82 return payType;
94 83 }
95   -
  84 +
96 85 public void setPayType(Integer payType) {
97 86 this.payType = payType;
98 87 }
99   -
  88 +
100 89 public Integer getDeliveryType() {
101 90 return deliveryType;
102 91 }
103   -
  92 +
104 93 public void setDeliveryType(Integer deliveryType) {
105 94 this.deliveryType = deliveryType;
106 95 }
107   -
108   - public List<OrderShopInfo> getOrderShopInfos() {
109   - return orderShopInfos;
  96 +
  97 + public String getArriveTime() {
  98 + return arriveTime;
110 99 }
111 100  
112   -
113   - public void setOrderShopInfos(List<OrderShopInfo> orderShopInfos) {
114   - this.orderShopInfos = orderShopInfos;
  101 + public void setArriveTime(String arriveTime) {
  102 + this.arriveTime = arriveTime;
115 103 }
116 104  
117   - public String getLogisticsRemarks() {
118   - return logisticsRemarks;
119   - }
  105 + public String getReservationTime() {
  106 + return reservationTime;
  107 + }
120 108  
121   - public void setLogisticsRemarks(String logisticsRemarks) {
122   - this.logisticsRemarks = logisticsRemarks;
123   - }
  109 + public void setReservationTime(String reservationTime) {
  110 + this.reservationTime = reservationTime;
  111 + }
  112 +
  113 + public Long getMarketId() {
  114 + return marketId;
  115 + }
124 116  
  117 + public void setMarketId(Long marketId) {
  118 + this.marketId = marketId;
  119 + }
125 120  
  121 + public String getRemark() {
  122 + return remark;
  123 + }
126 124  
  125 + public void setRemark(String remark) {
  126 + this.remark = remark;
  127 + }
  128 +
  129 + public Long getPostage() {
  130 + return postage;
  131 + }
  132 +
  133 + public void setPostage(Long postage) {
  134 + this.postage = postage;
  135 + }
  136 +
  137 + public List<OrderShopInfo> getOrderShopInfos() {
  138 + return orderShopInfos;
  139 + }
  140 +
  141 + public void setOrderShopInfos(List<OrderShopInfo> orderShopInfos) {
  142 + this.orderShopInfos = orderShopInfos;
  143 + }
127 144 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/SubmitOrderResp.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4   -import com.diligrp.mobsite.getway.domain.protocol.common.LogResp;
5 4 import com.diligrp.mobsite.getway.domain.protocol.order.model.OrderSumInfo;
  5 +import io.swagger.annotations.ApiModelProperty;
6 6  
7 7 import java.util.List;
8 8  
... ... @@ -21,39 +21,23 @@ public class SubmitOrderResp extends BaseResp {
21 21 /**
22 22 * 订单号
23 23 */
  24 + @ApiModelProperty(value = "订单信息")
24 25 private List<OrderSumInfo> orderInfos;
25 26  
26   - ///**
27   - //* 物流订单返回结果
28   - //* */
29   - //private SaveLogisticsOrderResp logisticsOrderResp;
30   - /**
31   - * 物流订单提交成功与否
32   - * */
33   - // private Boolean logisticsOrderSuccess = false;
34   -
35 27 /**
36 28 * 提交成功描述
37 29 */
  30 + @ApiModelProperty(value = "提交结果描述")
38 31 private String description;
39 32 /**
40 33 * 总金额
41 34 */
  35 + @ApiModelProperty(value = "总金额")
42 36 private Long totalPrice;
43 37  
44 38  
45   - /**
46   - * 记录日志对象
47   - */
48   - private LogResp logResp;
49 39  
50   - //public Boolean getLogisticsOrderSuccess() {
51   - // return logisticsOrderSuccess;
52   - //}
53 40  
54   - //public void setLogisticsOrderSuccess(Boolean logisticsOrderSuccess) {
55   - // this.logisticsOrderSuccess = logisticsOrderSuccess;
56   - //}
57 41  
58 42 public List<OrderSumInfo> getOrderInfos() {
59 43 return orderInfos;
... ... @@ -88,11 +72,4 @@ public class SubmitOrderResp extends BaseResp {
88 72  
89 73  
90 74  
91   - public LogResp getLogResp() {
92   - return logResp;
93   - }
94   -
95   - public void setLogResp(LogResp logResp) {
96   - this.logResp = logResp;
97   - }
98 75 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/OrderDetail.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order.model;
2 2  
  3 +import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
3 4 import com.diligrp.mobsite.getway.domain.protocol.Order;
  5 +import io.swagger.annotations.ApiModelProperty;
4 6  
5 7 /**
6 8 * <B>订单详情</B> <br />
... ... @@ -11,10 +13,21 @@ import com.diligrp.mobsite.getway.domain.protocol.Order;
11 13 * @author zhangshirui
12 14 */
13 15 public class OrderDetail extends Order{
14   -
15 16  
16 17  
17 18  
  19 + /**
  20 + * 提货人信息
  21 + */
  22 + @ApiModelProperty(value = "收货人信息")
  23 + private ConsigneeInfo consigneeInfo;
18 24  
19 25  
  26 + public ConsigneeInfo getConsigneeInfo() {
  27 + return consigneeInfo;
  28 + }
  29 +
  30 + public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
  31 + this.consigneeInfo = consigneeInfo;
  32 + }
20 33 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/OrderShopInfo.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order.model;
2 2  
3   -import java.util.List;
4   -
5 3 import com.diligrp.mobsite.getway.domain.protocol.OrderItem;
6   -import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.io.Serializable;
  7 +import java.util.List;
7 8  
8 9 /**
9 10 * <B>Description</B> 进货单商品 <br />
... ... @@ -14,80 +15,21 @@ import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
14 15 * @author zhangshirui
15 16 * @createTime 2014/9/25 11:15
16 17 */
17   -public class OrderShopInfo extends ShopInfo{
18   -
19   - /**
20   - * 提货时间类型
21   - * 0-6
22   - */
23   - public static final int PICKUP_TIME_1 =1;
24   - /**
25   - * 6-12
26   - */
27   - public static final int PICKUP_TIME_2 =2;
28   - /**
29   - * 12-18
30   - */
31   - public static final int PICKUP_TIME_3 =3;
32   - /**
33   - * 18-24
34   - */
35   - public static final int PICKUP_TIME_4 =4;
36   -
37   -
38   - /**
39   - * 提货日期格式：03-05
40   - */
41   - private String pickupDate;
42   - /**
43   - * 提货时间类型 1:0-6,2:6-12,3:12-18,4:18-24
44   - */
45   - private Integer pickupTimeType;
46   - /**
47   - * 邮费
48   - */
49   - private Long postage = 0L;
50   - /**
51   - * 买家备注
52   - */
53   - private String remark;
  18 +public class OrderShopInfo implements Serializable{
  19 +
54 20 /**
55 21 * 商品项信息
56 22 */
  23 +
  24 + @ApiModelProperty(value = "商品项列表")
57 25 private List<OrderItem> orderItems;
58   -
59   - public List<OrderItem> getOrderItems() {
60   - return orderItems;
61   - }
62   - public void setOrderItems(List<OrderItem> orderItems) {
63   - this.orderItems = orderItems;
64   - }
65   - public String getPickupDate() {
66   - return pickupDate;
67   - }
68   - public void setPickupDate(String pickupDate) {
69   - this.pickupDate = pickupDate;
70   - }
71   - public Integer getPickupTimeType() {
72   - return pickupTimeType;
73   - }
74   - public void setPickupTimeType(Integer pickupTimeType) {
75   - this.pickupTimeType = pickupTimeType;
76   - }
77   -
78   - public Long getPostage() {
79   - return postage;
80   - }
81   -
82   - public void setPostage(Long postage) {
83   - this.postage = postage;
84   - }
85   -
86   - public String getRemark() {
87   - return remark;
  26 +
  27 +
  28 + public List<OrderItem> getOrderItems() {
  29 + return orderItems;
88 30 }
89   -
90   - public void setRemark(String remark) {
91   - this.remark = remark;
  31 +
  32 + public void setOrderItems(List<OrderItem> orderItems) {
  33 + this.orderItems = orderItems;
92 34 }
93 35 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/order/model/OrderSumInfo.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.order.model;
2 2  
3 3  
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
4 6 import java.io.Serializable;
5 7  
6 8 /**
... ... @@ -16,39 +18,8 @@ public class OrderSumInfo implements Serializable{
16 18 /**
17 19 * id,订单编号
18 20 */
  21 + @ApiModelProperty(value = "订单号")
19 22 private Long orderId;
20   - /**
21   - * 支付编码
22   - */
23   - private String payNo;
24   - /**
25   - * 应付金额
26   - */
27   - private Long realPayAmount;
28   - /**
29   - * 市场运费
30   - */
31   - private Long marketPostage;
32   - /**
33   - * 市场运费支付编码
34   - */
35   - private String marketTradeNo;
36   -
37   - public Long getMarketPostage() {
38   - return marketPostage;
39   - }
40   -
41   - public void setMarketPostage(Long marketPostage) {
42   - this.marketPostage = marketPostage;
43   - }
44   -
45   - public String getMarketTradeNo() {
46   - return marketTradeNo;
47   - }
48   -
49   - public void setMarketTradeNo(String marketTradeNo) {
50   - this.marketTradeNo = marketTradeNo;
51   - }
52 23  
53 24 public Long getOrderId() {
54 25 return orderId;
... ... @@ -57,20 +28,4 @@ public class OrderSumInfo implements Serializable{
57 28 public void setOrderId(Long orderId) {
58 29 this.orderId = orderId;
59 30 }
60   -
61   - public String getPayNo() {
62   - return payNo;
63   - }
64   -
65   - public void setPayNo(String payNo) {
66   - this.payNo = payNo;
67   - }
68   -
69   - public Long getRealPayAmount() {
70   - return realPayAmount;
71   - }
72   -
73   - public void setRealPayAmount(Long realPayAmount) {
74   - this.realPayAmount = realPayAmount;
75   - }
76 31 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddGoodsReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/28.
  8 + */
  9 +public class AddGoodsReq extends BaseReq {
  10 +
  11 +
  12 + private GoodsSuper goods;
  13 +
  14 + public GoodsSuper getGoods() {
  15 + return goods;
  16 + }
  17 +
  18 + public void setGoods(GoodsSuper goods) {
  19 + this.goods = goods;
  20 + }
  21 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddGoodsResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class AddGoodsResp extends BaseResp {
  9 +
  10 +
  11 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddProductCategoryReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/28.
  8 + */
  9 +public class AddProductCategoryReq extends BaseReq {
  10 +
  11 +
  12 +
  13 + private Category category;
  14 +
  15 + public Category getCategory() {
  16 + return category;
  17 + }
  18 +
  19 + public void setCategory(Category category) {
  20 + this.category = category;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/AddProductCategoryResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class AddProductCategoryResp extends BaseResp {
  9 +
  10 +
  11 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/GetGoodsReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/29.
  7 + */
  8 +public class GetGoodsReq extends BaseReq {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/GetGoodsResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/29.
  8 + */
  9 +public class GetGoodsResp extends BaseResp {
  10 +
  11 + private GoodsSuper goods;
  12 +
  13 + public GoodsSuper getGoods() {
  14 + return goods;
  15 + }
  16 +
  17 + public void setGoods(GoodsSuper goods) {
  18 + this.goods = goods;
  19 + }
  20 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/HandleGoodsReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * Created by xxxzzz on 2016/12/29.
  10 + */
  11 +public class HandleGoodsReq extends BaseReq {
  12 +
  13 +
  14 + @ApiModelProperty(value = "商品id",required = true)
  15 + private List<Long> ids;
  16 +
  17 + @ApiModelProperty("操作：1上架 2 下架 3设置促销 4设置首页推荐 5删除")
  18 + private Integer operate;
  19 +
  20 +
  21 + public List<Long> getIds() {
  22 + return ids;
  23 + }
  24 +
  25 + public void setIds(List<Long> ids) {
  26 + this.ids = ids;
  27 + }
  28 +
  29 + public Integer getOperate() {
  30 + return operate;
  31 + }
  32 +
  33 + public void setOperate(Integer operate) {
  34 + this.operate = operate;
  35 + }
  36 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/HandleGoodsResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/29.
  7 + */
  8 +public class HandleGoodsResp extends BaseResp {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/SearchProductCategoryReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/28.
  8 + */
  9 +public class SearchProductCategoryReq extends BaseReq {
  10 +
  11 + @ApiModelProperty(value = "搜索关键字")
  12 + private String keyword;
  13 +
  14 +
  15 + public String getKeyword() {
  16 + return keyword;
  17 + }
  18 +
  19 + public void setKeyword(String keyword) {
  20 + this.keyword = keyword;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/SearchProductCategoryResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * Created by xxxzzz on 2016/12/28.
  10 + */
  11 +public class SearchProductCategoryResp extends BaseResp {
  12 +
  13 +
  14 + private List<Category> categories;
  15 +
  16 +
  17 + public List<Category> getCategories() {
  18 + return categories;
  19 + }
  20 +
  21 + public void setCategories(List<Category> categories) {
  22 + this.categories = categories;
  23 + }
  24 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateGoodsReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/28.
  8 + */
  9 +public class UpdateGoodsReq extends BaseReq {
  10 +
  11 +
  12 + private GoodsSuper goods;
  13 +
  14 + public GoodsSuper getGoods() {
  15 + return goods;
  16 + }
  17 +
  18 + public void setGoods(GoodsSuper goods) {
  19 + this.goods = goods;
  20 + }
  21 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateGoodsResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class UpdateGoodsResp extends BaseResp {
  9 +
  10 +
  11 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateProductCategoryReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/28.
  8 + */
  9 +public class UpdateProductCategoryReq extends BaseReq {
  10 +
  11 +
  12 +
  13 + private Category category;
  14 +
  15 + public Category getCategory() {
  16 + return category;
  17 + }
  18 +
  19 + public void setCategory(Category category) {
  20 + this.category = category;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/product/UpdateProductCategoryResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class UpdateProductCategoryResp extends BaseResp {
  9 +
  10 +
  11 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/ConfirmReceiptMoneyReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6 public class ConfirmReceiptMoneyReq extends BaseReq {
6 7  
7 8 /**
8 9 *订单id
9 10 * */
  11 + @ApiModelProperty(value = "订单id",required = true)
10 12 private Long orderId;
11 13  
12 14 public Long getOrderId() {
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/GetOrderDetailReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6 public class GetOrderDetailReq extends BaseReq {
6 7  
7 8 /**
8 9 *订单id
9 10 * */
  11 + @ApiModelProperty(value = "订单id",required = true)
10 12 private Long orderId;
11 13  
12 14 public Long getOrderId() {
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/GetOrderListReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3   -import java.util.List;
4   -
5 3 import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
6 7  
7 8 public class GetOrderListReq extends BaseListReq {
8 9  
9   - /**
10   - * 订单状态:(-1全部，10待付款，20待备货，30备货中，40待提货，50已提货,60已过期,70已取消,80已申请退款，90已退款，100
11   - * 提货超时)
12   - * */
13   - private List<Integer> orderStatus;
14 10  
15 11 /**
16   - * 支付方式 10-在线支付,20-线下支付,30-提货付款,40-赊账付款
17   - * */
18   - private List<Integer> payTypeList;
19   - /**
20   - * 买家姓名
21   - * */
22   - private String buyerName;
23   - /**
24   - * 买家电话
25   - * */
26   - private String buyerMobilePhone;
  12 + * 订单状态
  13 + */
  14 + @ApiModelProperty(value = "订单状态:(10待接单，15已接单待付款，20待自提，25待送货，30接单已过期,35支付超时,40已拒绝,45已取消，50已完成) ")
  15 + private Integer orderState;
27 16 /**
28   - * 搜索参数
  17 + * 支付类型
29 18 */
30   - private String searchKey;
  19 + @ApiModelProperty(value = "支付方式：10-在线支付,20-线下支付")
  20 + private List<Integer> payType;
31 21  
32   - public List<Integer> getOrderStatus() {
33   - return orderStatus;
  22 + public Integer getOrderState() {
  23 + return orderState;
34 24 }
35 25  
36   - public void setOrderStatus(List<Integer> orderStatus) {
37   - this.orderStatus = orderStatus;
  26 + public void setOrderState(Integer orderState) {
  27 + this.orderState = orderState;
38 28 }
39 29  
40   - public List<Integer> getPayTypeList() {
41   - return payTypeList;
  30 + public List<Integer> getPayType() {
  31 + return payType;
42 32 }
43 33  
44   - public void setPayTypeList(List<Integer> payTypeList) {
45   - this.payTypeList = payTypeList;
  34 + public void setPayType(List<Integer> payType) {
  35 + this.payType = payType;
46 36 }
47   -
48   - public String getBuyerName() {
49   - return buyerName;
50   - }
51   -
52   - public void setBuyerName(String buyerName) {
53   - this.buyerName = buyerName;
54   - }
55   -
56   - public String getBuyerMobilePhone() {
57   - return buyerMobilePhone;
58   - }
59   -
60   - public void setBuyerMobilePhone(String buyerMobilePhone) {
61   - this.buyerMobilePhone = buyerMobilePhone;
62   - }
63   -
64   - public String getSearchKey() {
65   - return searchKey;
66   - }
67   -
68   - public void setSearchKey(String searchKey) {
69   - this.searchKey = searchKey;
70   - }
71   -
72 37 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/GetOrderListResp.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.base.BaseListResp;
4   -import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
5   -import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
6   -import com.diligrp.mobsite.getway.domain.protocol.saler.order.model.SellerOrder;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Order;
7 5  
8 6 import java.util.List;
9 7  
... ... @@ -12,13 +10,13 @@ public class GetOrderListResp extends BaseListResp {
12 10 /**
13 11 *order list
14 12 * */
15   - private List<SellerOrder> orders;
  13 + private List<Order> orders;
16 14  
17   - public List<SellerOrder> getOrders() {
  15 + public List<Order> getOrders() {
18 16 return orders;
19 17 }
20 18  
21   - public void setOrders(List<SellerOrder> orders) {
  19 + public void setOrders(List<Order> orders) {
22 20 this.orders = orders;
23 21 }
24 22 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/RefuseQuoteReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6 public class RefuseQuoteReq extends BaseReq {
6 7  
7 8 /**
8 9 *订单id
9 10 * */
  11 + @ApiModelProperty(value = "订单id",required = true)
10 12 private Long orderId;
11 13  
12 14 /**
13 15 * 拒绝原因
14 16 */
15   - private String refuseReason;
  17 + @ApiModelProperty(value = "拒绝原因",required = true)
  18 + private String refuseReason;
16 19  
17 20 public Long getOrderId() {
18 21 return orderId;
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/SearchOrderListReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.saler.order;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +public class SearchOrderListReq extends BaseListReq {
  7 +
  8 +
  9 + /**
  10 + * 订单状态
  11 + */
  12 + @ApiModelProperty(value = "搜索关键字：订单号等 ")
  13 + private Integer keyword;
  14 +
  15 +
  16 + public Integer getKeyword() {
  17 + return keyword;
  18 + }
  19 +
  20 + public void setKeyword(Integer keyword) {
  21 + this.keyword = keyword;
  22 + }
  23 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/SearchOrderListResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.saler.order;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Order;
  5 +
  6 +import java.util.List;
  7 +
  8 +public class SearchOrderListResp extends BaseListResp {
  9 +
  10 + /**
  11 + *order list
  12 + * */
  13 + private List<Order> orders;
  14 +
  15 + public List<Order> getOrders() {
  16 + return orders;
  17 + }
  18 +
  19 + public void setOrders(List<Order> orders) {
  20 + this.orders = orders;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/model/BuyerInfo.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/model/SellerInfo.java
  View file @63e8b05
... ... @@ -5,56 +5,26 @@ import java.io.Serializable;
5 5 /**
6 6 * Created by david on 2015/4/23.
7 7 */
8   -public class BuyerInfo implements Serializable {
  8 +public class SellerInfo implements Serializable {
9 9 /**
10 10 * 买家id
11 11 * */
12   - private Long buyerId;
  12 + private Long sellerId;
13 13  
14 14 /**
15 15 * 买家名称
16 16 * */
17   - private String buyerName;
  17 + private String sellerName;
18 18  
19 19 /**
20 20 * 买家真实姓名
21 21 * */
22   - private String buyerRealName;
  22 + private String sellerRealName;
23 23  
24 24 /**
25 25 * 买家电话
26 26 * */
27   - private String buyerPhone;
  27 + private String sellerPhone;
28 28  
29   - public String getBuyerRealName() {
30   - return buyerRealName;
31   - }
32 29  
33   - public void setBuyerRealName(String buyerRealName) {
34   - this.buyerRealName = buyerRealName;
35   - }
36   -
37   - public Long getBuyerId() {
38   - return buyerId;
39   - }
40   -
41   - public void setBuyerId(Long buyerId) {
42   - this.buyerId = buyerId;
43   - }
44   -
45   - public String getBuyerName() {
46   - return buyerName;
47   - }
48   -
49   - public void setBuyerName(String buyerName) {
50   - this.buyerName = buyerName;
51   - }
52   -
53   - public String getBuyerPhone() {
54   - return buyerPhone;
55   - }
56   -
57   - public void setBuyerPhone(String buyerPhone) {
58   - this.buyerPhone = buyerPhone;
59   - }
60 30 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/model/SellerOrder.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order.model;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.ConsigneeInfo;
4   -import com.diligrp.mobsite.getway.domain.protocol.OrderProduct;
5   -import com.diligrp.mobsite.getway.domain.protocol.order.model.*;
6   -
7   -import java.util.List;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Order;
  5 +import io.swagger.annotations.ApiModelProperty;
8 6  
9 7 /**
10 8 * Created by david on 2015/4/16.
11 9 */
12   -public class SellerOrder extends OrderSumInfo {
13   - /**
14   - * 订单状态:(10待付款，20待备货，30备货中，40待提货，50已提货,60已过期,70已取消,80已申请退款，90已退款，100提货超时)
15   - */
16   - private Integer orderState;
  10 +public class SellerOrder extends Order {
17 11  
18   - /**
19   - * 订单状态名称
20   - */
21   - private String stateName;
22 12  
23 13 /**
24   - * 支付方式
25   - */
26   - private Integer payType;
27   - /**
28   - * 总金额
29   - */
30   - private Long totalAmount;
31   - /**
32   - * 应付金额
33   - */
34   - private Long realPayAmount;
35   - /**
36   - * 商品总金额
37   - */
38   - private Long productsTotalPrice;
39   - /**
40   - * 邮费
41   - */
42   - private Long postage;
43   - /**
44   - * 提交日期
45   - */
46   - private String submitDate;
47   - /**
48   - * 订单详情页最上面
49   - */
50   - private String orderDescription;
51   - /**
52   - * 卖家id
53   - */
54   - private Long sellerId;
55   - /**
56   - * 店铺id
57   - */
58   - private Long shopId;
59   - /**
60   - * 店铺名称
61   - */
62   - private String shopName;
63   - /**
64   - * 店铺联系电话
65   - */
66   - private String contactMobile;
67   - /**
68   - * 订单商品列表
69   - */
70   - private List<OrderProduct> orderProducts;
71   - /**
72   - * 提货留言
73   - */
74   - private String pickUserMsg;
75   - /**
76 14 * 提货人信息
77 15 */
  16 + @ApiModelProperty(value = "收货人信息")
78 17 private ConsigneeInfo consigneeInfo;
79   - /**
80   - * 买家信息
81   - */
82   - private BuyerInfo buyerInfo;
83   -
84   - /**
85   - * 取货验证码
86   - */
87   - private String pickUpVerifyCode;
88   -
89   - /**
90   - * 提货时间
91   - */
92   - private String pickDate;
93   - /**
94   - * 提货地点
95   - */
96   - private String pickAddress;
97   - /**
98   - * 市场信息
99   - */
100   - private MarketInfo marketInfo;
101   - /**
102   - * 交易识别码
103   - */
104   - private String tradeCode;
105   - /**
106   - * 申请退款id
107   - */
108   - private Long refundId;
109   -
110   - /**
111   - * 提货方式id
112   - */
113   - private Integer deliveryType;
114   - /**
115   - * 提货方式名称
116   - */
117   - private String deliveryName;
118   - /**
119   - * 剩余提货时间
120   - */
121   - private Integer remainPickTime;
122   -
123   - /**
124   - * 提货开始时间
125   - */
126   - private String reservationStime;
127   -
128   - /**
129   - * 提货结束时间
130   - */
131   - private String reservationFtime;
132   -
133   - /**
134   - * 退款单号
135   - */
136   - private Long reOrderId;
137   -
138   - /**
139   - * 退款金额
140   - */
141   - private Long refundPrice;
142   -
143   - /**
144   - * 物流备注
145   - */
146   - private String logisticsRemarks;
147   -
148   - /**
149   - * 订单日志
150   - */
151   - private List<OrderLog> orderLogs;
152   -
153   - /**
154   - * 物流信息
155   - */
156   - private LogisticsInfo logisticsInfo;
157   -
158   - /**
159   - * 代购信息
160   - */
161   - private PurchaseInfo purchaseInfo;
162   -
163   - public String getPickUpVerifyCode() {
164   - return pickUpVerifyCode;
165   - }
166   -
167   - public void setPickUpVerifyCode(String pickUpVerifyCode) {
168   - this.pickUpVerifyCode = pickUpVerifyCode;
169   - }
170   -
171   - public BuyerInfo getBuyerInfo() {
172   - return buyerInfo;
173   - }
174   -
175   - public void setBuyerInfo(BuyerInfo buyerInfo) {
176   - this.buyerInfo = buyerInfo;
177   - }
178   -
179   - public Integer getOrderState() {
180   - return orderState;
181   - }
182   -
183   - public void setOrderState(Integer orderState) {
184   - this.orderState = orderState;
185   - }
186   -
187   - public String getStateName() {
188   - return stateName;
189   - }
190   -
191   - public void setStateName(String stateName) {
192   - this.stateName = stateName;
193   - }
194   -
195   - public Integer getPayType() {
196   - return payType;
197   - }
198   -
199   - public void setPayType(Integer payType) {
200   - this.payType = payType;
201   - }
202   -
203   - public Long getTotalAmount() {
204   - return totalAmount;
205   - }
206   -
207   - public void setTotalAmount(Long totalAmount) {
208   - this.totalAmount = totalAmount;
209   - }
210   -
211   - public Long getRealPayAmount() {
212   - return realPayAmount;
213   - }
214   -
215   - public void setRealPayAmount(Long realPayAmount) {
216   - this.realPayAmount = realPayAmount;
217   - }
218   -
219   - public Long getProductsTotalPrice() {
220   - return productsTotalPrice;
221   - }
222   -
223   - public void setProductsTotalPrice(Long productsTotalPrice) {
224   - this.productsTotalPrice = productsTotalPrice;
225   - }
226   -
227   - public Long getPostage() {
228   - return postage;
229   - }
230   -
231   - public void setPostage(Long postage) {
232   - this.postage = postage;
233   - }
234   -
235   - public String getSubmitDate() {
236   - return submitDate;
237   - }
238   -
239   - public void setSubmitDate(String submitDate) {
240   - this.submitDate = submitDate;
241   - }
242   -
243   - public String getOrderDescription() {
244   - return orderDescription;
245   - }
246   -
247   - public void setOrderDescription(String orderDescription) {
248   - this.orderDescription = orderDescription;
249   - }
250   -
251   - public Long getSellerId() {
252   - return sellerId;
253   - }
254   -
255   - public void setSellerId(Long sellerId) {
256   - this.sellerId = sellerId;
257   - }
258   -
259   - public Long getShopId() {
260   - return shopId;
261   - }
262   -
263   - public void setShopId(Long shopId) {
264   - this.shopId = shopId;
265   - }
266   -
267   - public String getShopName() {
268   - return shopName;
269   - }
270   -
271   - public void setShopName(String shopName) {
272   - this.shopName = shopName;
273   - }
274   -
275   - public String getContactMobile() {
276   - return contactMobile;
277   - }
278   -
279   - public void setContactMobile(String contactMobile) {
280   - this.contactMobile = contactMobile;
281   - }
282   -
283   - public List<OrderProduct> getOrderProducts() {
284   - return orderProducts;
285   - }
286   -
287   - public void setOrderProducts(List<OrderProduct> orderProducts) {
288   - this.orderProducts = orderProducts;
289   - }
290   -
291   - public String getPickUserMsg() {
292   - return pickUserMsg;
293   - }
294   -
295   - public void setPickUserMsg(String pickUserMsg) {
296   - this.pickUserMsg = pickUserMsg;
297   - }
298 18  
299 19 public ConsigneeInfo getConsigneeInfo() {
300 20 return consigneeInfo;
... ... @@ -303,132 +23,4 @@ public class SellerOrder extends OrderSumInfo {
303 23 public void setConsigneeInfo(ConsigneeInfo consigneeInfo) {
304 24 this.consigneeInfo = consigneeInfo;
305 25 }
306   -
307   - public String getPickDate() {
308   - return pickDate;
309   - }
310   -
311   - public void setPickDate(String pickDate) {
312   - this.pickDate = pickDate;
313   - }
314   -
315   - public String getPickAddress() {
316   - return pickAddress;
317   - }
318   -
319   - public void setPickAddress(String pickAddress) {
320   - this.pickAddress = pickAddress;
321   - }
322   -
323   - public MarketInfo getMarketInfo() {
324   - return marketInfo;
325   - }
326   -
327   - public void setMarketInfo(MarketInfo marketInfo) {
328   - this.marketInfo = marketInfo;
329   - }
330   -
331   - public String getTradeCode() {
332   - return tradeCode;
333   - }
334   -
335   - public void setTradeCode(String tradeCode) {
336   - this.tradeCode = tradeCode;
337   - }
338   -
339   - public Long getRefundId() {
340   - return refundId;
341   - }
342   -
343   - public void setRefundId(Long refundId) {
344   - this.refundId = refundId;
345   - }
346   -
347   - public Integer getDeliveryType() {
348   - return deliveryType;
349   - }
350   -
351   - public void setDeliveryType(Integer deliveryType) {
352   - this.deliveryType = deliveryType;
353   - }
354   -
355   - public String getDeliveryName() {
356   - return deliveryName;
357   - }
358   -
359   - public void setDeliveryName(String deliveryName) {
360   - this.deliveryName = deliveryName;
361   - }
362   -
363   - public Integer getRemainPickTime() {
364   - return remainPickTime;
365   - }
366   -
367   - public void setRemainPickTime(Integer remainPickTime) {
368   - this.remainPickTime = remainPickTime;
369   - }
370   -
371   - public String getReservationStime() {
372   - return reservationStime;
373   - }
374   -
375   - public void setReservationStime(String reservationStime) {
376   - this.reservationStime = reservationStime;
377   - }
378   -
379   - public String getReservationFtime() {
380   - return reservationFtime;
381   - }
382   -
383   - public void setReservationFtime(String reservationFtime) {
384   - this.reservationFtime = reservationFtime;
385   - }
386   -
387   - public Long getReOrderId() {
388   - return reOrderId;
389   - }
390   -
391   - public void setReOrderId(Long reOrderId) {
392   - this.reOrderId = reOrderId;
393   - }
394   -
395   - public Long getRefundPrice() {
396   - return refundPrice;
397   - }
398   -
399   - public void setRefundPrice(Long refundPrice) {
400   - this.refundPrice = refundPrice;
401   - }
402   -
403   - public String getLogisticsRemarks() {
404   - return logisticsRemarks;
405   - }
406   -
407   - public void setLogisticsRemarks(String logisticsRemarks) {
408   - this.logisticsRemarks = logisticsRemarks;
409   - }
410   -
411   - public List<OrderLog> getOrderLogs() {
412   - return orderLogs;
413   - }
414   -
415   - public void setOrderLogs(List<OrderLog> orderLogs) {
416   - this.orderLogs = orderLogs;
417   - }
418   -
419   - public LogisticsInfo getLogisticsInfo() {
420   - return logisticsInfo;
421   - }
422   -
423   - public void setLogisticsInfo(LogisticsInfo logisticsInfo) {
424   - this.logisticsInfo = logisticsInfo;
425   - }
426   -
427   - public PurchaseInfo getPurchaseInfo() {
428   - return purchaseInfo;
429   - }
430   -
431   - public void setPurchaseInfo(PurchaseInfo purchaseInfo) {
432   - this.purchaseInfo = purchaseInfo;
433   - }
434 26 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/ModifyOrderPriceReq.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/saler/order/takeOrderReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.saler.order;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5   -public class ModifyOrderPriceReq extends BaseReq {
  6 +public class takeOrderReq extends BaseReq {
6 7 /***
7 8 * 订单id
8 9 * */
  10 + @ApiModelProperty(value = "订单id",required = true)
9 11 private Long orderId;
10 12  
11 13 /***
12 14 * 新的订单金额
13 15 */
  16 + @ApiModelProperty(value = "修改后的订单金额",required = true)
14 17 private Long pricePrivilege;
15 18  
16   - /**
17   - * 新运费(newPricePostage)不能为空,无运费请填写0
18   - * */
19   - private Long newPricePostage;
20 19  
21 20 public Long getOrderId() {
22 21 return orderId;
... ... @@ -33,12 +32,4 @@ public class ModifyOrderPriceReq extends BaseReq {
33 32 public void setPricePrivilege(Long pricePrivilege) {
34 33 this.pricePrivilege = pricePrivilege;
35 34 }
36   -
37   - public Long getNewPricePostage() {
38   - return newPricePostage;
39   - }
40   -
41   - public void setNewPricePostage(Long newPricePostage) {
42   - this.newPricePostage = newPricePostage;
43   - }
44 35 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddShopDeliveryTimeReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * Created by xxxzzz on 2016/12/28.
  10 + */
  11 +public class AddShopDeliveryTimeReq extends BaseReq {
  12 +
  13 + @ApiModelProperty(value = "时间段",required = true)
  14 + private List<DeliveryTimeInfo> deliveryTimeInfos;
  15 +
  16 +
  17 + public List<DeliveryTimeInfo> getDeliveryTimeInfos() {
  18 + return deliveryTimeInfos;
  19 + }
  20 +
  21 + public void setDeliveryTimeInfos(List<DeliveryTimeInfo> deliveryTimeInfos) {
  22 + this.deliveryTimeInfos = deliveryTimeInfos;
  23 + }
  24 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/AddShopDeliveryTimeResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class AddShopDeliveryTimeResp extends BaseResp {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CreateOrUpdateShopReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * <B>Description</B> 路线管理-获取线路信息 <br />
  11 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  12 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  13 + * <B>Company</B> 地利集团
  14 + * @author wujiaqiang
  15 + */
  16 +public class CreateOrUpdateShopReq extends BaseReq {
  17 +
  18 +
  19 +
  20 + @ApiModelProperty(value = "城市code")
  21 + private Long cityCode;
  22 +
  23 + @ApiModelProperty(value = "城市名称")
  24 + private String cityName;
  25 +
  26 + @ApiModelProperty(value = "店铺名称")
  27 + private String shopName;
  28 +
  29 + @ApiModelProperty(value = "店铺logo")
  30 + private String shopLogo;
  31 +
  32 + @ApiModelProperty(value = "主营类目")
  33 + private List<Category> catagorys;
  34 +
  35 +
  36 +
  37 + @ApiModelProperty(value = "店铺地址")
  38 + private String shopAddr;
  39 +
  40 + @ApiModelProperty(value = "客户电话")
  41 + private String phone;
  42 +
  43 +
  44 + @ApiModelProperty(value = "商品排列方式（1：两列式 2：列表式）")
  45 + private Integer productDisplayWay;
  46 +
  47 + @ApiModelProperty(value = "配送费")
  48 + private Long postage;
  49 +
  50 + @ApiModelProperty(value = "订单免配送费金额")
  51 + private Long freeShippingPrice;
  52 +
  53 + @ApiModelProperty(value = "店铺公告")
  54 + private String shopNotices;
  55 +
  56 + @ApiModelProperty(value = "送货时间段")
  57 + private List<String> deliveryTime;
  58 +
  59 +
  60 +
  61 + public Long getCityCode() {
  62 + return cityCode;
  63 + }
  64 +
  65 + public void setCityCode(Long cityCode) {
  66 + this.cityCode = cityCode;
  67 + }
  68 +
  69 + public String getCityName() {
  70 + return cityName;
  71 + }
  72 +
  73 + public void setCityName(String cityName) {
  74 + this.cityName = cityName;
  75 + }
  76 +
  77 + public String getShopName() {
  78 + return shopName;
  79 + }
  80 +
  81 + public void setShopName(String shopName) {
  82 + this.shopName = shopName;
  83 + }
  84 +
  85 + public String getShopLogo() {
  86 + return shopLogo;
  87 + }
  88 +
  89 + public void setShopLogo(String shopLogo) {
  90 + this.shopLogo = shopLogo;
  91 + }
  92 +
  93 +
  94 + public List<Category> getCatagorys() {
  95 + return catagorys;
  96 + }
  97 +
  98 + public void setCatagorys(List<Category> catagorys) {
  99 + this.catagorys = catagorys;
  100 + }
  101 +
  102 + public Integer getProductDisplayWay() {
  103 + return productDisplayWay;
  104 + }
  105 +
  106 + public void setProductDisplayWay(Integer productDisplayWay) {
  107 + this.productDisplayWay = productDisplayWay;
  108 + }
  109 +
  110 + public Long getPostage() {
  111 + return postage;
  112 + }
  113 +
  114 + public void setPostage(Long postage) {
  115 + this.postage = postage;
  116 + }
  117 +
  118 + public Long getFreeShippingPrice() {
  119 + return freeShippingPrice;
  120 + }
  121 +
  122 + public void setFreeShippingPrice(Long freeShippingPrice) {
  123 + this.freeShippingPrice = freeShippingPrice;
  124 + }
  125 +
  126 + public String getShopNotices() {
  127 + return shopNotices;
  128 + }
  129 +
  130 + public void setShopNotices(String shopNotices) {
  131 + this.shopNotices = shopNotices;
  132 + }
  133 +
  134 + public List<String> getDeliveryTime() {
  135 + return deliveryTime;
  136 + }
  137 +
  138 + public void setDeliveryTime(List<String> deliveryTime) {
  139 + this.deliveryTime = deliveryTime;
  140 + }
  141 +
  142 + public String getShopAddr() {
  143 + return shopAddr;
  144 + }
  145 +
  146 + public void setShopAddr(String shopAddr) {
  147 + this.shopAddr = shopAddr;
  148 + }
  149 +
  150 + public String getPhone() {
  151 + return phone;
  152 + }
  153 +
  154 + public void setPhone(String phone) {
  155 + this.phone = phone;
  156 + }
  157 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/CreateOrUpdateShopResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * <B>Description</B> 路线管理-获取线路信息 <br />
  8 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  9 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  10 + * <B>Company</B> 地利集团
  11 + * @author wujiaqiang
  12 + */
  13 +public class CreateOrUpdateShopResp extends BaseResp {
  14 +
  15 +
  16 + /**
  17 + * 店铺code
  18 + */
  19 + @ApiModelProperty(value = "店铺分享码" )
  20 + private Integer shopAuthCode;
  21 +
  22 + public Integer getShopAuthCode() {
  23 + return shopAuthCode;
  24 + }
  25 +
  26 + public void setShopAuthCode(Integer shopAuthCode) {
  27 + this.shopAuthCode = shopAuthCode;
  28 + }
  29 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DelShopDeliveryTimeReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class DelShopDeliveryTimeReq extends BaseReq {
  9 +
  10 +
  11 + private Long[] ids;
  12 +
  13 + public Long[] getIds() {
  14 + return ids;
  15 + }
  16 +
  17 + public void setIds(Long[] ids) {
  18 + this.ids = ids;
  19 + }
  20 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DelShopDeliveryTimeResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/28.
  7 + */
  8 +public class DelShopDeliveryTimeResp extends BaseResp {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/DeliveryTimeInfo.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +/**
  8 + * Created by xxxzzz on 2016/12/28.
  9 + */
  10 +public class DeliveryTimeInfo implements Serializable {
  11 +
  12 + @ApiModelProperty(value = "时间段id",required = true)
  13 + private Long id;
  14 +
  15 + @ApiModelProperty(value = "开始时间",required = true)
  16 + private String beginTime;
  17 +
  18 + @ApiModelProperty(value = "结束时间",required = true)
  19 + private String endTime;
  20 +
  21 +
  22 + public Long getId() {
  23 + return id;
  24 + }
  25 +
  26 + public void setId(Long id) {
  27 + this.id = id;
  28 + }
  29 +
  30 + public String getBeginTime() {
  31 + return beginTime;
  32 + }
  33 +
  34 + public void setBeginTime(String beginTime) {
  35 + this.beginTime = beginTime;
  36 + }
  37 +
  38 + public String getEndTime() {
  39 + return endTime;
  40 + }
  41 +
  42 + public void setEndTime(String endTime) {
  43 + this.endTime = endTime;
  44 + }
  45 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShopInfoResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.Category;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * Created by xxxzzz on 2016/12/27.
  11 + */
  12 +public class GetShopInfoResp extends BaseResp {
  13 +
  14 + @ApiModelProperty(value = "城市code")
  15 + private Long cityCode;
  16 +
  17 + @ApiModelProperty(value = "城市名称")
  18 + private String cityName;
  19 +
  20 + @ApiModelProperty(value = "店铺名称")
  21 + private String shopName;
  22 +
  23 + @ApiModelProperty(value = "店铺logo")
  24 + private String shopLogo;
  25 +
  26 + @ApiModelProperty(value = "主营类目")
  27 + private List<Category> catagorys;
  28 +
  29 +
  30 +
  31 + @ApiModelProperty(value = "店铺地址")
  32 + private String shopAddr;
  33 +
  34 + @ApiModelProperty(value = "客户电话")
  35 + private String phone;
  36 +
  37 +
  38 + @ApiModelProperty(value = "商品排列方式（1：两列式 2：列表式）")
  39 + private Integer productDisplayWay;
  40 +
  41 + @ApiModelProperty(value = "配送费")
  42 + private Long postage;
  43 +
  44 + @ApiModelProperty(value = "订单免配送费金额")
  45 + private Long freeShippingPrice;
  46 +
  47 + @ApiModelProperty(value = "店铺公告")
  48 + private String shopNotices;
  49 +
  50 + @ApiModelProperty(value = "送货时间段")
  51 + private List<String> deliveryTime;
  52 +
  53 +
  54 +
  55 + public Long getCityCode() {
  56 + return cityCode;
  57 + }
  58 +
  59 + public void setCityCode(Long cityCode) {
  60 + this.cityCode = cityCode;
  61 + }
  62 +
  63 + public String getCityName() {
  64 + return cityName;
  65 + }
  66 +
  67 + public void setCityName(String cityName) {
  68 + this.cityName = cityName;
  69 + }
  70 +
  71 + public String getShopName() {
  72 + return shopName;
  73 + }
  74 +
  75 + public void setShopName(String shopName) {
  76 + this.shopName = shopName;
  77 + }
  78 +
  79 + public String getShopLogo() {
  80 + return shopLogo;
  81 + }
  82 +
  83 + public void setShopLogo(String shopLogo) {
  84 + this.shopLogo = shopLogo;
  85 + }
  86 +
  87 +
  88 + public List<Category> getCatagorys() {
  89 + return catagorys;
  90 + }
  91 +
  92 + public void setCatagorys(List<Category> catagorys) {
  93 + this.catagorys = catagorys;
  94 + }
  95 +
  96 + public Integer getProductDisplayWay() {
  97 + return productDisplayWay;
  98 + }
  99 +
  100 + public void setProductDisplayWay(Integer productDisplayWay) {
  101 + this.productDisplayWay = productDisplayWay;
  102 + }
  103 +
  104 + public Long getPostage() {
  105 + return postage;
  106 + }
  107 +
  108 + public void setPostage(Long postage) {
  109 + this.postage = postage;
  110 + }
  111 +
  112 + public Long getFreeShippingPrice() {
  113 + return freeShippingPrice;
  114 + }
  115 +
  116 + public void setFreeShippingPrice(Long freeShippingPrice) {
  117 + this.freeShippingPrice = freeShippingPrice;
  118 + }
  119 +
  120 + public String getShopNotices() {
  121 + return shopNotices;
  122 + }
  123 +
  124 + public void setShopNotices(String shopNotices) {
  125 + this.shopNotices = shopNotices;
  126 + }
  127 +
  128 + public List<String> getDeliveryTime() {
  129 + return deliveryTime;
  130 + }
  131 +
  132 + public void setDeliveryTime(List<String> deliveryTime) {
  133 + this.deliveryTime = deliveryTime;
  134 + }
  135 +
  136 + public String getShopAddr() {
  137 + return shopAddr;
  138 + }
  139 +
  140 + public void setShopAddr(String shopAddr) {
  141 + this.shopAddr = shopAddr;
  142 + }
  143 +
  144 + public String getPhone() {
  145 + return phone;
  146 + }
  147 +
  148 + public void setPhone(String phone) {
  149 + this.phone = phone;
  150 + }
  151 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/shop/GetShowStyleResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/27.
  7 + */
  8 +public class GetShowStyleResp extends BaseListResp {
  9 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetDepositCardAmountReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/27.
  7 + */
  8 +public class GetDepositCardAmountReq extends BaseReq {
  9 +
  10 +
  11 +
  12 +
  13 +
  14 +
  15 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetDepositCardAmountResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * Created by xxxzzz on 2016/12/27.
  8 + */
  9 +public class GetDepositCardAmountResp extends BaseResp {
  10 +
  11 + @ApiModelProperty(value = "储值卡余额")
  12 + private Long depositCardAmount;
  13 +
  14 +
  15 + public Long getDepositCardAmount() {
  16 + return depositCardAmount;
  17 + }
  18 +
  19 + public void setDepositCardAmount(Long depositCardAmount) {
  20 + this.depositCardAmount = depositCardAmount;
  21 + }
  22 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetUserIntroductionReq.java renamed to mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetUserInfoReq.java
  View file @63e8b05
... ... @@ -12,5 +12,5 @@ import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
12 12 * @createTime 2014/9/1 11:47
13 13 */
14 14 @SuppressWarnings("serial")
15   -public class GetUserIntroductionReq extends BaseReq {
  15 +public class GetUserInfoReq extends BaseReq {
16 16 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetUserInfoResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.user.model.BuyerInfo;
  5 +
  6 +/**
  7 + * <B>Description</B> 用户简介响应对象 <br />
  8 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  9 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  10 + * <B>Company</B> 地利集团
  11 + *
  12 + * @author wujianjun
  13 + * @createTime 2014/9/1 11:48
  14 + */
  15 +@SuppressWarnings("serial")
  16 +public class GetUserInfoResp extends BaseResp {
  17 +
  18 + private BuyerInfo buyerInfo;
  19 +
  20 +
  21 + public BuyerInfo getBuyerInfo() {
  22 + return buyerInfo;
  23 + }
  24 +
  25 + public void setBuyerInfo(BuyerInfo buyerInfo) {
  26 + this.buyerInfo = buyerInfo;
  27 + }
  28 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/GetUserIntroductionResp.java deleted 100644 → 0
  View file @376680f
1   -package com.diligrp.mobsite.getway.domain.protocol.user;
2   -
3   -import com.diligrp.mobsite.getway.domain.common.Constant;
4   -import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
5   -import com.diligrp.mobsite.getway.domain.protocol.shop.model.ShopInfo;
6   -
7   -/**
8   - * <B>Description</B> 用户简介响应对象 <br />
9   - * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
10   - * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
11   - * <B>Company</B> 地利集团
12   - *
13   - * @author wujianjun
14   - * @createTime 2014/9/1 11:48
15   - */
16   -@SuppressWarnings("serial")
17   -public class GetUserIntroductionResp extends BaseResp {
18   -
19   - /**
20   - * 男
21   - */
22   - public static final Integer SEX_MALE = 1;
23   - /**
24   - * 女
25   - */
26   - public static final Integer SEX_FEMALE = 2;
27   - /**
28   - * 未知
29   - */
30   - public static final Integer SEX_UNKNOW = 3;
31   -
32   - /**
33   - * 个人用户
34   - */
35   - public static final Integer USERTYPE_PERSON = 1;
36   - /**
37   - * 企业用户
38   - */
39   - public static final Integer USERTYPE_COMPANY = 2;
40   -
41   - /**
42   - * 用户真实姓名
43   - */
44   - private String realName;
45   - /**
46   - * 用户名，昵称
47   - */
48   - private String userName;
49   - /**
50   - * 用户手机号码
51   - */
52   - private String mobilePhone;
53   - /**
54   - * 认证标识
55   - * 认证标识：未认证:100,认证中:101,已认证:102,认证失败:103
56   - */
57   - private Integer authResult = Constant.USER_AUTH_RESULT_NOTAUTH;
58   - /**
59   - * 认证消息
60   - */
61   - private String authMessage;
62   - /**
63   - * 性别
64   - */
65   - private Integer sex;
66   - /**
67   - * 用户类型 :1-个人用户,2-企业用户
68   - */
69   - private Integer userType;
70   - /**
71   - * 账户状态： 1:正常状态，2:锁定，3：未激活
72   - */
73   - private Integer accountState;
74   - /**
75   - * 个人头像
76   - */
77   - private String headImg;
78   - /**
79   - * 店铺信息
80   - */
81   - private ShopInfo shopInfo;
82   -
83   - public String getRealName() {
84   - return realName;
85   - }
86   -
87   - public void setRealName(String realName) {
88   - this.realName = realName;
89   - }
90   -
91   - public String getMobilePhone() {
92   - return mobilePhone;
93   - }
94   -
95   - public void setMobilePhone(String mobilePhone) {
96   - this.mobilePhone = mobilePhone;
97   - }
98   -
99   - public Integer getSex() {
100   - return sex;
101   - }
102   -
103   - public void setSex(Integer sex) {
104   - this.sex = sex;
105   - }
106   -
107   - public Integer getUserType() {
108   - return userType;
109   - }
110   -
111   - public void setUserType(Integer userType) {
112   - this.userType = userType;
113   - }
114   -
115   - public String getAuthMessage() {
116   - return authMessage;
117   - }
118   -
119   - public void setAuthMessage(String authMessage) {
120   - this.authMessage = authMessage;
121   - }
122   -
123   -
124   - public String getUserName() {
125   - return userName;
126   - }
127   -
128   -
129   - public void setUserName(String userName) {
130   - this.userName = userName;
131   - }
132   -
133   -
134   - public Integer getAuthResult() {
135   - return authResult;
136   - }
137   -
138   -
139   - public void setAuthResult(Integer authResult) {
140   - this.authResult = authResult;
141   - }
142   -
143   - public Integer getAccountState() {
144   - return accountState;
145   - }
146   -
147   - public void setAccountState(Integer accountState) {
148   - this.accountState = accountState;
149   - }
150   -
151   - public ShopInfo getShopInfo() {
152   - return shopInfo;
153   - }
154   -
155   - public void setShopInfo(ShopInfo shopInfo) {
156   - this.shopInfo = shopInfo;
157   - }
158   -
159   -
160   - public String getHeadImg() {
161   - return headImg;
162   - }
163   -
164   -
165   - public void setHeadImg(String headImg) {
166   - this.headImg = headImg;
167   - }
168   -}
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/SearchUserInfoReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +
  6 +/**
  7 + * <B>Description</B> 用户简介 <br />
  8 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  9 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  10 + * <B>Company</B> 地利集团
  11 + *
  12 + * @author wujianjun
  13 + * @createTime 2014/9/1 11:47
  14 + */
  15 +@SuppressWarnings("serial")
  16 +public class SearchUserInfoReq extends BaseListReq {
  17 +
  18 +
  19 + @ApiModelProperty(value = "搜索关键字：昵称或手机号")
  20 + private String keyword;
  21 +
  22 +
  23 + public String getKeyword() {
  24 + return keyword;
  25 + }
  26 +
  27 + public void setKeyword(String keyword) {
  28 + this.keyword = keyword;
  29 + }
  30 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/SearchUserInfoResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.user.model.BuyerInfo;
  5 +
  6 +import java.util.List;
  7 +
  8 +/**
  9 + * <B>Description</B> 用户简介 <br />
  10 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  11 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  12 + * <B>Company</B> 地利集团
  13 + *
  14 + * @author wujianjun
  15 + * @createTime 2014/9/1 11:47
  16 + */
  17 +@SuppressWarnings("serial")
  18 +public class SearchUserInfoResp extends BaseListResp {
  19 +
  20 + private List<BuyerInfo> users;
  21 +
  22 + public List<BuyerInfo> getUsers() {
  23 + return users;
  24 + }
  25 +
  26 + public void setUsers(List<BuyerInfo> users) {
  27 + this.users = users;
  28 + }
  29 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/TradeRecordReq.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListReq;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2016/12/1.
  7 + */
  8 +public class TradeRecordReq extends BaseListReq {
  9 +
  10 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/TradeRecordResp.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.base.BaseListResp;
  4 +import com.diligrp.mobsite.getway.domain.protocol.user.model.TradeRecord;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * Created by xxxzzz on 2016/12/1.
  11 + */
  12 +public class TradeRecordResp extends BaseListResp {
  13 +
  14 +
  15 +
  16 +
  17 + /**
  18 + * 交易记录
  19 + */
  20 + @ApiModelProperty(value = "交易记录")
  21 + private List<TradeRecord> records;
  22 +
  23 +
  24 + public List<TradeRecord> getRecords() {
  25 + return records;
  26 + }
  27 +
  28 + public void setRecords(List<TradeRecord> records) {
  29 + this.records = records;
  30 + }
  31 +
  32 +
  33 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateUserInfoReq.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.domain.protocol.user;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import io.swagger.annotations.ApiModelProperty;
4 5  
5 6  
6 7 /**
... ... @@ -16,131 +17,93 @@ public class UpdateUserInfoReq extends BaseReq {
16 17 /**
17 18 * 新的密码
18 19 */
  20 + @ApiModelProperty(value = "新密码")
19 21 private String password;
20 22 /**
21   - * 旧密码
  23 + * 再次输入密码
22 24 */
23   - @Deprecated // 下个版本删除
  25 + @ApiModelProperty(value = "再次输入新密码")
24 26 private String oldPassword;
25 27 /**
26   - * 用户账号
  28 + * 性别
27 29 */
28   - private String accountName;
  30 + @ApiModelProperty(value = "性别：1男,2女")
  31 + private Integer gender;
29 32 /**
30   - * 真实姓名
  33 + * 昵称
31 34 */
32   - private String realName;
  35 + @ApiModelProperty(value = "昵称")
  36 + private String nickname;
  37 + /**
  38 + * 生日
  39 + */
  40 + @ApiModelProperty(value = "生日")
  41 + private String birth;
33 42 /**
34 43 * 电话号码
35 44 */
  45 + @ApiModelProperty(value = "电话号码")
36 46 private String mobile;
37 47 /**
38 48 * 用户头像
39 49 */
  50 + @ApiModelProperty(value = "头像")
40 51 private String headImg;
41   -
42   -
43   - public String getMobile() {
44   - return mobile;
45   - }
46   -
47   - public void setMobile(String mobile) {
48   - this.mobile = mobile;
49   - }
50   -
51   - /**
52   - * get value of UpdatePasswordReq.password
53   - * @return the password
54   - * @createTime Aug 12, 2014 8:08:33 PM
55   - * @author wujianjun
56   - */
  52 +
  53 +
57 54 public String getPassword() {
58 55 return password;
59 56 }
60   -
61   - /**
62   - * set value of UpdatePasswordReq.password
63   - * @param password the password to set
64   - * @createTime Aug 12, 2014 8:08:33 PM
65   - * @author wujianjun
66   - */
  57 +
67 58 public void setPassword(String password) {
68 59 this.password = password;
69 60 }
70 61  
71   -
72   - /**
73   - * get value of UpdatePasswordReq.accountName
74   - * @return the accountName
75   - * @createTime 2014年8月28日 下午3:05:28
76   - * @author zhangshirui
77   - */
78   - public String getAccountName() {
79   - return accountName;
80   - }
81   -
82   -
83   - /**
84   - * set value of UpdatePasswordReq.accountName
85   - * @param accountName the accountName to set
86   - * @createTime 2014年8月28日 下午3:05:28
87   - * @author zhangshirui
88   - */
89   - public void setAccountName(String accountName) {
90   - this.accountName = accountName;
91   - }
92   -
93   -
94   - /**
95   - * get value of UpdateUserInfoReq.oldPassword
96   - * @return the oldPassword
97   - * @createTime 2015年1月21日 下午7:35:20
98   - * @author zhangshirui
99   - */
100 62 public String getOldPassword() {
101 63 return oldPassword;
102 64 }
103 65  
104   -
105   - /**
106   - * set value of UpdateUserInfoReq.oldPassword
107   - * @param oldPassword the oldPassword to set
108   - * @createTime 2015年1月21日 下午7:35:20
109   - * @author zhangshirui
110   - */
111 66 public void setOldPassword(String oldPassword) {
112 67 this.oldPassword = oldPassword;
113 68 }
114 69  
115   -
116   - /**
117   - * get value of UpdateUserInfoReq.realName
118   - * @return the realName
119   - * @createTime 2015年1月21日 下午7:48:12
120   - * @author zhangshirui
121   - */
122   - public String getRealName() {
123   - return realName;
  70 + public Integer getGender() {
  71 + return gender;
124 72 }
125 73  
126   -
127   - /**
128   - * set value of UpdateUserInfoReq.realName
129   - * @param realName the realName to set
130   - * @createTime 2015年1月21日 下午7:48:12
131   - * @author zhangshirui
132   - */
133   - public void setRealName(String realName) {
134   - this.realName = realName;
  74 + public void setGender(Integer gender) {
  75 + this.gender = gender;
135 76 }
136 77  
137   - public String getHeadImg() {
138   - return headImg;
139   - }
  78 + public String getNickname() {
  79 + return nickname;
  80 + }
  81 +
  82 + public void setNickname(String nickname) {
  83 + this.nickname = nickname;
  84 + }
  85 +
  86 + public String getBirth() {
  87 + return birth;
  88 + }
140 89  
141   - public void setHeadImg(String headImg) {
142   - this.headImg = headImg;
143   - }
144   -
145   -
  90 + public void setBirth(String birth) {
  91 + this.birth = birth;
  92 + }
  93 +
  94 + public String getMobile() {
  95 + return mobile;
  96 + }
  97 +
  98 + public void setMobile(String mobile) {
  99 + this.mobile = mobile;
  100 + }
  101 +
  102 + public String getHeadImg() {
  103 + return headImg;
  104 + }
  105 +
  106 + public void setHeadImg(String headImg) {
  107 + this.headImg = headImg;
  108 + }
146 109 }
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/UpdateUserInfoResp.java
  View file @63e8b05
... ... @@ -28,7 +28,7 @@ public class UpdateUserInfoResp extends BaseResp {
28 28 /**
29 29 * 更新结果
30 30 */
31   - @Deprecated
  31 +
32 32 private Integer resultFlag = RESULT_FLAG_SUCCESS;
33 33  
34 34  
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/model/BuyerInfo.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user.model;
  2 +
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +/**
  8 + * Created by xxxzzz on 2017/1/3.
  9 + */
  10 +public class BuyerInfo implements Serializable{
  11 +
  12 + /**
  13 + * 男
  14 + */
  15 + public static final Integer SEX_MALE = 1;
  16 + /**
  17 + * 女
  18 + */
  19 + public static final Integer SEX_FEMALE = 2;
  20 + /**
  21 + * 未知
  22 + */
  23 + public static final Integer SEX_UNKNOW = 3;
  24 +
  25 +
  26 + /**
  27 + * 用户真实姓名
  28 + */
  29 + //@ApiModelProperty(value = "真实姓名")
  30 + //private String realName;
  31 + /**
  32 + * 用户名，昵称
  33 + */
  34 + @ApiModelProperty(value = "昵称")
  35 + private String nickName;
  36 + /**
  37 + * 用户手机号码
  38 + */
  39 + @ApiModelProperty(value = "手机号码")
  40 + private String mobilePhone;
  41 +
  42 + /**
  43 + * 性别
  44 + */
  45 + @ApiModelProperty(value = "性别：1-男 2-女 ")
  46 + private Integer sex;
  47 +
  48 + ///**
  49 + // * 账户状态： 1:正常状态，2:锁定，3：未激活
  50 + // */
  51 + //private Integer accountState;
  52 + /**
  53 + * 个人头像
  54 + */
  55 + @ApiModelProperty(value = "头像")
  56 + private String headImg;
  57 +
  58 +
  59 + public String getNickName() {
  60 + return nickName;
  61 + }
  62 +
  63 + public void setNickName(String nickName) {
  64 + this.nickName = nickName;
  65 + }
  66 +
  67 + public String getMobilePhone() {
  68 + return mobilePhone;
  69 + }
  70 +
  71 + public void setMobilePhone(String mobilePhone) {
  72 + this.mobilePhone = mobilePhone;
  73 + }
  74 +
  75 + public Integer getSex() {
  76 + return sex;
  77 + }
  78 +
  79 + public void setSex(Integer sex) {
  80 + this.sex = sex;
  81 + }
  82 +
  83 + public String getHeadImg() {
  84 + return headImg;
  85 + }
  86 +
  87 + public void setHeadImg(String headImg) {
  88 + this.headImg = headImg;
  89 + }
  90 +}
... ...
mobsite-getway-domain/src/main/java/com/diligrp/mobsite/getway/domain/protocol/user/model/TradeRecord.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.domain.protocol.user.model;
  2 +
  3 +import io.swagger.annotations.ApiModelProperty;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +/**
  8 + * Created by xxxzzz on 2016/12/1.
  9 + */
  10 +public class TradeRecord implements Serializable{
  11 +
  12 +
  13 + /**
  14 + * 商品名称
  15 + * */
  16 + @ApiModelProperty(value = "商品名称")
  17 + private String title;
  18 +
  19 + /**
  20 + * 交易时间
  21 + * */
  22 + @ApiModelProperty(value = "交易时间")
  23 + private String tradeTime;
  24 +
  25 + /**
  26 + * 交易金额
  27 + * */
  28 + @ApiModelProperty(value = "交易金额")
  29 + private Long tradeAmount;
  30 +
  31 +
  32 + public String getTitle() {
  33 + return title;
  34 + }
  35 +
  36 + public void setTitle(String title) {
  37 + this.title = title;
  38 + }
  39 +
  40 + public String getTradeTime() {
  41 + return tradeTime;
  42 + }
  43 +
  44 + public void setTradeTime(String tradeTime) {
  45 + this.tradeTime = tradeTime;
  46 + }
  47 +
  48 +
  49 + public Long getTradeAmount() {
  50 + return tradeAmount;
  51 + }
  52 +
  53 + public void setTradeAmount(Long tradeAmount) {
  54 + this.tradeAmount = tradeAmount;
  55 + }
  56 +}
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/GoodsRPC.java
  View file @63e8b05
... ... @@ -10,12 +10,9 @@
10 10 package com.diligrp.mobsite.getway.rpc.buyer;
11 11  
12 12 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
13   -import com.diligrp.mobsite.getway.domain.protocol.order.AppraiseGoodsReq;
14   -import com.diligrp.titan.sdk.domain.*;
15   -import com.diligrp.titan.sdk.input.PpsSearchInput;
16   -import com.diligrp.titan.sdk.output.BaseOutput;
17   -import com.diligrp.titan.sdk.output.PageOutput;
18   -import com.diligrp.website.util.domain.Result;
  13 +import com.diligrp.titan.sdk.domain.Attribute;
  14 +import com.diligrp.titan.sdk.domain.Category;
  15 +import com.diligrp.titan.sdk.domain.Product;
19 16  
20 17 import java.util.HashMap;
21 18 import java.util.List;
... ... @@ -27,93 +24,68 @@ import java.util.Map;
27 24 * @date 2014年8月14日 上午11:20:17
28 25 */
29 26 public interface GoodsRPC {
30   -
  27 +
31 28 /**
32   - *
33   - * @Title: getGoodsById
34   - * @Description: 根据id获取商品详情
35   - * @param id 商品id
36   - * @param defindResult 自定义返回结果集 不填默认只返回分类基础信息
37   - * “attribute”-返回基础信息加上商品描述·销售·可搜索属性相关信息
38   - * “auth”-返回基础信息加上商品认证 信息
39   - * “video”-返回基础信息加上商品视频信息
40   - * “subCates”-返回基础信息加上商品子分类信息
41   - * “cate”-返回基础信息加上商品主分类详细信息
42   - * @param @return
43   - * @return Goods
  29 + * @param id 商品id
  30 + * @param defindResult 自定义返回结果集 不填默认只返回分类基础信息
  31 + * “attribute”-返回基础信息加上商品描述·销售·可搜索属性相关信息
  32 + * “auth”-返回基础信息加上商品认证 信息
  33 + * “video”-返回基础信息加上商品视频信息
  34 + * “subCates”-返回基础信息加上商品子分类信息
  35 + * “cate”-返回基础信息加上商品主分类详细信息
  36 + * @param @return
  37 + * @return Goods
44 38 * @throws
  39 + * @Title: getGoodsById
  40 + * @Description: 根据id获取商品详情
45 41 */
46 42 public Product getGoodsById(Long id, String[] defindResult);
47 43  
48 44 /**
49   - *
50   - * @Title: getConditionByCid
51   - * @Description: 根据类别id获取，筛选条件
52 45 * @param categoryId
53 46 * @return
  47 + * @Title: getConditionByCid
  48 + * @Description: 根据类别id获取，筛选条件
54 49 * @createTime 2014年8月19日 下午2:55:50
55 50 * @author zhangshirui
56 51 */
57   - public HashMap<String,List<Attribute>> getConditionByCid(Integer categoryId);
58   -
59   - /**
60   - *
61   - * @Title: getComments
62   - * @Description: 根据商品id获取评价
63   - * @param id
64   - * @return
65   - * @createTime 2014年8月19日 下午5:11:10
66   - * @author zhangshirui
67   - */
68   - public Result getComments(Long id, Integer page, Integer pageSize);
  52 + public HashMap<String, List<Attribute>> getConditionByCid(Integer categoryId);
69 53  
70 54 /**
71 55 * 更具商品id获取商品
  56 + *
72 57 * @param productId
73 58 * @param defindResult
74 59 * @return
75 60 * @createTime 2014年9月3日 下午4:58:39
76 61 * @author zhangshirui
77 62 */
78   - List<Product> getProductByIds(List<Long> productId, String[] defindResult);
  63 + List<Product> getProductByIds(List<Long> productId, String[] defindResult);
79 64  
80   - /**
81   - * 添加商品评论
82   - * @param req
83   - * @createTime 2014年9月3日 下午4:58:25
84   - * @author zhangshirui
85   - */
86   - void addComment(AppraiseGoodsReq req);
87 65  
88   - /**
89   - *
90   - * @param skus
91   - * @return
92   - * @createTime 2014年9月15日 下午4:04:46
93   - * @author zhangshirui
94   - */
95   - List<StockInfo> getStockInfo(List<String> skus);
96   -
97   - /**
98   - * 根据sku查询skuInfoMap详细信息
99   - * @param skuList
100   - * @return
101   - * @createTime 2014年11月6日 上午11:43:20
102   - * @author zhangshirui
103   - */
104   - Map<String, Product> getSkuInfoMap(List<String> skuList);
  66 + /**
  67 + * 根据sku查询skuInfoMap详细信息
  68 + *
  69 + * @param skuList
  70 + * @return
  71 + * @createTime 2014年11月6日 上午11:43:20
  72 + * @author zhangshirui
  73 + */
  74 + Map<String, Product> getSkuInfoMap(List<String> skuList);
105 75  
106   - /**
107   - * 获取商品描述信息
108   - * @param productId
109   - * @return
110   - * @createTime 2015年6月8日 下午6:50:31
111   - * @author zhangshirui
112   - */
  76 + /**
  77 + * 获取商品描述信息
  78 + *
  79 + * @param productId
  80 + * @return
  81 + * @createTime 2015年6月8日 下午6:50:31
  82 + * @author zhangshirui
  83 + */
113 84 String getProductDesc(Long productId);
114 85  
115 86 /**
116 87 * 根据商品id查询商品信息
  88 + *
117 89 * @param productIds
118 90 * @return
119 91 * @createTime 2015年6月12日 下午3:14:08
... ... @@ -123,6 +95,7 @@ public interface GoodsRPC {
123 95  
124 96 /**
125 97 * 根据分类id查询分类信息
  98 + *
126 99 * @param cid
127 100 * @return
128 101 * @createTime 2015年6月23日 下午5:56:34
... ... @@ -132,6 +105,7 @@ public interface GoodsRPC {
132 105  
133 106 /**
134 107 * 查询类目面包屑，返回结果进行正序排序
  108 + *
135 109 * @param cid
136 110 * @return
137 111 * @createTime 2015年6月23日 下午5:56:34
... ... @@ -139,84 +113,5 @@ public interface GoodsRPC {
139 113 */
140 114 List<Category> listCrumbs(Long cid);
141 115  
142   - /**
143   - * 根据ID查询供应信息
144   - * @param ids
145   - * @param
146   - * @return
147   - */
148   - BaseOutput<List<Supply>> getSupplyInfoByIds(List<Long> ids);
149   -
150   - /**
151   - * 根据ID查询预售信息
152   - * @param ids
153   - * @param
154   - * @return
155   - */
156   - BaseOutput<List<Presale>> getPresaleInfoByIds(List<Long> ids);
157 116  
158   - /**
159   - * 根据ID查询求购信息
160   - * @param ids
161   - * @param
162   - * @return
163   - */
164   - BaseOutput<List<Purchase>> getPurchaseInfoByIds(List<Long> ids);
165   -
166   - /**
167   - * 查询预售信息
168   - * @param input
169   - * @param page
170   - * @return
171   - */
172   - PageOutput<List<Presale>> getPresaleInfo(PpsSearchInput input, Integer page);
173   -
174   - /**
175   - * 查询求购信息
176   - * @param input
177   - * @param page
178   - * @return
179   - */
180   - PageOutput<List<Purchase>> getPurchaseInfo(PpsSearchInput input, Integer page);
181   -
182   - /**
183   - * 查询供应信息
184   - * @param input
185   - * @param page
186   - * @return
187   - */
188   - PageOutput<List<Supply>> getSupplyInfo(PpsSearchInput input, Integer page);
189   -
190   - /**
191   - * 删除求购信息
192   - * @param ids
193   - * @return
194   - */
195   - BaseOutput<List<Long>> deletePurchaseInfo(List<Long> ids);
196   -
197   - /**
198   - * 删除预售信息
199   - * @param ids
200   - * @return
201   - */
202   - BaseOutput<List<Long>> deletePresaleInfo(List<Long> ids);
203   -
204   - /**
205   - * 删除供应信息
206   - * @param ids
207   - * @return
208   - */
209   - BaseOutput<List<Long>> deleteSupplyInfo(List<Long> ids);
210   -
211   - /**
212   - * this method is 查询用户的评论列表，支持分页，默认查询第1页
213   - * @param buyerUserId
214   - * @param sellerUserId
215   - * @param grade 1:好评，2:中评，3:差评
216   - * @param dateScope 1：最近一周，2：最近一个月，3：最近6个月，4：6个月以前，5：全部
217   - * @param page
218   - * @return
219   - */
220   - Result listUserComments(Long buyerUserId, Long sellerUserId, Integer grade,
221   - Integer dateScope, Integer page);
222 117 }
... ...