b2c / gateway · Commits

Commit 63e8b057d88335f23aafb85d76d3e9cb2a25f33f

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

初始化工程-接口定义

Inline Side-by-side
Showing 128 changed files with 3423 additions and 4043 deletions
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 }
... ...
mobsite-getway-rpc/src/main/java/com/diligrp/mobsite/getway/rpc/buyer/impl/GoodsRPCImpl.java
  View file @63e8b05
... ... @@ -12,19 +12,14 @@ package com.diligrp.mobsite.getway.rpc.buyer.impl;
12 12 import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
13 13 import com.diligrp.mobsite.getway.domain.common.RedisKey;
14 14 import com.diligrp.mobsite.getway.domain.common.ResultCode;
15   -import com.diligrp.mobsite.getway.domain.common.enums.PageEnum;
16 15 import com.diligrp.mobsite.getway.domain.except.ServiceException;
17 16 import com.diligrp.mobsite.getway.domain.protocol.GoodsSuper;
18   -import com.diligrp.mobsite.getway.domain.protocol.ProductAppraise;
19   -import com.diligrp.mobsite.getway.domain.protocol.order.AppraiseGoodsReq;
20   -import com.diligrp.mobsite.getway.domain.protocol.product.model.AppraiseRate;
21 17 import com.diligrp.mobsite.getway.rpc.buyer.GoodsRPC;
22 18 import com.diligrp.titan.sdk.TitanClient;
23   -import com.diligrp.titan.sdk.domain.*;
24   -import com.diligrp.titan.sdk.input.PpsSearchInput;
  19 +import com.diligrp.titan.sdk.domain.Attribute;
  20 +import com.diligrp.titan.sdk.domain.Category;
  21 +import com.diligrp.titan.sdk.domain.Product;
25 22 import com.diligrp.titan.sdk.output.BaseOutput;
26   -import com.diligrp.titan.sdk.output.PageOutput;
27   -import com.diligrp.website.util.domain.Result;
28 23 import com.diligrp.website.util.redis.RedisUtil;
29 24 import com.diligrp.website.util.security.Validator;
30 25 import org.slf4j.Logger;
... ... @@ -32,7 +27,10 @@ import org.slf4j.LoggerFactory;
32 27 import org.springframework.stereotype.Service;
33 28  
34 29 import javax.annotation.Resource;
35   -import java.util.*;
  30 +import java.util.ArrayList;
  31 +import java.util.HashMap;
  32 +import java.util.List;
  33 +import java.util.Map;
36 34  
37 35 /**
38 36 * @ClassName: GoodsRPCImpl
... ... @@ -83,23 +81,6 @@ public class GoodsRPCImpl implements GoodsRPC {
83 81 return attributeBo.getData();
84 82 }
85 83  
86   - @Override
87   - public Result getComments(Long id, Integer page, Integer pageSize) {
88   - PageOutput<List<Comment>> output = null;
89   - try {
90   - output = titanClient.getCommentService().listProductComments(id, page, pageSize);
91   - } catch (Exception e) {
92   - logger.error("titanClient接口挂掉：获取商品评论",e);
93   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
94   - }
95   - if(output.getCode()!= ResultCode.SUCCESS){
96   - logger.error(String.format("获取商品评论失败.[productid=%s,code=%s, message=%s]",
97   - id, output.getCode(), output.getResult()));
98   - throw new RuntimeException(ErrorMessage.PRODUCT_STATE_DOWNORDEL);
99   - }
100   - logger.info(String.format("获取商品列表.[size=%s]", Validator.isEmpty(output.getData())?0:output.getData().size()));
101   - return Result.create(output.getData()).addResult("maxPage", output.getTotalPage());
102   - }
103 84  
104 85 @Override
105 86 public List<Product> getProductByIds(List<Long> productId, String[] defindResult) {
... ... @@ -128,69 +109,19 @@ public class GoodsRPCImpl implements GoodsRPC {
128 109 List<GoodsSuper> goodsInfos = new ArrayList<GoodsSuper>();
129 110 GoodsSuper goodsInfo = null;
130 111 for (Product product : products) {
131   - goodsInfo = new GoodsSuper();
132   - goodsInfo.setId(product.getPid());
133   - goodsInfo.setTitle(product.getName());
134   - goodsInfo.setDefaultPic(product.getDefaultPic());
135   - goodsInfo.setPrice((long)product.getMinPrice());
136   - goodsInfo.setUnit(product.getSaleUnit());
137   - goodsInfos.add(goodsInfo);
  112 + //goodsInfo = new GoodsSuper();
  113 + //goodsInfo.setId(product.getPid());
  114 + //goodsInfo.setTitle(product.getName());
  115 + //goodsInfo.setDefaultPic(product.getDefaultPic());
  116 + //goodsInfo.setPrice((long)product.getMinPrice());
  117 + //goodsInfo.setUnit(product.getSaleUnit());
  118 + //goodsInfos.add(goodsInfo);
138 119 }
139 120  
140 121 return goodsInfos;
141 122 }
142   -
143   - @Override
144   - public void addComment(AppraiseGoodsReq req){
145   - BaseOutput<Object> output = null;
146   - List<ProductAppraise> productAppraises = req.getProductAppraises();
147   - AppraiseRate appraiseRate = req.getAppraiseRate();
148   - Comment comment = null;
149   - for (ProductAppraise productAppraise : productAppraises) {
150   - comment = new Comment();
151   - comment.setComment(productAppraise.getAppraise()== null?"":productAppraise.getAppraise());
152   - comment.setCtime(new Date());
153   - comment.setPid(productAppraise.getProductId());
154   - comment.setSku(productAppraise.getSku());
155   - comment.setRate(productAppraise.getScore());
156   - comment.setBuyerUserId(req.getUserId());
157   - comment.setDeliveryRate(appraiseRate.getDeliveryRate().intValue());
158   - comment.setProductRate(appraiseRate.getProductRate().intValue());
159   - comment.setServiceRate(appraiseRate.getServiceRate().intValue());
160   - comment.setSellerUserId(productAppraise.getSellerId());
161   - try {
162   - output = titanClient.getCommentService().addComment(comment);
163   - } catch (Exception e) {
164   - logger.error("titanClient接口挂掉：添加商品评价",e);
165   - throw new ServiceException();
166   - }
167   - if(output.getCode() != ResultCode.SUCCESS){
168   - logger.error(String.format("添加商品评价接口失败.[code=%s, message=%s]",
169   - output.getCode(), output.getResult()));
170   - throw new ServiceException(ErrorMessage.PRODUCT_STATE_DOWNORDEL);
171   - }
172   - logger.info(String.format("添加商品评价.[goodsId=%s, userId=%s]",
173   - comment.getPid(),req.getUserId()));
174   - }
175   - }
176   -
177   - @Override
178   - public List<StockInfo> getStockInfo(List<String> skus){
179   - BaseOutput<List<StockInfo>> output = null;
180   - try {
181   - output = titanClient.getStockService().getStockInfo(skus);
182   - } catch (Exception e) {
183   - logger.error(String.format("获取商品库存信息失败.[message=%s, sku=%s]",
184   - e.getMessage(),skus.get(0)));
185   - throw new ServiceException();
186   - }
187   - if(output.getCode()!= ResultCode.SUCCESS){
188   - logger.error(String.format("获取商品库存信息失败.[code=%s, message=%s, sku=%s]",
189   - output.getCode(), output.getResult(),skus.get(0)));
190   - throw new ServiceException(ErrorMessage.PRODUCT_STATE_DOWNORDEL);
191   - }
192   - return output.getData();
193   - }
  123 +
  124 +
194 125  
195 126 @Override
196 127 public Map<String, Product> getSkuInfoMap(List<String> skuList){
... ... @@ -214,7 +145,7 @@ public class GoodsRPCImpl implements GoodsRPC {
214 145 public String getProductDesc(Long productId){
215 146 BaseOutput<String> output = null;
216 147 try {
217   - output = titanClient.getProductService().getProductDesc(productId);
  148 + // output = titanClient.getProductService().getProductDesc(productId);
218 149 } catch (Exception e) {
219 150 logger.error("商品库接口超时",e);
220 151 }
... ... @@ -249,8 +180,9 @@ public class GoodsRPCImpl implements GoodsRPC {
249 180 @Override
250 181 public List<Category> listCrumbs(Long cid) {
251 182 List<Category> categories = null;
  183 + BaseOutput<List<Category>> output = null;
252 184 try {
253   - BaseOutput<List<Category>> output = titanClient.getCategoryService().listCrumbs(cid.intValue());
  185 + // BaseOutput<List<Category>> output = titanClient.getCategoryService().listCrumbs(cid.intValue());
254 186 if(output.getCode() != ResultCode.SUCCESS){
255 187 logger.error("查询类目面包屑失败[cid={},result={}]",cid,output.getResult());
256 188 }
... ... @@ -262,229 +194,15 @@ public class GoodsRPCImpl implements GoodsRPC {
262 194 return categories;
263 195 }
264 196  
265   - /**
266   - * 根据ID查询供应信息
267   - * @param ids
268   - * @return
269   - */
270   - @Override
271   - public BaseOutput<List<Supply>> getSupplyInfoByIds(List<Long> ids) {
272   - BaseOutput<List<Supply>> output = null;
273   - try {
274   - output = titanClient.getSupplyService().find(ids);
275   - } catch (Exception e) {
276   - logger.error("titanClient接口挂掉：查询供应信息",e);
277   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
278   - }
279   - if(output.getCode() != ResultCode.SUCCESS){
280   - logger.error(String.format("查询供应信息.[SupplyIds=%s,code=%s, message=%s]",
281   - ids.toString(),output.getCode(), output.getResult()));
282   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
283   - }
284   - return output;
285   - }
286 197  
287   - /**
288   - * 查询供应信息
289   - * @param input
290   - * @param page
291   - * @return
292   - */
293   - @Override
294   - public PageOutput<List<Supply>> getSupplyInfo(PpsSearchInput input, Integer page) {
295   - PageOutput<List<Supply>> output = null;
296   - try {
297   - output = titanClient.getSupplyService().search(input, page, PageEnum.MAXPAGESIZE.getValue());
298   - } catch (Exception e) {
299   - logger.error("titanClient接口挂掉：查询供应信息",e);
300   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
301   - }
302   - if(output.getCode() != ResultCode.SUCCESS){
303   - logger.error(String.format("查询供应信息.[code=%s, message=%s]",
304   - output.getCode(), output.getResult()));
305   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
306   - }
307   - return output;
308   - }
309   -
310   - /**
311   - * 根据ID查询求购信息
312   - * @param ids
313   - * @return
314   - */
315   - @Override
316   - public BaseOutput<List<Purchase>> getPurchaseInfoByIds(List<Long> ids) {
317   - BaseOutput<List<Purchase>> output = null;
318   - try {
319   - output = titanClient.getPurchaseService().find(ids);
320   - } catch (Exception e) {
321   - logger.error("titanClient接口挂掉：查询求购信息",e);
322   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
323   - }
324   - if(output.getCode() != ResultCode.SUCCESS){
325   - logger.error(String.format("查询求购信息.[SupplyIds=%s,code=%s, message=%s]",
326   - ids.toString(),output.getCode(), output.getResult()));
327   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
328   - }
329   - return output;
330   - }
331   -
332   - /**
333   - * 查询求购信息
334   - * @return
335   - */
336   - @Override
337   - public PageOutput<List<Purchase>> getPurchaseInfo(PpsSearchInput input, Integer page) {
338   - PageOutput<List<Purchase>> output = null;
339   - try {
340   - output = titanClient.getPurchaseService().search(input, page, PageEnum.MAXPAGESIZE.getValue());
341   - } catch (Exception e) {
342   - logger.error("titanClient接口挂掉：查询求购信息",e);
343   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
344   - }
345   - if(output.getCode() != ResultCode.SUCCESS){
346   - logger.error(String.format("查询求购信息.[code=%s, message=%s]",
347   - output.getCode(), output.getResult()));
348   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
349   - }
350   - return output;
351   - }
352   -
353   - /**
354   - * 根据ID查询预售信息
355   - * @param ids
356   - * @return
357   - */
358   - @Override
359   - public BaseOutput<List<Presale>> getPresaleInfoByIds(List<Long> ids) {
360   - BaseOutput<List<Presale>> output = null;
361   - try {
362   - output = titanClient.getPresaleService().find(ids);
363   - } catch (Exception e) {
364   - logger.error("titanClient接口挂掉：查询预售信息",e);
365   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
366   - }
367   - if(output.getCode() != ResultCode.SUCCESS){
368   - logger.error(String.format("查询预售信息.[SupplyIds=%s,code=%s, message=%s]",
369   - ids.toString(),output.getCode(), output.getResult()));
370   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
371   - }
372   - return output;
373   - }
374   -
375   - /**
376   - * 查询预售信息
377   - * @param input page
378   - * @return
379   - */
380   - @Override
381   - public PageOutput<List<Presale>> getPresaleInfo(PpsSearchInput input, Integer page) {
382   - PageOutput<List<Presale>> output = null;
383   - try {
384   - output = titanClient.getPresaleService().search(input, page, PageEnum.MAXPAGESIZE.getValue());
385   - } catch (Exception e) {
386   - logger.error("titanClient接口挂掉：查询预售信息",e);
387   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
388   - }
389   - if(output.getCode() != ResultCode.SUCCESS){
390   - logger.error(String.format("查询预售信息.[code=%s, message=%s]",
391   - output.getCode(), output.getResult()));
392   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
393   - }
394   - return output;
395   - }
  198 +
  199 +
396 200  
397   - /**
398   - * 删除供应信息
399   - * @param ids
400   - * @return
401   - */
402   - @Override
403   - public BaseOutput<List<Long>> deleteSupplyInfo(List<Long> ids) {
404   - BaseOutput<List<Long>> output = null;
405   - try {
406   - output = titanClient.getSupplyService().dels(ids);
407   - } catch (Exception e) {
408   - logger.error("titanClient接口挂掉：删除供应信息",e);
409   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
410   - }
411   - if(output.getCode() != ResultCode.SUCCESS){
412   - logger.error(String.format("删除供应信息.[ids=%s,code=%s, message=%s]",
413   - ids,output.getCode(), output.getResult()));
414   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
415   - }
416   - return output;
417   - }
418 201  
419   - /**
420   - * 获取用户评价列表
421   - * @param buyUserId
422   - * @param sellerUserId
423   - * @param grade 1:好评，2:中评，3:差评,4:代表全部，
424   - * @param dateScope 1：最近一周，2：最近一个月，3：最近6个月，4：6个月以前，5：全部
425   - * @param page
426   - * @return
427   - */
428   - @Override
429   - public Result listUserComments(Long buyUserId, Long sellerUserId, Integer grade, Integer dateScope, Integer page) {
430   - PageOutput<List<Comment>> listPageOutput = null;
431   - try {
432 202  
433   - listPageOutput= titanClient.getCommentService().listUserComments(
434   - buyUserId, sellerUserId, grade, dateScope,
435   - page, PageEnum.MAXPAGESIZE.getValue());
436   - } catch (Exception e) {
437   - logger.error("titanClient接口挂掉：获取用户评价列表信息",e);
438   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
439   - }
440   - if(listPageOutput.getCode() != ResultCode.SUCCESS){
441   - logger.error(String.format("获取用户评价列表信息.[buyUserId=%s,sellerUserId=%s, grade=%s,dateScope=%s,page=%s,message=%s]", buyUserId,sellerUserId,grade,dateScope,page,listPageOutput.getResult()));
442   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
443   - }
444   - return Result.create(listPageOutput.getData()).addResult("maxPage", listPageOutput.getTotalPage());
445   - }
446 203  
447   - /**
448   - * 删除预售信息
449   - * @param ids
450   - * @return
451   - */
452   - @Override
453   - public BaseOutput<List<Long>> deletePresaleInfo(List<Long> ids) {
454   - BaseOutput<List<Long>> output = null;
455   - try {
456   - output = titanClient.getPresaleService().dels(ids);
457   - } catch (Exception e) {
458   - logger.error("titanClient接口挂掉：删除预售信息",e);
459   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
460   - }
461   - if(output.getCode() != ResultCode.SUCCESS){
462   - logger.error(String.format("删除预售信息.[ids=%s,code=%s, message=%s]",
463   - ids,output.getCode(), output.getResult()));
464   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
465   - }
466   - return output;
467   - }
  204 +
  205 +
468 206  
469   - /**
470   - * 删除求购信息
471   - * @param ids
472   - * @return
473   - */
474   - @Override
475   - public BaseOutput<List<Long>> deletePurchaseInfo(List<Long> ids) {
476   - BaseOutput<List<Long>> output = null;
477   - try {
478   - output = titanClient.getPurchaseService().dels(ids);
479   - } catch (Exception e) {
480   - logger.error("titanClient接口挂掉：删除求购信息",e);
481   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
482   - }
483   - if(output.getCode() != ResultCode.SUCCESS){
484   - logger.error(String.format("删除求购信息.[ids=%s,code=%s, message=%s]",
485   - ids,output.getCode(), output.getResult()));
486   - throw new RuntimeException(ErrorMessage.NETWORK_ERROR);
487   - }
488   - return output;
489   - }
  207 +
490 208 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/home/impl/TopicServiceImpl.java
  View file @63e8b05
... ... @@ -103,10 +103,10 @@ public class TopicServiceImpl implements TopicService {
103 103 Goods goods = null;
104 104 for (ProductDTO productDTO : productDtos) {
105 105 goods = new Goods();
106   - goods.setId(productDTO.getProductId());
107   - goods.setPrice(productDTO.getPrice());
  106 + goods.setPid(productDTO.getProductId());
  107 + // goods.setPrice(productDTO.getPrice());
108 108 goods.setUnit(productDTO.getUnit());
109   - goods.setTitle(productDTO.getName());
  109 + goods.setName(productDTO.getName());
110 110 goods.setDefaultPic(productDTO.getImgUrl());
111 111 goodsList.add(goods);
112 112 }
... ... @@ -144,7 +144,7 @@ public class TopicServiceImpl implements TopicService {
144 144 } else {
145 145 category.setId(relateId);
146 146 }
147   - category.setRelateId(relateId);
  147 + // category.setRelateId(relateId);
148 148 category.setName(categoryDTO.getName());
149 149 category.setImgUrl(categoryDTO.getIcon());
150 150 categorys.add(category);
... ... @@ -176,7 +176,7 @@ public class TopicServiceImpl implements TopicService {
176 176 topicCategory.setName(categoryDTO.getName());
177 177 topicCategory.setImgUrl(categoryDTO.getIcon());
178 178 try {
179   - topicCategory.setRelateId(Long.valueOf(categoryDTO.getContent()));
  179 + //topicCategory.setRelateId(Long.valueOf(categoryDTO.getContent()));
180 180 } catch (Exception e) {
181 181 log.error("分类设置不正确,name={},msg={}", categoryDTO.getName(), e.getMessage());
182 182 }
... ... @@ -203,7 +203,7 @@ public class TopicServiceImpl implements TopicService {
203 203 } catch (Exception e) {
204 204 log.error("分类设置不正确,name={},msg={}", categoryDTO.getName(), e.getMessage());
205 205 }
206   - category.setRelateId(relateId);
  206 + // category.setRelateId(relateId);
207 207 categorys.add(category);
208 208 }
209 209 return categorys;
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/OrderService.java
  View file @63e8b05
... ... @@ -80,4 +80,7 @@ public interface OrderService {
80 80 AppraiseGoodsResp publishProductAppraise(AppraiseGoodsReq req);
81 81  
82 82  
  83 + PaymentResp payment(PaymentReq req);
  84 +
  85 + DelOrderResp delOrder(DelOrderReq req);
83 86 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/UserService.java
  View file @63e8b05
... ... @@ -97,7 +97,7 @@ public interface UserService {
97 97 */
98 98 UserRegisterResp userRegister(UserRegisterReq req);
99 99  
100   - GetUserIntroductionResp getUserIntroduction(GetUserIntroductionReq req);
  100 + GetUserInfoResp getUserIntroduction(GetUserInfoReq req);
101 101  
102 102 UpdateMobileResp updateMobile(UpdateMobileReq req);
103 103  
... ... @@ -177,4 +177,10 @@ public interface UserService {
177 177 GetMemberListResp getMemberList(GetMemberListReq req);
178 178  
179 179 UpdateUserInfoResp completeUserInfo(CompleteUserInfoReq req);
  180 +
  181 + GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req);
  182 +
  183 + TradeRecordResp getTradeRecord(TradeRecordReq req);
  184 +
  185 + SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req);
180 186 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/OrderServiceImpl.java
  View file @63e8b05
... ... @@ -107,4 +107,15 @@ public class OrderServiceImpl implements OrderService {
107 107 public AppraiseGoodsResp publishProductAppraise(AppraiseGoodsReq req) {
108 108 return null;
109 109 }
  110 +
  111 + @Override
  112 + public PaymentResp payment(PaymentReq req) {
  113 + return null;
  114 + }
  115 +
  116 + @Override
  117 + public DelOrderResp delOrder(DelOrderReq req) {
  118 + return null;
  119 + }
  120 +
110 121 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
  View file @63e8b05
... ... @@ -59,7 +59,7 @@ public class UserServiceImpl implements UserService {
59 59 }
60 60  
61 61 @Override
62   - public GetUserIntroductionResp getUserIntroduction(GetUserIntroductionReq req) {
  62 + public GetUserInfoResp getUserIntroduction(GetUserInfoReq req) {
63 63 return null;
64 64 }
65 65  
... ... @@ -157,4 +157,19 @@ public class UserServiceImpl implements UserService {
157 157 public UpdateUserInfoResp completeUserInfo(CompleteUserInfoReq req) {
158 158 return null;
159 159 }
  160 +
  161 + @Override
  162 + public GetDepositCardAmountResp getDepositCardAmount(GetDepositCardAmountReq req) {
  163 + return null;
  164 + }
  165 +
  166 + @Override
  167 + public TradeRecordResp getTradeRecord(TradeRecordReq req) {
  168 + return null;
  169 + }
  170 +
  171 + @Override
  172 + public SearchUserInfoResp searchBuyerInfo(SearchUserInfoReq req) {
  173 + return null;
  174 + }
160 175 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/FundService.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.service.seller;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.fund.*;
  4 +
  5 +/**
  6 + * Created by xxxzzz on 2017/1/3.
  7 + */
  8 +
  9 +public interface FundService {
  10 +
  11 +
  12 + public GetFundsResp getFunds(GetFundsReq req) ;
  13 +
  14 + FundTradeResp fundTrade(FundTradeReq req);
  15 +
  16 + GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req);
  17 +}
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerGoodsService.java
  View file @63e8b05
... ... @@ -9,6 +9,7 @@
9 9 */
10 10 package com.diligrp.mobsite.getway.service.seller;
11 11  
  12 +import com.diligrp.mobsite.getway.domain.protocol.product.*;
12 13 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
13 14 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
14 15  
... ... @@ -124,4 +125,18 @@ public interface SellerGoodsService {
124 125 * @createTime 2014年8月18日 下午4:11:27
125 126 */
126 127 public GetProductAttrResp getProductAttrHasSelected(Integer cid, Long pid);
  128 +
  129 + AddProductCategoryResp addProductCategory(AddProductCategoryReq req);
  130 +
  131 + UpdateProductCategoryResp updateProductCategory(UpdateProductCategoryReq req);
  132 +
  133 + SearchProductCategoryResp searchProductCategory(SearchProductCategoryReq req);
  134 +
  135 + AddGoodsResp addGoods(AddGoodsReq req);
  136 +
  137 + UpdateGoodsResp updateGoods(UpdateGoodsReq req);
  138 +
  139 + GetGoodsResp getGoods(GetGoodsReq req);
  140 +
  141 + HandleGoodsResp handleGoods(HandleGoodsReq req);
127 142 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerOrderService.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.service.seller;
2 2  
3   -import com.diligrp.mobsite.getway.domain.protocol.order.GetRefundDetailReq;
4   -import com.diligrp.mobsite.getway.domain.protocol.order.GetRefundOrderListReq;
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
5 4 import com.diligrp.mobsite.getway.domain.protocol.saler.order.*;
6 5  
7 6  
... ... @@ -20,7 +19,7 @@ public interface SellerOrderService {
20 19 * @param req
21 20 * @return
22 21 * @createTime 2014年9月1日 下午6:18:36
23   - * @author duanyugen
  22 + * @author weili
24 23 */
25 24 GetOrderListResp getOrders(GetOrderListReq req) throws Exception;
26 25  
... ... @@ -29,105 +28,42 @@ public interface SellerOrderService {
29 28 * @param req
30 29 * @return
31 30 * @createTime 2014年9月1日 下午6:39:42
32   - * @author duanyugen
  31 + * @author weili
33 32 */
34 33 GetOrderDetailResp getOrderById(GetOrderDetailReq req);
35 34  
36   - /**
37   - * 取消订单
38   - * @param req
39   - * @return
40   - * @createTime 2014年9月1日 下午6:18:29
41   - * @author duanyugen
42   - */
43   - OperateOrderCommonResp cancelOrder(SellerCancelOrderReq req);
44 35  
45   - /**
46   - * 备货完成
47   - * @param req
48   - * @return
49   - * @createTime 2014年9月1日 下午6:18:29
50   - * @author duanyugen
51   - */
52   - OperateOrderCommonResp makeGoodsReady(OperateOrderCommonReq req);
53 36  
54 37 /**
55 38 * 确认收款
56 39 * @param req
57 40 * @return
58 41 * @createTime 2014年9月1日 下午6:18:29
59   - * @author duanyugen
  42 + * @author weili
60 43 */
61   - OperateOrderCommonResp comfirmReceiveMoney(OperateOrderCommonReq req);
62   - /**
63   - * 现场交易确认收款
64   - * @param req
65   - * @return
66   - * @createTime 2014年9月1日 下午6:18:29
67   - * @author duanyugen
68   - */
69   - OperateOrderCommonResp comfirmSpotMoney(OperateOrderCommonReq req);
  44 + ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req);
70 45  
71   - /**
72   - * 确认发货
73   - * @param req
74   - * @return
75   - * @createTime 2014年9月1日 下午6:18:29
76   - * @author duanyugen
77   - */
78   - OperateOrderCommonResp confirmDelivery(ConfirmDeliveryReq req);
79   -
80   - /**
81   - * 审批退款请求
82   - * @param req
83   - * @return
84   - * @createTime 2014年9月1日 下午6:18:29
85   - * @author duanyugen
86   - */
87   - OperateOrderCommonResp auditApplyRefund(AuditApplyRefundReq req);
88 46  
89 47 /**
90 48 * 修改订单信息
91 49 * @param req
92 50 * @return
93 51 * @createTime 2014年9月1日 下午6:18:29
94   - * @author duanyugen
  52 + * @author weili
95 53 */
96   - OperateOrderCommonResp modifyOrderPrice(ModifyOrderPriceReq req);
  54 + BaseResp takeOrder(takeOrderReq req);
97 55  
98   - /**
99   - * 获取订单汇总信息
100   - * @param req
101   - * @return
102   - * @createTime 2014年9月1日 下午6:18:29
103   - * @author duanyugen
104   - */
105   - GetSellerOrderSumInfoResp getOrderSumInfo(GetSellerOrderSumInfoReq req);
106 56  
107   - /**
108   - * 审核赊账
109   - * @param req
110   - * @return
111   - * @createTime 2014年9月1日 下午6:18:29
112   - * @author duanyugen
113   - */
114   - OperateOrderCommonResp auditCreditOrder(AuditCreditOrderReq req);
115 57  
116   - /**
117   - * 获取申请退款的订单列表
118   - * @param req
119   - * @return
120   - * @createTime 2014年10月21日 下午4:12:42
121   - * @author duanyugen
122   - */
123   - GetSellerRefundOrderListResp getRefundOrders(GetSellerRefundOrderListReq req);
124 58  
125 59 /**
126   - * 获取申请退款的订单详情
  60 + * 拒绝订单
127 61 * @param req
128 62 * @return
129 63 * @createTime 2014年10月21日 下午4:40:17
130   - * @author duanyugen
  64 + * @author weili
131 65 */
132   - GetSellerRefundDetailResp getRefundDetail(GetRefundDetailReq req);
  66 + RefuseQuoteResp refuseOrder(RefuseQuoteReq req);
  67 +
  68 + SearchOrderListResp searchOrders(SearchOrderListReq req);
133 69 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/SellerShopService.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.service.seller;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
  5 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
  6 +import com.diligrp.mobsite.getway.domain.protocol.shop.*;
  7 +
  8 +/**
  9 + * <B>Description</B> 卖家用户 <br />
  10 + * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
  11 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  12 + * <B>Company</B> 地利集团
  13 + * @createTime 2015年4月16日 下午3:52:01
  14 + * @author duanyugen
  15 + */
  16 +public interface SellerShopService {
  17 +
  18 + CreateOrUpdateShopResp createShop(CreateOrUpdateShopReq req);
  19 +
  20 + GetShopInfoResp getShopInfo(BaseReq req);
  21 +
  22 + GetShowStyleResp getShowStyle(BaseReq req);
  23 +
  24 + AddShopDeliveryTimeResp addShopDeliveryTime(AddShopDeliveryTimeReq req);
  25 +
  26 + GetShopDeliveryTimeResp getShopDeliveryTime(GetShopDeliveryTimeReq req);
  27 +
  28 + DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req);
  29 +}
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/FundServiceImpl.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.service.seller.impl;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.fund.*;
  4 +import com.diligrp.mobsite.getway.service.seller.FundService;
  5 +import org.springframework.stereotype.Service;
  6 +
  7 +/**
  8 + * Created by weili on 2017/1/3.
  9 + */
  10 +@Service
  11 +public class FundServiceImpl implements FundService{
  12 + @Override
  13 + public GetFundsResp getFunds(GetFundsReq req) {
  14 + return null;
  15 + }
  16 +
  17 + @Override
  18 + public FundTradeResp fundTrade(FundTradeReq req) {
  19 + return null;
  20 + }
  21 +
  22 + @Override
  23 + public GetfundTradeRecordResp getfundTradeRecord(GetfundTradeRecordReq req) {
  24 + return null;
  25 + }
  26 +}
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerGoodsServiceImpl.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.service.seller.impl;
2 2  
  3 +import com.diligrp.mobsite.getway.domain.protocol.product.*;
3 4 import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
4 5 import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
5 6 import com.diligrp.mobsite.getway.rpc.buyer.ConfigRPC;
... ... @@ -105,4 +106,39 @@ public class SellerGoodsServiceImpl implements SellerGoodsService {
105 106 public GetProductAttrResp getProductAttrHasSelected(Integer cid, Long pid) {
106 107 return null;
107 108 }
  109 +
  110 + @Override
  111 + public AddProductCategoryResp addProductCategory(AddProductCategoryReq req) {
  112 + return null;
  113 + }
  114 +
  115 + @Override
  116 + public UpdateProductCategoryResp updateProductCategory(UpdateProductCategoryReq req) {
  117 + return null;
  118 + }
  119 +
  120 + @Override
  121 + public SearchProductCategoryResp searchProductCategory(SearchProductCategoryReq req) {
  122 + return null;
  123 + }
  124 +
  125 + @Override
  126 + public AddGoodsResp addGoods(AddGoodsReq req) {
  127 + return null;
  128 + }
  129 +
  130 + @Override
  131 + public UpdateGoodsResp updateGoods(UpdateGoodsReq req) {
  132 + return null;
  133 + }
  134 +
  135 + @Override
  136 + public GetGoodsResp getGoods(GetGoodsReq req) {
  137 + return null;
  138 + }
  139 +
  140 + @Override
  141 + public HandleGoodsResp handleGoods(HandleGoodsReq req) {
  142 + return null;
  143 + }
108 144 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerOrderServiceImpl.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.service.seller.impl;
2 2  
3   -import com.diligrp.mobsite.getway.domain.protocol.order.GetRefundDetailReq;
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
4 4 import com.diligrp.mobsite.getway.domain.protocol.saler.order.*;
5 5 import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
6 6  
... ... @@ -18,68 +18,33 @@ import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
18 18 public class SellerOrderServiceImpl implements SellerOrderService {
19 19  
20 20  
21   - @Override
22   - public GetOrderListResp getOrders(GetOrderListReq req) throws Exception {
23   - return null;
24   - }
  21 + @Override
  22 + public GetOrderListResp getOrders(GetOrderListReq req) throws Exception {
  23 + return null;
  24 + }
25 25  
26   - @Override
27   - public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
28   - return null;
29   - }
  26 + @Override
  27 + public GetOrderDetailResp getOrderById(GetOrderDetailReq req) {
  28 + return null;
  29 + }
30 30  
31   - @Override
32   - public OperateOrderCommonResp cancelOrder(SellerCancelOrderReq req) {
33   - return null;
34   - }
  31 + @Override
  32 + public ConfirmReceiptMoneyResp comfirmReceiveMoney(ConfirmReceiptMoneyReq req) {
  33 + return null;
  34 + }
35 35  
36   - @Override
37   - public OperateOrderCommonResp makeGoodsReady(OperateOrderCommonReq req) {
38   - return null;
39   - }
  36 + @Override
  37 + public BaseResp takeOrder(takeOrderReq req) {
  38 + return null;
  39 + }
40 40  
41   - @Override
42   - public OperateOrderCommonResp comfirmReceiveMoney(OperateOrderCommonReq req) {
43   - return null;
44   - }
  41 + @Override
  42 + public RefuseQuoteResp refuseOrder(RefuseQuoteReq req) {
  43 + return null;
  44 + }
45 45  
46   - @Override
47   - public OperateOrderCommonResp comfirmSpotMoney(OperateOrderCommonReq req) {
48   - return null;
49   - }
50   -
51   - @Override
52   - public OperateOrderCommonResp confirmDelivery(ConfirmDeliveryReq req) {
53   - return null;
54   - }
55   -
56   - @Override
57   - public OperateOrderCommonResp auditApplyRefund(AuditApplyRefundReq req) {
58   - return null;
59   - }
60   -
61   - @Override
62   - public OperateOrderCommonResp modifyOrderPrice(ModifyOrderPriceReq req) {
63   - return null;
64   - }
65   -
66   - @Override
67   - public GetSellerOrderSumInfoResp getOrderSumInfo(GetSellerOrderSumInfoReq req) {
68   - return null;
69   - }
70   -
71   - @Override
72   - public OperateOrderCommonResp auditCreditOrder(AuditCreditOrderReq req) {
73   - return null;
74   - }
75   -
76   - @Override
77   - public GetSellerRefundOrderListResp getRefundOrders(GetSellerRefundOrderListReq req) {
78   - return null;
79   - }
80   -
81   - @Override
82   - public GetSellerRefundDetailResp getRefundDetail(GetRefundDetailReq req) {
83   - return null;
84   - }
  46 + @Override
  47 + public SearchOrderListResp searchOrders(SearchOrderListReq req) {
  48 + return null;
  49 + }
85 50 }
... ...
mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/seller/impl/SellerShopServiceImpl.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.service.seller.impl;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
  5 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
  6 +import com.diligrp.mobsite.getway.domain.protocol.shop.*;
  7 +import com.diligrp.mobsite.getway.service.seller.SellerShopService;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +
  11 +/**
  12 + * <B>Description</B> 卖家用户信息 <br />
  13 + * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
  14 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  15 + * <B>Company</B> 地利集团
  16 + * @createTime 2015年4月16日 下午3:52:41
  17 + * @author duanyugen
  18 + */
  19 +@Service
  20 +public class SellerShopServiceImpl implements SellerShopService {
  21 +
  22 + @Override
  23 + public CreateOrUpdateShopResp createShop(CreateOrUpdateShopReq req) {
  24 + return null;
  25 + }
  26 +
  27 + @Override
  28 + public GetShopInfoResp getShopInfo(BaseReq req) {
  29 + return null;
  30 + }
  31 +
  32 + @Override
  33 + public GetShowStyleResp getShowStyle(BaseReq req) {
  34 + return null;
  35 + }
  36 +
  37 + @Override
  38 + public AddShopDeliveryTimeResp addShopDeliveryTime(AddShopDeliveryTimeReq req) {
  39 + return null;
  40 + }
  41 +
  42 + @Override
  43 + public GetShopDeliveryTimeResp getShopDeliveryTime(GetShopDeliveryTimeReq req) {
  44 + return null;
  45 + }
  46 +
  47 + @Override
  48 + public DelShopDeliveryTimeResp delShopDeliveryTime(DelShopDeliveryTimeReq req) {
  49 + return null;
  50 + }
  51 +}
... ...
mobsite-getway-service/src/test/java/test/TopicTest.java
  View file @63e8b05
... ... @@ -29,7 +29,7 @@ public class TopicTest {
29 29 // CmsClient cmsClient = new CmsClient();
30 30 // List<CategoryDTO> categorys = cmsClient.getCategoryService().listCategory(Constant.TOPIC_CATEGORY,true);
31 31 // String str = JSON.toJSONString(categorys);
32   -// System.out.println(str);
  32 +// System.fund.println(str);
33 33 PaymentBaseReq req = new PaymentBaseReq();
34 34 req.setUserId(1110l);
35 35 req.setFormat("json");
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/base/version/VersionController.java
  View file @63e8b05
... ... @@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
10 10 import io.swagger.annotations.ApiOperation;
11 11 import org.apache.log4j.Logger;
12 12 import org.springframework.stereotype.Controller;
  13 +import org.springframework.web.bind.annotation.ModelAttribute;
13 14 import org.springframework.web.bind.annotation.RequestMapping;
14 15 import org.springframework.web.bind.annotation.RequestMethod;
15 16 import org.springframework.web.bind.annotation.ResponseBody;
... ... @@ -25,7 +26,7 @@ import javax.annotation.Resource;
25 26 */
26 27 @Controller
27 28 @RequestMapping("/mobsiteApp/version/")
28   -@Api(value = "mobsiteApp/user", description = "版本接口")
  29 +@Api(value = "mobsiteApp/version", description = "版本接口")
29 30 public class VersionController extends BaseApiController{
30 31  
31 32 @Resource
... ... @@ -40,10 +41,10 @@ public class VersionController extends BaseApiController{
40 41 * @createTime 2015年5月21日 下午4:51:39
41 42 * @author zhangshirui
42 43 */
43   - @ApiOperation(value = "检测版本更新 ")
44   - @RequestMapping(value = "checkVersion",method = RequestMethod.POST)
  44 + @ApiOperation(value = "检测版本更新", httpMethod = "POST",response = CheckVersionResp.class)
  45 + @RequestMapping(value = "/checkVersion",method = RequestMethod.POST)
45 46 @ResponseBody
46   - public void checkVersion(){
  47 + public void checkVersion(@ModelAttribute CheckVersionReq temp){
47 48 CheckVersionReq req = super.getRequest(CheckVersionReq.class);
48 49 try {
49 50 CheckVersionResp resp = versionUpdateService.checkVersion(req);
... ... @@ -58,9 +59,10 @@ public class VersionController extends BaseApiController{
58 59 /**
59 60 * 意见反馈
60 61 */
61   - @RequestMapping("feedback")
  62 + @ApiOperation(value = "意见反馈", httpMethod = "POST",response = FeedbackResp.class)
  63 + @RequestMapping(value = "/feedback",method = RequestMethod.POST)
62 64 @ResponseBody
63   - public void feedback() {
  65 + public void feedback(@ModelAttribute FeedbackReq temp) {
64 66 FeedbackReq req = super.getRequest(FeedbackReq.class);
65 67 try {
66 68 if (log.isInfoEnabled()) {
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/cart/CartController.java
  View file @63e8b05
... ... @@ -7,6 +7,7 @@ import com.diligrp.mobsite.getway.service.buyer.settle.CartService;
7 7 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
8 8 import com.diligrp.mobsite.getway.web.utils.BeanValidator;
9 9 import com.diligrp.website.util.security.Validator;
  10 +import io.swagger.annotations.Api;
10 11 import io.swagger.annotations.ApiOperation;
11 12 import org.slf4j.Logger;
12 13 import org.slf4j.LoggerFactory;
... ... @@ -29,6 +30,7 @@ import javax.annotation.Resource;
29 30 */
30 31 @Controller
31 32 @RequestMapping("/mobsiteApp/cart")
  33 +@Api(value = "cart", description = "菜篮子接口")
32 34 public class CartController extends BaseApiController {
33 35 @Resource
34 36 private CartService cartService;
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/goods/GoodsController.java
  View file @63e8b05
... ... @@ -11,6 +11,7 @@ import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordR
11 11 import com.diligrp.mobsite.getway.domain.protocol.search.SearchProductByKeywordResp;
12 12 import com.diligrp.mobsite.getway.service.buyer.goods.GoodsService;
13 13 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  14 +import io.swagger.annotations.Api;
14 15 import io.swagger.annotations.ApiOperation;
15 16 import org.apache.log4j.Logger;
16 17 import org.springframework.stereotype.Controller;
... ... @@ -32,6 +33,7 @@ import javax.annotation.Resource;
32 33 */
33 34 @Controller
34 35 @RequestMapping("/mobsiteApp/goods/")
  36 +@Api(value = "/mobsiteApp/goods", description = "商品接口-买家")
35 37 public class GoodsController extends BaseApiController {
36 38  
37 39 @Resource
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/home/ConsigneeController.java
  View file @63e8b05
... ... @@ -4,6 +4,7 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
4 4 import com.diligrp.mobsite.getway.domain.protocol.cart.*;
5 5 import com.diligrp.mobsite.getway.service.buyer.settle.ConsigneeService;
6 6 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  7 +import io.swagger.annotations.Api;
7 8 import io.swagger.annotations.ApiOperation;
8 9 import org.slf4j.Logger;
9 10 import org.slf4j.LoggerFactory;
... ... @@ -26,6 +27,7 @@ import javax.annotation.Resource;
26 27 */
27 28 @Controller
28 29 @RequestMapping("/mobsiteApp/consignee")
  30 +@Api(value = "/mobsiteApp/consignee", description = "收货人接口")
29 31 public class ConsigneeController extends BaseApiController {
30 32  
31 33 @Resource
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/home/MealDeployController.java
  View file @63e8b05
... ... @@ -4,6 +4,7 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
4 4 import com.diligrp.mobsite.getway.domain.protocol.topic.GetMealListReq;
5 5 import com.diligrp.mobsite.getway.domain.protocol.topic.GetMealListResp;
6 6 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  7 +import io.swagger.annotations.Api;
7 8 import io.swagger.annotations.ApiOperation;
8 9 import org.slf4j.Logger;
9 10 import org.slf4j.LoggerFactory;
... ... @@ -16,7 +17,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
16 17 */
17 18  
18 19 @Controller
19   -@RequestMapping("/mobsiteApp/home/")
  20 +@RequestMapping("/mobsiteApp/meal/")
  21 +@Api(value = "/mobsiteApp/meal", description = "营养配餐接口")
20 22 public class MealDeployController extends BaseApiController{
21 23  
22 24  
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/shop/ShopController.java
  View file @63e8b05
... ... @@ -6,6 +6,7 @@ import com.diligrp.mobsite.getway.domain.protocol.detail.*;
6 6 import com.diligrp.mobsite.getway.service.buyer.shop.ShopService;
7 7 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
8 8 import com.diligrp.mobsite.getway.web.utils.BeanValidator;
  9 +import io.swagger.annotations.Api;
9 10 import io.swagger.annotations.ApiOperation;
10 11 import org.slf4j.Logger;
11 12 import org.slf4j.LoggerFactory;
... ... @@ -28,6 +29,7 @@ import javax.annotation.Resource;
28 29 */
29 30 @Controller
30 31 @RequestMapping("/mobsiteApp/shop")
  32 +@Api(value = "/mobsiteApp/shop", description = "店铺接口-买家")
31 33 public class ShopController extends BaseApiController {
32 34  
33 35 @Resource
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/CareCategoryController.java deleted 100644 → 0
  View file @376680f
1   -//package com.diligrp.mobsite.getway.web.api.buyer.user;
2   -//
3   -//import javax.annotation.Resource;
4   -//
5   -//import org.slf4j.Logger;
6   -//import org.slf4j.LoggerFactory;
7   -//import org.springframework.stereotype.Controller;
8   -//import org.springframework.web.bind.annotation.RequestMapping;
9   -//import org.springframework.web.bind.annotation.ResponseBody;
10   -//
11   -//import com.diligrp.mobsite.getway.domain.protocol.user.AddCareCategoryReq;
12   -//import com.diligrp.mobsite.getway.domain.protocol.user.AddCareCategoryResp;
13   -//import com.diligrp.mobsite.getway.domain.protocol.user.DelCareCategoryReq;
14   -//import com.diligrp.mobsite.getway.domain.protocol.user.DelCareCategoryResp;
15   -//import com.diligrp.mobsite.getway.domain.protocol.user.GetCareCategoryReq;
16   -//import com.diligrp.mobsite.getway.domain.protocol.user.GetCareCategoryResp;
17   -//import com.diligrp.mobsite.getway.service.buyer.user.CareService;
18   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
19   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
20   -//import com.diligrp.website.util.security.Validator;
21   -//
22   -///**
23   -// * <B>Description</B> 关注品类接口 <br />
24   -// * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
25   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
26   -// * <B>Company</B> 地利集团
27   -// *
28   -// * @author wujianjun
29   -// * @createTime 2014/9/3 10:11
30   -// */
31   -//@Controller
32   -//@RequestMapping("/mobsiteApp/care")
33   -//public class CareCategoryController extends BaseApiController {
34   -//
35   -// @Resource
36   -// private CareService careService;
37   -// private Logger log = LoggerFactory.getLogger(getClass());
38   -//
39   -// /**
40   -// * 获取关注的所有品类
41   -// */
42   -// @RequestMapping("getCareCategory")
43   -// @ResponseBody
44   -// @DiligrpEndpoint(group = "关注品类",req=GetCareCategoryReq.class, resp=GetCareCategoryResp.class,desc="获取关注的所有品类")
45   -// public void getCareCategory() {
46   -// GetCareCategoryReq req = getRequest(GetCareCategoryReq.class);
47   -// try {
48   -// GetCareCategoryResp resp = careService.getCareCategory(req);
49   -// sendSuccessResp(resp);
50   -// } catch (Exception e) {
51   -// log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
52   -// sendError("获取关注品类失败..");
53   -// }
54   -// }
55   -//
56   -// /**
57   -// * 添加关注品类
58   -// */
59   -// @RequestMapping("addCareCategory")
60   -// @ResponseBody
61   -// @DiligrpEndpoint(group = "关注品类",req=AddCareCategoryReq.class, resp=AddCareCategoryResp.class,desc="添加关注品类")
62   -// public void addCareCategory() {
63   -// AddCareCategoryReq req = getRequest(AddCareCategoryReq.class);
64   -// try {
65   -// AddCareCategoryResp resp = careService.addCareCategory(req);
66   -// sendSuccessResp(resp);
67   -// } catch (Exception e) {
68   -// log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
69   -// sendError(e.getMessage());
70   -// }
71   -// }
72   -//
73   -// /**
74   -// * 删除关注品类
75   -// */
76   -// @RequestMapping("delCareCategory")
77   -// @ResponseBody
78   -// @DiligrpEndpoint(group = "关注品类",req=DelCareCategoryReq.class, resp=DelCareCategoryResp.class,desc="删除关注品类")
79   -// public void delCareCategory() {
80   -// DelCareCategoryReq req = getRequest(DelCareCategoryReq.class);
81   -// try {
82   -// if(Validator.isNull(req) || Validator.isEmpty(req.getCategoryIds())) {
83   -// throw new NullPointerException("[参数传递错误]没有找到需要删除的ID");
84   -// }
85   -// DelCareCategoryResp resp = careService.delCareCategory(req);
86   -// sendSuccessResp(resp);
87   -// } catch (Exception e) {
88   -// log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
89   -// sendError(e.getMessage());
90   -// }
91   -// }
92   -//}
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/OrderController.java
  View file @63e8b05
1 1 package com.diligrp.mobsite.getway.web.api.buyer.user;
2 2  
3 3 import com.diligrp.mobsite.getway.domain.except.ServiceException;
4   -import com.diligrp.mobsite.getway.domain.protocol.common.LogResp;
5 4 import com.diligrp.mobsite.getway.domain.protocol.order.*;
6 5 import com.diligrp.mobsite.getway.service.buyer.user.OrderService;
7 6 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
8 7 import com.diligrp.mobsite.getway.web.utils.BeanValidator;
9   -import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
  8 +import io.swagger.annotations.Api;
10 9 import io.swagger.annotations.ApiOperation;
11 10 import org.apache.log4j.Logger;
12 11 import org.springframework.stereotype.Controller;
... ... @@ -25,10 +24,11 @@ import javax.servlet.http.HttpServletRequest;
25 24 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
26 25 * <B>Company</B> 地利集团
27 26 * @createTime 2014年9月1日 下午2:30:41
28   - * @author zhangshirui
  27 + * @author weili
29 28 */
30 29 @Controller
31 30 @RequestMapping("/mobsiteApp/order/")
  31 +@Api(value = "/mobsiteApp/order", description = "订单接口-买家")
32 32 public class OrderController extends BaseApiController {
33 33  
34 34 @Resource
... ... @@ -43,7 +43,7 @@ public class OrderController extends BaseApiController {
43 43 * 返回协议体：SearchOrderResp
44 44 *
45 45 * @createTime 2014年9月1日 下午5:32:02
46   - * @author zhangshirui
  46 + * @author weili
47 47 * @return
48 48 */
49 49 @ApiOperation(value = "获取订单列表", httpMethod = "POST",response = SearchOrderResp.class)
... ... @@ -71,12 +71,12 @@ public class OrderController extends BaseApiController {
71 71 * 返回协议体：GetOrderResp
72 72 *
73 73 * @createTime 2014年9月1日 下午6:39:10
74   - * @author zhangshirui
  74 + * @author weili
75 75 */
76   - @RequestMapping("getOrderById")
  76 + @ApiOperation(value = "根据订单id查询订单", httpMethod = "POST",response = GetOrderResp.class)
  77 + @RequestMapping(value = "/getOrderById",method = RequestMethod.POST)
77 78 @ResponseBody
78   - @DiligrpEndpoint(group = "订单信息",req=GetOrderReq.class, resp=GetOrderResp.class,desc="根据订单id查询订单详情")
79   - public void getOrderById(){
  79 + public void getOrderById(@ModelAttribute GetOrderReq temp){
80 80  
81 81 GetOrderReq req = super.getRequest(GetOrderReq.class);
82 82 try {
... ... @@ -99,24 +99,23 @@ public class OrderController extends BaseApiController {
99 99 * 返回协议体：SubmitOrderResp
100 100 *
101 101 * @createTime 2014年9月1日 下午6:05:23
102   - * @author zhangshirui
  102 + * @author weili
103 103 */
104   - @RequestMapping("submitOrderNew")
105   - @ResponseBody
106   - @DiligrpEndpoint(group = "订单信息",req=SubmitOrderReq.class, resp=SubmitOrderResp.class,desc="提交订单")
107   - public void submitOrderNew(HttpServletRequest request){
  104 + @ApiOperation(value = "提交订单", httpMethod = "POST",response = SubmitOrderResp.class)
  105 + @RequestMapping(value = "/submitOrder",method = RequestMethod.POST)
  106 + @ResponseBody
  107 + public void submitOrder(HttpServletRequest request,@ModelAttribute SubmitOrderReq temp){
108 108  
109 109 SubmitOrderReq req = super.getRequest(SubmitOrderReq.class);
110 110 try {
111 111 BeanValidator.validator(req);
112 112 SubmitOrderResp resp = orderService.submitOrderNew(req);
113   - try {
114   - LogResp logResp = resp.getLogResp();
115   - log.info(String.format("提交订单：[ 设备id<%s>用户名<%s>用户id<%s>店铺id<%s>ip<%s>订单id<%s>商品id<%s> ]"
116   - , req.getDeviceId(), logResp.getUserName(), logResp.getUserId(), logResp.getShopId(), request.getRemoteAddr(), logResp.getOrderId(), logResp.getProductId()));
117   - }catch (Exception e) {
118   - log.error("记录下单日志出错！");
119   - }
  113 + //try {
  114 + // log.info(String.format("提交订单：[ 设备id<%s>用户id<%s>订单id<%s>]"
  115 + // , req.getDeviceId(), req.getUserId(), resp.getOrderInfos().ge getOrderId(), );
  116 + //}catch (Exception e) {
  117 + // log.error("记录下单日志出错！");
  118 + //}
120 119 super.sendSuccessResp(resp);
121 120 } catch (ServiceException e) {
122 121 log.error("提交订单出现业务异常", e);
... ... @@ -127,31 +126,32 @@ public class OrderController extends BaseApiController {
127 126 }
128 127 }
129 128  
130   - ///**
131   - // * 线下付款
132   - // *
133   - // * 请求协议体：PayofflineReq
134   - // * 返回协议体：PayofflineResp
135   - // *
136   - // * @createTime 2014年9月1日 下午6:05:23
137   - // * @author zhangshirui
138   - // */
139   - //@RequestMapping("payoffline")
140   - //@ResponseBody
141   - //public void payoffline(){
142   - // PayofflineReq req = super.getRequest(PayofflineReq.class);
143   - // try {
144   - // BeanValidator.validator(req);
145   - // PayofflineResp resp = orderService.payoffline(req);
146   - // super.sendSuccessResp(resp);
147   - // } catch (ServiceException e) {
148   - // log.error("录入线下付款信息出现业务异常", e);
149   - // super.sendError(e.getCode(), e.getMessage());
150   - // } catch (Exception e) {
151   - // log.error("录入线下付款信息失败", e);
152   - // super.sendError(e.getMessage());
153   - // }
154   - //}
  129 + /**
  130 + * 付款
  131 + *
  132 + * 请求协议体：paymentreq
  133 + * 返回协议体：PaymentResp
  134 + *
  135 + * @createTime 2014年9月1日 下午6:05:23
  136 + * @author weili
  137 + */
  138 + @ApiOperation(value = "支付", httpMethod = "POST",response = PaymentResp.class)
  139 + @RequestMapping(value = "/payment",method = RequestMethod.POST)
  140 + @ResponseBody
  141 + public void payment(@ModelAttribute PaymentReq temp){
  142 + PaymentReq req = super.getRequest(PaymentReq.class);
  143 + try {
  144 + BeanValidator.validator(req);
  145 + PaymentResp resp = orderService.payment(req);
  146 + super.sendSuccessResp(resp);
  147 + } catch (ServiceException e) {
  148 + log.error("录入线下付款信息出现业务异常", e);
  149 + super.sendError(e.getCode(), e.getMessage());
  150 + } catch (Exception e) {
  151 + log.error("录入线下付款信息失败", e);
  152 + super.sendError(e.getMessage());
  153 + }
  154 + }
155 155  
156 156  
157 157  
... ... @@ -163,12 +163,12 @@ public class OrderController extends BaseApiController {
163 163 * 返回协议体：CancelOrderResp
164 164 *
165 165 * @createTime 2014年9月1日 下午6:08:06
166   - * @author zhangshirui
  166 + * @author weili
167 167 */
168   - @RequestMapping("cancelOrder")
  168 + @ApiOperation(value = "取消订单", httpMethod = "POST",response = CancelOrderResp.class)
  169 + @RequestMapping(value = "/cancelOrder",method = RequestMethod.POST)
169 170 @ResponseBody
170   - @DiligrpEndpoint(group = "订单信息",req=CancelOrderReq.class, resp=CancelOrderResp.class,desc="取消订单")
171   - public void cancelOrder(){
  171 + public void cancelOrder(@ModelAttribute CancelOrderReq temp){
172 172  
173 173 CancelOrderReq req = super.getRequest(CancelOrderReq.class);
174 174 try {
... ... @@ -183,85 +183,61 @@ public class OrderController extends BaseApiController {
183 183 }
184 184 }
185 185  
186   -
187 186 /**
188   - * 确认提货
  187 + * 取消订单
189 188 *
190   - * 请求协议体：ConfirmPickUpReq
191   - * 返回协议体：ConfirmPickUpResp
  189 + * 请求协议体：CancelOrderReq
  190 + * 返回协议体：CancelOrderResp
192 191 *
193   - * @createTime 2014年9月1日 下午6:16:05
194   - * @author zhangshirui
  192 + * @createTime 2014年9月1日 下午6:08:06
  193 + * @author weili
195 194 */
196   - @RequestMapping("confirmPickUp")
  195 + @ApiOperation(value = "删除订单", httpMethod = "POST",response = DelOrderResp.class)
  196 + @RequestMapping(value = "/delOrder",method = RequestMethod.POST)
197 197 @ResponseBody
198   - @DiligrpEndpoint(group = "订单信息",req=ConfirmPickUpReq.class, resp=ConfirmPickUpResp.class,desc="提货完成")
199   - public void confirmPickUp(){
200   - ConfirmPickUpReq req = super.getRequest(ConfirmPickUpReq.class);
  198 + public void delOrder(@ModelAttribute DelOrderReq temp){
  199 +
  200 + DelOrderReq req = super.getRequest(DelOrderReq.class);
201 201 try {
202   - ConfirmPickUpResp resp = orderService.confirmPickUp(req);
  202 + DelOrderResp resp = orderService.delOrder(req);
203 203 super.sendSuccessResp(resp);
204 204 } catch (ServiceException e) {
205   - log.error("确认提货出现业务异常", e);
  205 + log.error("取消订单出现业务异常", e);
206 206 super.sendError(e.getCode(), e.getMessage());
207 207 } catch (Exception e) {
208   - log.error("确认提货失败", e);
  208 + log.error("取消订单失败", e);
209 209 super.sendError(e.getMessage());
210 210 }
211 211 }
212 212  
  213 +
213 214 /**
214   - * 评价商品
  215 + * 确认收货
215 216 *
216   - * 请求协议体：AppraiseGoodsReq
217   - * 返回协议体：AppraiseGoodsResp
  217 + * 请求协议体：ConfirmPickUpReq
  218 + * 返回协议体：ConfirmPickUpResp
218 219 *
219   - * @createTime 2014年9月1日 下午6:20:35
220   - * @author zhangshirui
  220 + * @createTime 2014年9月1日 下午6:16:05
  221 + * @author weili
221 222 */
222   - @RequestMapping("publishProductAppraise")
  223 + @ApiOperation(value = "确认收货", httpMethod = "POST",response = ConfirmPickUpResp.class)
  224 + @RequestMapping(value = "/confirmPickUp",method = RequestMethod.POST)
223 225 @ResponseBody
224   - @DiligrpEndpoint(group = "订单信息",req=AppraiseGoodsReq.class, resp=AppraiseGoodsResp.class,desc="评价商品")
225   - public void publishProductAppraise(){
226   - AppraiseGoodsReq req = super.getRequest(AppraiseGoodsReq.class);
  226 + public void confirmPickUp(@ModelAttribute ConfirmPickUpReq temp){
  227 + ConfirmPickUpReq req = super.getRequest(ConfirmPickUpReq.class);
227 228 try {
228   - BeanValidator.validator(req);
229   - AppraiseGoodsResp resp = orderService.publishProductAppraise(req);
  229 + ConfirmPickUpResp resp = orderService.confirmPickUp(req);
230 230 super.sendSuccessResp(resp);
231 231 } catch (ServiceException e) {
232   - log.error("评价商品出现业务异常", e);
  232 + log.error("确认收货出现业务异常", e);
233 233 super.sendError(e.getCode(), e.getMessage());
234 234 } catch (Exception e) {
235   - log.error("评价商品失败", e);
  235 + log.error("确认收货失败", e);
236 236 super.sendError(e.getMessage());
237 237 }
238 238 }
239 239  
240   - ///**
241   - // * 发送交易识别码
242   - // *
243   - // * 请求协议体：SendTradeCodeReq
244   - // * 返回协议体：SendTradeCodeResp
245   - // *
246   - // * @createTime 2014年9月4日 下午2:33:46
247   - // * @author zhangshirui
248   - // */
249   - //@RequestMapping("sendTradeCode")
250   - //@ResponseBody
251   - //@DiligrpEndpoint(group = "订单信息",req=SendTradeCodeReq.class, resp=SendTradeCodeResp.class,desc="发送交易识别码")
252   - //public void sendTradeCode(){
253   - // SendTradeCodeReq req = super.getRequest(SendTradeCodeReq.class);
254   - // try {
255   - // SendTradeCodeResp resp = orderService.sendTradeCode(req);
256   - // super.sendSuccessResp(resp);
257   - // } catch (ServiceException e) {
258   - // log.error("发送交易识别码出现业务异常", e);
259   - // super.sendError(e.getCode(), e.getMessage());
260   - // } catch (Exception e) {
261   - // log.error("发送交易识别码失败", e);
262   - // super.sendError(e.getMessage());
263   - // }
264   - //}
  240 +
265 241  
266 242  
267 243 }
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/StationMsgController.java
  View file @63e8b05
1   -//package com.diligrp.mobsite.getway.web.api.buyer.user;
2   -//
3   -//import com.diligrp.mobsite.getway.domain.except.ServiceException;
4   -//import com.diligrp.mobsite.getway.domain.protocol.msg.*;
5   -//import com.diligrp.mobsite.getway.service.buyer.user.StationMsgService;
6   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
7   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
8   -//import org.apache.log4j.Logger;
9   -//import org.springframework.stereotype.Controller;
10   -//import org.springframework.web.bind.annotation.*;
11   -//
12   -//import javax.annotation.Resource;
13   -//
14   -///**
15   -// * <B>Description</B> 站内信 <br />
16   -// * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
17   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
18   -// * <B>Company</B> 地利集团
19   -// *
20   -// * @author zhouyun
21   -// * @createTime 2015-11-9 19:58:45
22   -// */
23   -//@Controller
24   -//@RequestMapping("/mobsiteApp/stationMsg")
25   -//public class StationMsgController extends BaseApiController {
26   -// @Resource
27   -// private StationMsgService stationMsgService;
28   -//
29   -// private static Logger log = Logger.getLogger(StationMsgController.class);
30   -//
31   -// /**
32   -// * 标识站内信已读(按Groupcode)
33   -// * @createTime 2015-11-10 17:16:40
34   -// * @author zhouyun
35   -// * @return
36   -// */
37   -// @RequestMapping("markStationMsg")
38   -// @ResponseBody
39   -// @DiligrpEndpoint(group = "站内信息",req=MarkStationMsgReq.class, resp=MarkStationMsgReq.class,desc="标识站内信已读")
40   -// public void markStationMsg(){
41   -// MarkStationMsgReq req = super.getRequest(MarkStationMsgReq.class);
42   -// try {
43   -// MarkStationMsgResp resp = stationMsgService.markStationMsg(req);
44   -// super.sendSuccessResp(resp);
45   -// }catch (ServiceException e) {
46   -// log.error("标识站内信已读出现业务异常", e);
47   -// super.sendError(e.getCode(), e.getMessage());
48   -// }catch (Exception e) {
49   -// log.error("标识站内信已读失败", e);
50   -// super.sendError(e.getMessage());
51   -// }
52   -// }
53   -//
54   -//
55   -// /**
56   -// * 获取站内信列表
57   -// * @createTime 2015-11-10 17:20:41
58   -// * @author zhouyun
59   -// * @return
60   -// */
61   -// @RequestMapping("getStationMsgList")
62   -// @ResponseBody
63   -// @DiligrpEndpoint(group = "站内信息",req=GetStationMsgListReq.class, resp=GetStationMsgListResp.class,desc="获取站内信列表")
64   -// public void getStationMsgList(){
65   -// GetStationMsgListReq req = super.getRequest(GetStationMsgListReq.class);
66   -// try {
67   -// GetStationMsgListResp resp = stationMsgService.getStationMsgList(req);
68   -// super.sendSuccessResp(resp);
69   -// }catch (ServiceException e) {
70   -// log.error("获取站内信列表出现业务异常", e);
71   -// super.sendError(e.getCode(), e.getMessage());
72   -// }catch (Exception e) {
73   -// log.error("获取站内信列表失败", e);
74   -// super.sendError(e.getMessage());
75   -// }
76   -// }
77   -//
78   -// /**
79   -// * 获取站内信首页信息
80   -// * @createTime 2015-11-10 17:20:41
81   -// * @author zhouyun
82   -// * @return
83   -// */
84   -// @RequestMapping("getHomeInfo")
85   -// @ResponseBody
86   -// @DiligrpEndpoint(group = "站内信首页信息",req=GetHomeInfoReq.class, resp=GetHomeInfoResp.class,desc="站内信首页信息")
87   -// public void getHomeInfo(){
88   -// GetHomeInfoReq req = super.getRequest(GetHomeInfoReq.class);
89   -// try {
90   -// GetHomeInfoResp resp = stationMsgService.getHomeInfoArray(req);
91   -// super.sendSuccessResp(resp);
92   -// }catch (ServiceException e) {
93   -// log.error("获取站内信首页信息出现业务异常", e);
94   -// super.sendError(e.getCode(), e.getMessage());
95   -// }catch (Exception e) {
96   -// log.error("获取站内信首页信息失败", e);
97   -// super.sendError(e.getMessage());
98   -// }
99   -// }
100   -//}
  1 +package com.diligrp.mobsite.getway.web.api.buyer.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  4 +import com.diligrp.mobsite.getway.domain.protocol.msg.*;
  5 +import com.diligrp.mobsite.getway.service.buyer.user.StationMsgService;
  6 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  7 +import io.swagger.annotations.Api;
  8 +import io.swagger.annotations.ApiOperation;
  9 +import org.apache.log4j.Logger;
  10 +import org.springframework.stereotype.Controller;
  11 +import org.springframework.web.bind.annotation.ModelAttribute;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RequestMethod;
  14 +import org.springframework.web.bind.annotation.ResponseBody;
  15 +
  16 +import javax.annotation.Resource;
  17 +
  18 +/**
  19 + * <B>Description</B> 站内信 <br />
  20 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  21 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  22 + * <B>Company</B> 地利集团
  23 + *
  24 + * @author zhouyun
  25 + * @createTime 2015-11-9 19:58:45
  26 + */
  27 +@Controller
  28 +@RequestMapping("/mobsiteApp/stationMsg")
  29 +@Api(value = "/mobsiteApp/stationMsg", description = "站内信")
  30 +public class StationMsgController extends BaseApiController {
  31 + @Resource
  32 + private StationMsgService stationMsgService;
  33 +
  34 + private static Logger log = Logger.getLogger(StationMsgController.class);
  35 +
  36 + /**
  37 + * 标识站内信已读(按Groupcode)
  38 + * @createTime 2015-11-10 17:16:40
  39 + * @author zhouyun
  40 + * @return
  41 + */
  42 + @ApiOperation(value = "标识站内信已读", httpMethod = "POST",response = MarkStationMsgResp.class)
  43 + @RequestMapping(value = "/markStationMsg",method = RequestMethod.POST)
  44 + @ResponseBody
  45 + public void markStationMsg(@ModelAttribute MarkStationMsgReq temp){
  46 + MarkStationMsgReq req = super.getRequest(MarkStationMsgReq.class);
  47 + try {
  48 + MarkStationMsgResp resp = stationMsgService.markStationMsg(req);
  49 + super.sendSuccessResp(resp);
  50 + }catch (ServiceException e) {
  51 + log.error("标识站内信已读出现业务异常", e);
  52 + super.sendError(e.getCode(), e.getMessage());
  53 + }catch (Exception e) {
  54 + log.error("标识站内信已读失败", e);
  55 + super.sendError(e.getMessage());
  56 + }
  57 + }
  58 +
  59 +
  60 + /**
  61 + * 获取站内信列表
  62 + * @createTime 2015-11-10 17:20:41
  63 + * @author zhouyun
  64 + * @return
  65 + */
  66 + @ApiOperation(value = "获取站内信列表", httpMethod = "POST",response = GetStationMsgListResp.class)
  67 + @RequestMapping(value = "/getStationMsgList",method = RequestMethod.POST)
  68 + @ResponseBody
  69 + public void getStationMsgList(@ModelAttribute GetStationMsgListReq temp){
  70 + GetStationMsgListReq req = super.getRequest(GetStationMsgListReq.class);
  71 + try {
  72 + GetStationMsgListResp resp = stationMsgService.getStationMsgList(req);
  73 + super.sendSuccessResp(resp);
  74 + }catch (ServiceException e) {
  75 + log.error("获取站内信列表出现业务异常", e);
  76 + super.sendError(e.getCode(), e.getMessage());
  77 + }catch (Exception e) {
  78 + log.error("获取站内信列表失败", e);
  79 + super.sendError(e.getMessage());
  80 + }
  81 + }
  82 +
  83 + /**
  84 + * 获取站内信首页信息
  85 + * @createTime 2015-11-10 17:20:41
  86 + * @author zhouyun
  87 + * @return
  88 + */
  89 + @ApiOperation(value = "获取站内信首页信息", httpMethod = "POST",response = GetHomeInfoResp.class)
  90 + @RequestMapping(value = "/getHomeInfo",method = RequestMethod.POST)
  91 + @ResponseBody
  92 + public void getHomeInfo(@ModelAttribute GetHomeInfoReq temp){
  93 + GetHomeInfoReq req = super.getRequest(GetHomeInfoReq.class);
  94 + try {
  95 + GetHomeInfoResp resp = stationMsgService.getHomeInfoArray(req);
  96 + super.sendSuccessResp(resp);
  97 + }catch (ServiceException e) {
  98 + log.error("获取站内信首页信息出现业务异常", e);
  99 + super.sendError(e.getCode(), e.getMessage());
  100 + }catch (Exception e) {
  101 + log.error("获取站内信首页信息失败", e);
  102 + super.sendError(e.getMessage());
  103 + }
  104 + }
  105 +}
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
  View file @63e8b05
... ... @@ -4,8 +4,7 @@ import com.diligrp.mobsite.getway.domain.except.ServiceException;
4 4 import com.diligrp.mobsite.getway.domain.protocol.login.*;
5 5 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterReq;
6 6 import com.diligrp.mobsite.getway.domain.protocol.register.UserRegisterResp;
7   -import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdReq;
8   -import com.diligrp.mobsite.getway.domain.protocol.user.ModifyPwdResp;
  7 +import com.diligrp.mobsite.getway.domain.protocol.user.*;
9 8 import com.diligrp.mobsite.getway.service.buyer.user.UserService;
10 9 import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
11 10 import com.diligrp.mobsite.getway.web.utils.BeanValidator;
... ... @@ -29,11 +28,11 @@ import javax.servlet.http.HttpServletRequest;
29 28 * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
30 29 * <B>Company</B> 地利集团
31 30 * @createTime 2014年8月24日 下午10:53:27
32   - * @author zhangshirui
  31 + * @author weili
33 32 */
34 33 @Controller
35 34 @RequestMapping("/mobsiteApp/user")
36   -@Api(value = "user", description = "用户接口")
  35 +@Api(value = "/mobsiteApp/user", description = "用户接口")
37 36 public class UserController extends BaseApiController {
38 37  
39 38 @Resource
... ... @@ -44,7 +43,7 @@ public class UserController extends BaseApiController {
44 43 /**
45 44 * 买家登录
46 45 * @createTime 2014年8月24日 下午10:55:03
47   - * @author zhangshirui
  46 + * @author weili
48 47 */
49 48 @ApiOperation(value = "买家登录", httpMethod = "POST",response = LoginResp.class)
50 49 @RequestMapping(value = "/buyerLogin",method = RequestMethod.POST)
... ... @@ -71,7 +70,7 @@ public class UserController extends BaseApiController {
71 70 /**
72 71 * 加密用户登录(加密)
73 72 * @createTime 2014年8月24日 下午10:55:03
74   - * @author zhangshirui
  73 + * @author weili
75 74 */
76 75 @ApiOperation(value = "买家登录", httpMethod = "POST",response = LoginResp.class)
77 76 @RequestMapping(value = "/buyerLogins",method = RequestMethod.POST)
... ... @@ -96,7 +95,7 @@ public class UserController extends BaseApiController {
96 95 /**
97 96 * 验证码登录
98 97 * @createTime 2014年8月24日 下午10:55:03
99   - * @author zhangshirui
  98 + * @author weili
100 99 */
101 100 @ApiOperation(value = "买家验证码登录", httpMethod = "POST" , notes = "买家验证码登录",response = LoginResp.class)
102 101 @RequestMapping(value = "/loginForAuth",method = RequestMethod.POST)
... ... @@ -121,7 +120,7 @@ public class UserController extends BaseApiController {
121 120 ///**
122 121 // * 找回密码：验证用户名是否可用
123 122 // * @createTime 2014年8月24日 下午10:55:03
124   - // * @author zhangshirui
  123 + // * @author weili
125 124 // */
126 125 //@ApiOperation(value = "买家登录", httpMethod = "POST" , notes = "买家登录",response = LoginResp.class)
127 126 //@RequestMapping(value = "/checkUserInvalid",method = RequestMethod.POST)
... ... @@ -144,7 +143,7 @@ public class UserController extends BaseApiController {
144 143 /**
145 144 * 发送验证码到手机
146 145 * @createTime 2014年8月24日 下午10:55:03
147   - * @author zhangshirui
  146 + * @author weili
148 147 */
149 148 @ApiOperation(value = "发送验证码到手机", httpMethod = "POST" , notes = "发送验证码到手机",response = SendVeriCodeResp.class)
150 149 @RequestMapping(value = "/sendAuthCode",method = RequestMethod.POST)
... ... @@ -168,7 +167,7 @@ public class UserController extends BaseApiController {
168 167 /**
169 168 * 验证手机收到的验证码
170 169 * @createTime 2014年8月24日 下午10:55:03
171   - * @author zhangshirui
  170 + * @author weili
172 171 */
173 172 @ApiOperation(value = "验证手机收到的验证码", httpMethod = "POST" , notes = "验证手机收到的验证码",response = CheckVeriCodeResp.class)
174 173 @RequestMapping(value = "/checkAuthCode",method = RequestMethod.POST)
... ... @@ -192,7 +191,7 @@ public class UserController extends BaseApiController {
192 191 ///**
193 192 // * 修改用户信息
194 193 // * @createTime 2014年8月24日 下午10:55:03
195   - // * @author zhangshirui
  194 + // * @author weili
196 195 // */
197 196 //@RequestMapping("/updateUserInfo")
198 197 //@ResponseBody
... ... @@ -217,7 +216,7 @@ public class UserController extends BaseApiController {
217 216 ///**
218 217 // * 完善用户信息
219 218 // * @createTime 2014年8月24日 下午10:55:03
220   - // * @author zhangshirui
  219 + // * @author weili
221 220 // */
222 221 //@RequestMapping("/completeUserInfo")
223 222 //@ResponseBody
... ... @@ -241,7 +240,7 @@ public class UserController extends BaseApiController {
241 240 /**
242 241 * 找回密码-修改用户密码
243 242 * @createTime 2014年8月24日 下午10:55:03
244   - * @author zhangshirui
  243 + * @author weili
245 244 */
246 245 @ApiOperation(value = "找回密码-修改用户密码", httpMethod = "POST" ,response = SendVeriCodeResp.class)
247 246 @RequestMapping(value = "/modifyPwd",method = RequestMethod.POST)
... ... @@ -267,7 +266,7 @@ public class UserController extends BaseApiController {
267 266 /**
268 267 * 买家注册
269 268 * @createTime 2014年8月28日 下午3:41:02
270   - * @author zhangshirui
  269 + * @author weili
271 270 */
272 271 @ApiOperation(value = "买家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
273 272 @RequestMapping(value = "/buyerRegister",method = RequestMethod.POST)
... ... @@ -291,7 +290,7 @@ public class UserController extends BaseApiController {
291 290 /**
292 291 * 买家注册(加密)
293 292 * @createTime 2014年8月28日 下午3:41:02
294   - * @author zhangshirui
  293 + * @author weili
295 294 */
296 295 @ApiOperation(value = "买家注册", httpMethod = "POST" ,response = UserRegisterResp.class)
297 296 @RequestMapping(value = "/buyerRegisters",method = RequestMethod.POST)
... ... @@ -317,9 +316,9 @@ public class UserController extends BaseApiController {
317 316 * 退出操作
318 317 *
319 318 * @createTime 2014年8月29日 上午9:30:10
320   - * @author zhangshirui
  319 + * @author weili
321 320 */
322   - @ApiOperation(value = "退出", httpMethod = "POST" , notes = "退出",response = LogoutResp.class)
  321 + @ApiOperation(value = "退出", httpMethod = "POST" ,response = LogoutResp.class)
323 322 @RequestMapping(value = "/logout",method = RequestMethod.POST)
324 323 @ResponseBody
325 324 public void logout(@ModelAttribute LogoutReq temp){
... ... @@ -341,18 +340,130 @@ public class UserController extends BaseApiController {
341 340 }
342 341 }
343 342  
  343 + /**
  344 + * 个人信息维护
  345 + * @createTime 2016年8月24日 下午10:55:03
  346 + * @author weili
  347 + */
  348 + @ApiOperation(value = "个人信息维护", httpMethod = "POST" ,response = UpdateUserInfoResp.class)
  349 + @RequestMapping(value = "/updateUserInfo",method = RequestMethod.POST)
  350 + @ResponseBody
  351 + public void updateUserInfo(@ModelAttribute UpdateUserInfoReq temp){
  352 + UpdateUserInfoReq req = super.getRequest(UpdateUserInfoReq.class);
  353 + try {
  354 + UpdateUserInfoResp resp = userService.updateUserInfo(req);
  355 + super.sendSuccessResp(resp);
  356 + } catch (ServiceException e){
  357 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  358 + e.getCode(), e.getMessage(), req.getUserId()), e);
  359 + sendError(e.getCode(), e.getMessage());
  360 + } catch (Exception e) {
  361 + LOGGER.error("个人信息维护：", e);
  362 + super.sendError(e.getMessage());
  363 + }
344 364  
  365 + }
345 366  
346 367  
  368 + /**
  369 + * 查看储值卡余额
  370 + * @createTime 2016年8月24日 下午10:55:03
  371 + * @author weili
  372 + */
  373 + @ApiOperation(value = "查看储值卡余额", httpMethod = "POST" ,response = GetDepositCardAmountResp.class)
  374 + @RequestMapping(value = "/getDepositCardAmount",method = RequestMethod.POST)
  375 + @ResponseBody
  376 + public void getDepositCardAmount(){
  377 + GetDepositCardAmountReq req = super.getRequest(GetDepositCardAmountReq.class);
  378 + try {
  379 + GetDepositCardAmountResp resp = userService.getDepositCardAmount(req);
  380 + super.sendSuccessResp(resp);
  381 + } catch (ServiceException e){
  382 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  383 + e.getCode(), e.getMessage(), req.getUserId()), e);
  384 + sendError(e.getCode(), e.getMessage());
  385 + } catch (Exception e) {
  386 + LOGGER.error("个人信息维护：", e);
  387 + super.sendError(e.getMessage());
  388 + }
347 389  
  390 + }
348 391  
349 392  
  393 + /**
  394 + * 查询用户信息
  395 + * GetUserInfoReq
  396 + */
  397 + @ApiOperation(value = "查询买家用户信息", httpMethod = "POST" ,response = GetDepositCardAmountResp.class)
  398 + @RequestMapping(value = "/getBuyerInfo",method = RequestMethod.POST)
  399 + @ResponseBody
  400 + public void getBuyerInfo() {
  401 + GetUserInfoReq req = getRequest(GetUserInfoReq.class);
  402 + try {
  403 + GetUserInfoResp resp = userService.getUserIntroduction(req);
  404 + super.sendSuccessResp(resp);
  405 + } catch (ServiceException e){
  406 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  407 + e.getCode(), e.getMessage(), req.getUserId()), e);
  408 + sendError(e.getCode(), e.getMessage());
  409 + } catch (Exception e) {
  410 + LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
  411 + sendError(e.getMessage());
  412 + }
  413 + }
  414 +
  415 +
  416 + /**
  417 + * 搜索买家用户信息
  418 + * GetUserInfoReq
  419 + */
  420 + @ApiOperation(value = "搜索买家用户信息", httpMethod = "POST" ,response = SearchUserInfoResp.class)
  421 + @RequestMapping(value = "/searchBuyerInfo",method = RequestMethod.POST)
  422 + @ResponseBody
  423 + public void searchBuyerInfo(@ModelAttribute SearchUserInfoReq temp) {
  424 + SearchUserInfoReq req = getRequest(SearchUserInfoReq.class);
  425 + try {
  426 + SearchUserInfoResp resp = userService.searchBuyerInfo(req);
  427 + super.sendSuccessResp(resp);
  428 + } catch (ServiceException e){
  429 + LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  430 + e.getCode(), e.getMessage(), req.getUserId()), e);
  431 + sendError(e.getCode(), e.getMessage());
  432 + } catch (Exception e) {
  433 + LOGGER.error(String.format("ErrorMessage=%s,UserId=%s", e.getMessage(), req.getUserId()), e);
  434 + sendError(e.getMessage());
  435 + }
  436 + }
  437 +
350 438  
  439 + ///**
  440 + // * 查看交易记录
  441 + // * @createTime 2016年8月24日 下午10:55:03
  442 + // * @author weili
  443 + // */
  444 + //@ApiOperation(value = "查看交易记录", httpMethod = "POST" ,response = TradeRecordResp.class)
  445 + //@RequestMapping(value = "/getTradeRecord",method = RequestMethod.POST)
  446 + //@ResponseBody
  447 + //public void getTradeRecord(){
  448 + // TradeRecordReq req = super.getRequest(TradeRecordReq.class);
  449 + // try {
  450 + // TradeRecordResp resp = userService.getTradeRecord(req);
  451 + // super.sendSuccessResp(resp);
  452 + // } catch (ServiceException e){
  453 + // LOGGER.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  454 + // e.getCode(), e.getMessage(), req.getUserId()), e);
  455 + // sendError(e.getCode(), e.getMessage());
  456 + // } catch (Exception e) {
  457 + // LOGGER.error("查看交易记录：", e);
  458 + // super.sendError(e.getMessage());
  459 + // }
  460 + //
  461 + //}
351 462  
352 463 ///**
353 464 // * 验证用户账号是否可用
354 465 // * @createTime 2014年8月28日 下午3:41:02
355   - // * @author zhangshirui
  466 + // * @author weili
356 467 // */
357 468 //@RequestMapping("/checkAccountName")
358 469 //@ResponseBody
... ... @@ -381,7 +492,7 @@ public class UserController extends BaseApiController {
381 492 /**
382 493 * 验证手机号是否已经被注册
383 494 * @createTime 2014年8月28日 下午3:41:02
384   - * @author zhangshirui
  495 + * @author weili
385 496 */
386 497 //@RequestMapping("/checkMobile")
387 498 //@ResponseBody
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/fund/FundController.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.web.api.seller.fund;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  4 +import com.diligrp.mobsite.getway.domain.protocol.fund.*;
  5 +import com.diligrp.mobsite.getway.service.seller.FundService;
  6 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  7 +import io.swagger.annotations.Api;
  8 +import io.swagger.annotations.ApiOperation;
  9 +import org.apache.log4j.Logger;
  10 +import org.springframework.stereotype.Controller;
  11 +import org.springframework.web.bind.annotation.ModelAttribute;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RequestMethod;
  14 +import org.springframework.web.bind.annotation.ResponseBody;
  15 +
  16 +import javax.annotation.Resource;
  17 +
  18 +/**
  19 + * Created by weili on 2017/1/3.
  20 + */
  21 +
  22 +@Controller
  23 +@RequestMapping(value = "/mobsiteApp/seller/fund/")
  24 +@Api(value = "/mobsiteApp/seller/fund/",description = "储值管理")
  25 +public class FundController extends BaseApiController{
  26 +
  27 +
  28 + @Resource
  29 + private FundService fundService;
  30 +
  31 + private static Logger log = Logger.getLogger( FundController.class);
  32 +
  33 + /**
  34 + * 获取储值列表
  35 + * <p/>
  36 + * 请求协议体：GetFundsReq
  37 + * 返回协议体：GetFundsResp
  38 + *
  39 + * @return
  40 + * @createTime 2017年1月3日 下午5:32:02
  41 + * @author weili
  42 + */
  43 + @ApiOperation(value = "获取储值列表", httpMethod = "POST",response = GetFundsResp.class)
  44 + @RequestMapping(value = "/getFunds",method = RequestMethod.POST)
  45 + @ResponseBody
  46 + public void getFunds() {
  47 +
  48 + GetFundsReq req = super.getRequest(GetFundsReq.class);
  49 + try {
  50 + GetFundsResp resp = fundService.getFunds(req);
  51 + super.sendSuccessResp(resp);
  52 + } catch (ServiceException e) {
  53 + log.error("获取储值列表出现业务异常", e);
  54 + super.sendError(e.getCode(), e.getMessage());
  55 + } catch (Exception e) {
  56 + log.error("获取储值列表失败", e);
  57 + super.sendError(e.getMessage());
  58 + }
  59 + }
  60 +
  61 +
  62 + /**
  63 + * 储值操作
  64 + * <p/>
  65 + * 请求协议体：GetFundsReq
  66 + * 返回协议体：GetFundsResp
  67 + *
  68 + * @return
  69 + * @createTime 2017年1月3日 下午5:32:02
  70 + * @author weili
  71 + */
  72 + @ApiOperation(value = "储值卡操作", httpMethod = "POST",response = FundTradeResp.class)
  73 + @RequestMapping(value = "/fundTrade",method = RequestMethod.POST)
  74 + @ResponseBody
  75 + public void fundTrade(@ModelAttribute FundTradeReq temp) {
  76 +
  77 + FundTradeReq req = super.getRequest(FundTradeReq.class);
  78 + try {
  79 + FundTradeResp resp = fundService.fundTrade(req);
  80 + super.sendSuccessResp(resp);
  81 + } catch (ServiceException e) {
  82 + log.error("获取储值列表出现业务异常", e);
  83 + super.sendError(e.getCode(), e.getMessage());
  84 + } catch (Exception e) {
  85 + log.error("获取储值列表失败", e);
  86 + super.sendError(e.getMessage());
  87 + }
  88 + }
  89 +
  90 +
  91 + /**
  92 + * 储值操作
  93 + * <p/>
  94 + * 请求协议体：GetFundsReq
  95 + * 返回协议体：GetFundsResp
  96 + *
  97 + * @return
  98 + * @createTime 2017年1月3日 下午5:32:02
  99 + * @author weili
  100 + */
  101 + @ApiOperation(value = "获取储值/交易记录", httpMethod = "POST",response = GetfundTradeRecordResp.class)
  102 + @RequestMapping(value = "/getfundTradeRecord",method = RequestMethod.POST)
  103 + @ResponseBody
  104 + public void getfundTradeRecord(@ModelAttribute GetfundTradeRecordReq temp) {
  105 +
  106 + GetfundTradeRecordReq req = super.getRequest(GetfundTradeRecordReq.class);
  107 + try {
  108 + GetfundTradeRecordResp resp = fundService.getfundTradeRecord(req);
  109 + super.sendSuccessResp(resp);
  110 + } catch (ServiceException e) {
  111 + log.error("获取储值列表出现业务异常", e);
  112 + super.sendError(e.getCode(), e.getMessage());
  113 + } catch (Exception e) {
  114 + log.error("获取储值列表失败", e);
  115 + super.sendError(e.getMessage());
  116 + }
  117 + }
  118 +
  119 +
  120 +}
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/logistics/SellerLogisticsController.java deleted 100644 → 0
  View file @376680f
1   -//package com.diligrp.mobsite.getway.web.api.seller.logistics;
2   -//
3   -//import javax.annotation.Resource;
4   -//
5   -//import org.apache.log4j.Logger;
6   -//import org.springframework.stereotype.Controller;
7   -//import org.springframework.web.bind.annotation.RequestMapping;
8   -//import org.springframework.web.bind.annotation.ResponseBody;
9   -//
10   -//import com.diligrp.mobsite.getway.domain.except.ServiceException;
11   -//
12   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
13   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
14   -//
15   -///**
16   -// * <B>Description</B> 卖家端物流操作 <br />
17   -// * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
18   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
19   -// * <B>Company</B> 地利集团
20   -// *
21   -// * @createTime 2015-11-25 15:51:48
22   -// * @author zhouyun
23   -// */
24   -//@Controller
25   -//@RequestMapping("/mobsiteApp/seller/logistics/")
26   -//public class SellerLogisticsController extends BaseApiController {
27   -//
28   -// @Resource
29   -// SellerLogisticsService sellerLogisticsService;
30   -//
31   -// private static Logger log = Logger
32   -// .getLogger(SellerLogisticsController.class);
33   -//
34   -// /**
35   -// * 删除物流订单
36   -// *
37   -// * @return
38   -// * @createTime 2015-11-25 16:00:43
39   -// * @author zhouyun
40   -// */
41   -// @RequestMapping("delOrder")
42   -// @ResponseBody
43   -// @DiligrpEndpoint(group = "卖家物流信息", req = DelLogisticsOrderReq.class, resp = DelLogisticsOrderResp.class, desc = "删除物流订单")
44   -// public void delOrder() {
45   -// DelLogisticsOrderReq req = super.getRequest(DelLogisticsOrderReq.class);
46   -// try {
47   -// DelLogisticsOrderResp resp = sellerLogisticsService.delOrder(req);
48   -// super.sendSuccessResp(resp);
49   -// } catch (ServiceException e) {
50   -// log.error("卖家删除物流订单出现业务异常", e);
51   -// super.sendError(e.getCode(), e.getMessage());
52   -// } catch (Exception e) {
53   -// log.error("卖家删除物流订单失败", e);
54   -// super.sendError(e.getMessage());
55   -// }
56   -// }
57   -//
58   -// /**
59   -// *
60   -// * 获取物流订单列表
61   -// *
62   -// * @return
63   -// * @createTime 2015-11-26 15:10:23
64   -// * @author zhouyun
65   -// */
66   -// @RequestMapping("getOrders")
67   -// @ResponseBody
68   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetLogisticsOrdersReq.class, resp = GetLogisticsOrdersResp.class, desc = "获取物流订单列表")
69   -// public void getOrders() {
70   -//
71   -// GetLogisticsOrdersReq req = super
72   -// .getRequest(GetLogisticsOrdersReq.class);
73   -// try {
74   -// GetLogisticsOrdersResp resp = sellerLogisticsService.getOrders(req);
75   -// super.sendSuccessResp(resp);
76   -// } catch (ServiceException e) {
77   -// log.error("卖家获取物流订单列表出现业务异常", e);
78   -// super.sendError(e.getCode(), e.getMessage());
79   -// } catch (Exception e) {
80   -// log.error("卖家获取物流订单列表失败", e);
81   -// super.sendError(e.getMessage());
82   -// }
83   -// }
84   -//
85   -// /**
86   -// *
87   -// * 获取物流订单详情
88   -// *
89   -// * @return
90   -// * @createTime 2015-11-26 16:00:43
91   -// * @author zhouyun
92   -// */
93   -// @RequestMapping("getOrderDetail")
94   -// @ResponseBody
95   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetLogisticsOrderDetailReq.class, resp = GetLogisticsOrderDetailResp.class, desc = "物流订单详情")
96   -// public void getOrderDetail() {
97   -//
98   -// GetLogisticsOrderDetailReq req = super
99   -// .getRequest(GetLogisticsOrderDetailReq.class);
100   -// try {
101   -// GetLogisticsOrderDetailResp resp = sellerLogisticsService
102   -// .getOrderDetail(req);
103   -// super.sendSuccessResp(resp);
104   -// } catch (ServiceException e) {
105   -// log.error("卖家获取物流订单详情出现业务异常", e);
106   -// super.sendError(e.getCode(), e.getMessage());
107   -// } catch (Exception e) {
108   -// log.error("卖家获取物流订单详情失败", e);
109   -// super.sendError(e.getMessage());
110   -// }
111   -// }
112   -//
113   -// /**
114   -// *
115   -// * 同意退款
116   -// *
117   -// * @return
118   -// * @createTime 2015-11-26 16:00:43
119   -// * @author zhouyun
120   -// */
121   -// @RequestMapping("agreeRefund")
122   -// @ResponseBody
123   -// @DiligrpEndpoint(group = "卖家物流信息", req = AgreeRefundReq.class, resp = AgreeRefundResp.class, desc = "同意退款")
124   -// public void agreeRefund() {
125   -//
126   -// AgreeRefundReq req = super.getRequest(AgreeRefundReq.class);
127   -// try {
128   -// AgreeRefundResp resp = sellerLogisticsService.agreeRefund(req);
129   -// super.sendSuccessResp(resp);
130   -// } catch (ServiceException e) {
131   -// log.error("卖家同意退款出现业务异常", e);
132   -// super.sendError(e.getCode(), e.getMessage());
133   -// } catch (Exception e) {
134   -// log.error("卖家同意退款失败", e);
135   -// super.sendError(e.getMessage());
136   -// }
137   -// }
138   -//
139   -// /**
140   -// *
141   -// * 确认派车
142   -// *
143   -// * @return
144   -// * @createTime 2015-11-26 16:00:43
145   -// * @author zhouyun
146   -// */
147   -// @RequestMapping("confirmSendCar")
148   -// @ResponseBody
149   -// @DiligrpEndpoint(group = "卖家物流信息", req = ConfirmSendCarReq.class, resp = ConfirmSendCarResp.class, desc = "确认派车")
150   -// public void confirmSendCar() {
151   -//
152   -// ConfirmSendCarReq req = super.getRequest(ConfirmSendCarReq.class);
153   -// try {
154   -// ConfirmSendCarResp resp = sellerLogisticsService
155   -// .confirmSendCar(req);
156   -// super.sendSuccessResp(resp);
157   -// } catch (ServiceException e) {
158   -// log.error("卖家确认派车出现业务异常", e);
159   -// super.sendError(e.getCode(), e.getMessage());
160   -// } catch (Exception e) {
161   -// log.error("卖家确认派车失败", e);
162   -// super.sendError(e.getMessage());
163   -// }
164   -// }
165   -//
166   -// /**
167   -// *
168   -// * 拒绝承运货运单
169   -// *
170   -// * @return
171   -// * @createTime 2015-11-26 19:44:43
172   -// * @author zhouyun
173   -// */
174   -// @RequestMapping("refuseCarrier")
175   -// @ResponseBody
176   -// @DiligrpEndpoint(group = "卖家物流信息", req = RefuseCarrierReq.class, resp = RefuseCarrierResp.class, desc = "拒绝承运货运单")
177   -// public void refuseCarrier() {
178   -//
179   -// RefuseCarrierReq req = super.getRequest(RefuseCarrierReq.class);
180   -// try {
181   -// RefuseCarrierResp resp = sellerLogisticsService.refuseCarrier(req);
182   -// super.sendSuccessResp(resp);
183   -// } catch (ServiceException e) {
184   -// log.error("卖家拒绝承运货运单出现业务异常", e);
185   -// super.sendError(e.getCode(), e.getMessage());
186   -// } catch (Exception e) {
187   -// log.error("卖家拒绝承运货运单失败", e);
188   -// super.sendError(e.getMessage());
189   -// }
190   -// }
191   -//
192   -// /**
193   -// *
194   -// * 评价货主
195   -// *
196   -// * @return
197   -// * @createTime 2015-11-26 20:01:43
198   -// * @author zhouyun
199   -// */
200   -// @RequestMapping("evaluateBuyer")
201   -// @ResponseBody
202   -// @DiligrpEndpoint(group = "卖家物流信息", req = EvaluateBuyerReq.class, resp = EvaluateBuyerResp.class, desc = "评价货主")
203   -// public void evaluateBuyer() {
204   -//
205   -// EvaluateBuyerReq req = super.getRequest(EvaluateBuyerReq.class);
206   -// try {
207   -// EvaluateBuyerResp resp = sellerLogisticsService.evaluateBuyer(req);
208   -// super.sendSuccessResp(resp);
209   -// } catch (ServiceException e) {
210   -// log.error("卖家评价货主出现业务异常", e);
211   -// super.sendError(e.getCode(), e.getMessage());
212   -// } catch (Exception e) {
213   -// log.error("卖家评价货主失败", e);
214   -// super.sendError(e.getMessage());
215   -// }
216   -// }
217   -//
218   -// /**
219   -// *
220   -// * 获取物流店铺详情
221   -// *
222   -// * @return
223   -// * @createTime 2015-11-26 20:01:43
224   -// * @author zhouyun
225   -// */
226   -// @RequestMapping("getShopInfo")
227   -// @ResponseBody
228   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetShopInfoReq.class, resp = GetShopInfoResp.class, desc = "获取物流店铺详情")
229   -// public void getShopInfo() {
230   -//
231   -// GetShopInfoReq req = super.getRequest(GetShopInfoReq.class);
232   -// try {
233   -// GetShopInfoResp resp = sellerLogisticsService.getShopInfo(req);
234   -// super.sendSuccessResp(resp);
235   -// } catch (ServiceException e) {
236   -// log.error("卖家获取物流店铺详情出现业务异常", e);
237   -// super.sendError(e.getCode(), e.getMessage());
238   -// } catch (Exception e) {
239   -// log.error("卖家获取物流店铺详情失败", e);
240   -// super.sendError(e.getMessage());
241   -// }
242   -// }
243   -//
244   -// /**
245   -// *
246   -// * 卖家端首页信息
247   -// *
248   -// * @return
249   -// * @createTime 2015-11-26 20:01:43
250   -// * @author zhouyun
251   -// */
252   -// @RequestMapping("getIndexInfo")
253   -// @ResponseBody
254   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetIndexInfoReq.class, resp = GetIndexInfoResp.class, desc = "卖家端首页信息")
255   -// public void getIndexInfo() {
256   -//
257   -// GetIndexInfoReq req = super.getRequest(GetIndexInfoReq.class);
258   -// try {
259   -// GetIndexInfoResp resp = sellerLogisticsService.getIndexInfo(req);
260   -// super.sendSuccessResp(resp);
261   -// } catch (ServiceException e) {
262   -// log.error("卖家端首页信息出现业务异常", e);
263   -// super.sendError(e.getCode(), e.getMessage());
264   -// } catch (Exception e) {
265   -// log.error("卖家端首页信息失败", e);
266   -// super.sendError(e.getMessage());
267   -// }
268   -// }
269   -//
270   -// /**
271   -// *
272   -// * 获取维护的线路列表
273   -// *
274   -// * @return
275   -// * @createTime 2015-11-26 20:01:43
276   -// * @author zhouyun
277   -// */
278   -// @RequestMapping("getLines")
279   -// @ResponseBody
280   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetLinesReq.class, resp = GetLinesResp.class, desc = "获取维护的线路列表")
281   -// public void getLines() {
282   -//
283   -// GetLinesReq req = super.getRequest(GetLinesReq.class);
284   -// try {
285   -// GetLinesResp resp = sellerLogisticsService.getLines(req);
286   -// super.sendSuccessResp(resp);
287   -// } catch (ServiceException e) {
288   -// log.error("卖家获取线路列表出现业务异常", e);
289   -// super.sendError(e.getCode(), e.getMessage());
290   -// } catch (Exception e) {
291   -// log.error("卖家获取线路列表失败", e);
292   -// super.sendError(e.getMessage());
293   -// }
294   -// }
295   -//
296   -// /**
297   -// *
298   -// * 获取车辆列表
299   -// *
300   -// * @return
301   -// * @createTime 2015-11-26 20:01:43
302   -// * @author zhouyun
303   -// */
304   -// @RequestMapping("getVehicles")
305   -// @ResponseBody
306   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetVehiclesReq.class, resp = GetVehiclesResp.class, desc = "获取车辆列表")
307   -// public void getVehicles() {
308   -//
309   -// GetVehiclesReq req = super.getRequest(GetVehiclesReq.class);
310   -// try {
311   -// GetVehiclesResp resp = sellerLogisticsService.getVehicles(req);
312   -// super.sendSuccessResp(resp);
313   -// } catch (ServiceException e) {
314   -// log.error("卖家获取车辆列表出现业务异常", e);
315   -// super.sendError(e.getCode(), e.getMessage());
316   -// } catch (Exception e) {
317   -// log.error("卖家获取车辆列表失败", e);
318   -// super.sendError(e.getMessage());
319   -// }
320   -// }
321   -//
322   -// /**
323   -// *
324   -// * 评价记录列表
325   -// *
326   -// * @return
327   -// * @createTime 2015-11-27 10:59:46
328   -// * @author zhouyun
329   -// */
330   -// @RequestMapping("getComments")
331   -// @ResponseBody
332   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetCommentsReq.class, resp = GetCommentsResp.class, desc = "评价记录列表")
333   -// public void getComments() {
334   -//
335   -// GetCommentsReq req = super.getRequest(GetCommentsReq.class);
336   -// try {
337   -// GetCommentsResp resp = sellerLogisticsService.getComments(req);
338   -// super.sendSuccessResp(resp);
339   -// } catch (ServiceException e) {
340   -// log.error("卖家获取评价记录列表出现业务异常", e);
341   -// super.sendError(e.getCode(), e.getMessage());
342   -// } catch (Exception e) {
343   -// log.error("卖家获取评价记录列表失败", e);
344   -// super.sendError(e.getMessage());
345   -// }
346   -// }
347   -//
348   -// /**
349   -// *
350   -// * 批量删除线路
351   -// *
352   -// * @return
353   -// * @createTime 2015-11-27 10:59:46
354   -// * @author zhouyun
355   -// */
356   -// @RequestMapping("deleteLines")
357   -// @ResponseBody
358   -// @DiligrpEndpoint(group = "卖家物流信息", req = DeleteLinesReq.class, resp = DeleteLinesResp.class, desc = "批量删除线路")
359   -// public void deleteLines() {
360   -//
361   -// DeleteLinesReq req = super.getRequest(DeleteLinesReq.class);
362   -// try {
363   -// DeleteLinesResp resp = sellerLogisticsService.deleteLines(req);
364   -// super.sendSuccessResp(resp);
365   -// } catch (ServiceException e) {
366   -// log.error("卖家批量删除线路出现业务异常", e);
367   -// super.sendError(e.getCode(), e.getMessage());
368   -// } catch (Exception e) {
369   -// log.error("卖家获批量删除线路失败", e);
370   -// super.sendError(e.getMessage());
371   -// }
372   -// }
373   -//
374   -// /**
375   -// *
376   -// * 添加物流线路
377   -// *
378   -// * @return
379   -// * @createTime 2015-11-27 10:59:46
380   -// * @author zhouyun
381   -// */
382   -// @RequestMapping("addLine")
383   -// @ResponseBody
384   -// @DiligrpEndpoint(group = "卖家物流信息", req = AddLineReq.class, resp = AddLineResp.class, desc = "添加物流线路")
385   -// public void addLine() {
386   -//
387   -// AddLineReq req = super.getRequest(AddLineReq.class);
388   -// try {
389   -// AddLineResp resp = sellerLogisticsService.addLine(req);
390   -// super.sendSuccessResp(resp);
391   -// } catch (ServiceException e) {
392   -// log.error("卖家添加物流线路出现业务异常", e);
393   -// super.sendError(e.getCode(), e.getMessage());
394   -// } catch (Exception e) {
395   -// log.error("卖家添加物流线路失败", e);
396   -// super.sendError(e.getMessage());
397   -// }
398   -// }
399   -//
400   -// /**
401   -// *
402   -// * 获取退款信息
403   -// *
404   -// * @return
405   -// * @createTime 2015-11-27 10:59:46
406   -// * @author zhouyun
407   -// */
408   -// @RequestMapping("getRefund")
409   -// @ResponseBody
410   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetRefundReq.class, resp = GetRefundResp.class, desc = "获取退款信息")
411   -// public void getRefund() {
412   -//
413   -// GetRefundReq req = super.getRequest(GetRefundReq.class);
414   -// try {
415   -// GetRefundResp resp = sellerLogisticsService.getRefund(req);
416   -// super.sendSuccessResp(resp);
417   -// } catch (ServiceException e) {
418   -// log.error("卖家获取退款信息出现业务异常", e);
419   -// super.sendError(e.getCode(), e.getMessage());
420   -// } catch (Exception e) {
421   -// log.error("卖家获取退款信息失败", e);
422   -// super.sendError(e.getMessage());
423   -// }
424   -// }
425   -//
426   -// /**
427   -// *
428   -// * 修改车辆信息
429   -// *
430   -// * @return
431   -// * @createTime 2015-11-27 10:59:46
432   -// * @author zhouyun
433   -// */
434   -// @RequestMapping("updateVehicle")
435   -// @ResponseBody
436   -// @DiligrpEndpoint(group = "卖家物流信息", req = UpdateVehicleReq.class, resp = UpdateVehicleResp.class, desc = "修改车辆信息")
437   -// public void updateVehicle() {
438   -//
439   -// UpdateVehicleReq req = super.getRequest(UpdateVehicleReq.class);
440   -// try {
441   -// UpdateVehicleResp resp = sellerLogisticsService.updateVehicle(req);
442   -// super.sendSuccessResp(resp);
443   -// } catch (ServiceException e) {
444   -// log.error("卖家修改车辆信息出现业务异常", e);
445   -// super.sendError(e.getCode(), e.getMessage());
446   -// } catch (Exception e) {
447   -// log.error("卖家修改车辆信息失败", e);
448   -// super.sendError(e.getMessage());
449   -// }
450   -// }
451   -//
452   -// /**
453   -// *
454   -// * 删除车辆
455   -// *
456   -// * @return
457   -// * @createTime 2015-11-27 10:59:46
458   -// * @author zhouyun
459   -// */
460   -// @RequestMapping("delVehicle")
461   -// @ResponseBody
462   -// @DiligrpEndpoint(group = "卖家物流信息", req = DelVehicleReq.class, resp = DelVehicleResp.class, desc = "删除车辆")
463   -// public void delVehicle() {
464   -//
465   -// DelVehicleReq req = super.getRequest(DelVehicleReq.class);
466   -// try {
467   -// DelVehicleResp resp = sellerLogisticsService.delVehicle(req);
468   -// super.sendSuccessResp(resp);
469   -// } catch (ServiceException e) {
470   -// log.error("卖家删除车辆出现业务异常", e);
471   -// super.sendError(e.getCode(), e.getMessage());
472   -// } catch (Exception e) {
473   -// log.error("卖家删除车辆失败", e);
474   -// super.sendError(e.getMessage());
475   -// }
476   -// }
477   -//
478   -// /**
479   -// *
480   -// * 新增车辆
481   -// *
482   -// * @return
483   -// * @createTime 2015-11-27 10:59:46
484   -// * @author zhouyun
485   -// */
486   -// @RequestMapping("addVehicle")
487   -// @ResponseBody
488   -// @DiligrpEndpoint(group = "卖家物流信息", req = AddVehicleReq.class, resp = AddVehicleResp.class, desc = "新增车辆")
489   -// public void addVehicle() {
490   -//
491   -// AddVehicleReq req = super.getRequest(AddVehicleReq.class);
492   -// try {
493   -// AddVehicleResp resp = sellerLogisticsService.addVehicle(req);
494   -// super.sendSuccessResp(resp);
495   -// } catch (ServiceException e) {
496   -// log.error("卖家新增车辆出现业务异常", e);
497   -// super.sendError(e.getCode(), e.getMessage());
498   -// } catch (Exception e) {
499   -// log.error("卖家新增车辆失败", e);
500   -// super.sendError(e.getMessage());
501   -// }
502   -// }
503   -//
504   -// /**
505   -// *
506   -// * 获取车辆信息
507   -// *
508   -// * @return
509   -// * @createTime 2015-11-27 10:59:46
510   -// * @author zhouyun
511   -// */
512   -// @RequestMapping("getVehicleInfo")
513   -// @ResponseBody
514   -// @DiligrpEndpoint(group = "卖家物流信息", req = GetVehicleInfoReq.class, resp = GetVehicleInfoResp.class, desc = "获取车辆信息")
515   -// public void getVehicleInfo() {
516   -//
517   -// GetVehicleInfoReq req = super.getRequest(GetVehicleInfoReq.class);
518   -// try {
519   -// GetVehicleInfoResp resp = sellerLogisticsService.getVehicleInfo(req);
520   -// super.sendSuccessResp(resp);
521   -// } catch (ServiceException e) {
522   -// log.error("卖家获取车辆信息出现业务异常", e);
523   -// super.sendError(e.getCode(), e.getMessage());
524   -// } catch (Exception e) {
525   -// log.error("卖家获取车辆信息失败", e);
526   -// super.sendError(e.getMessage());
527   -// }
528   -// }
529   -//
530   -//
531   -//}
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/order/SellerOrderController.java
  View file @63e8b05
1   -//package com.diligrp.mobsite.getway.web.api.seller.order;
2   -//
3   -//import com.diligrp.mobsite.getway.domain.except.ServiceException;
4   -//import com.diligrp.mobsite.getway.domain.protocol.order.GetRefundDetailReq;
5   -//import com.diligrp.mobsite.getway.domain.protocol.saler.order.*;
6   -//import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
7   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
8   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
9   -//
10   -//import org.apache.log4j.Logger;
11   -//import org.springframework.stereotype.Controller;
12   -//import org.springframework.web.bind.annotation.RequestMapping;
13   -//import org.springframework.web.bind.annotation.ResponseBody;
14   -//
15   -//import javax.annotation.Resource;
16   -//
17   -//
18   -///**
19   -// * <B>Description</B> 订单操作 <br />
20   -// * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
21   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
22   -// * <B>Company</B> 地利集团
23   -// * @createTime 2014年9月1日 下午2:30:41
24   -// * @author duanyugen
25   -// */
26   -//@Controller
27   -//@RequestMapping("/mobsiteApp/seller/order/")
28   -//public class SellerOrderController extends BaseApiController {
29   -//
30   -// @Resource
31   -// private SellerOrderService sellerOrderService;
32   -//
33   -// private static Logger log = Logger.getLogger(SellerOrderController.class);
34   -//
35   -// /**
36   -// * 获取订单列表
37   -// * <p/>
38   -// * 请求协议体：GetOrderListReq
39   -// * 返回协议体：GetOrderListResp
40   -// *
41   -// * @return
42   -// * @createTime 2014年9月1日 下午5:32:02
43   -// * @author duanyugen
44   -// */
45   -// @RequestMapping("getOrders")
46   -// @ResponseBody
47   -// @DiligrpEndpoint(group = "订单信息", req = GetOrderListReq.class, resp = GetOrderListResp.class, desc = "获取订单列表")
48   -// public void getOrders() {
49   -//
50   -// GetOrderListReq req = super.getRequest(GetOrderListReq.class);
51   -// try {
52   -// GetOrderListResp resp = sellerOrderService.getOrders(req);
53   -// super.sendSuccessResp(resp);
54   -// } catch (ServiceException e) {
55   -// log.error("获取订单列表出现业务异常", e);
56   -// super.sendError(e.getCode(), e.getMessage());
57   -// } catch (Exception e) {
58   -// log.error("获取订单列表失败", e);
59   -// super.sendError(e.getMessage());
60   -// }
61   -// }
62   -//
63   -// /**
64   -// * 根据订单id查询订单
65   -// * <p/>
66   -// * 请求协议体：GetOrderReq
67   -// * 返回协议体：GetOrderResp
68   -// *
69   -// * @createTime 2014年9月1日 下午6:39:10
70   -// * @author duanyugen
71   -// */
72   -// @RequestMapping("getOrderById")
73   -// @ResponseBody
74   -// @DiligrpEndpoint(group = "订单信息", req = GetOrderDetailReq.class, resp = GetOrderDetailResp.class, desc = "根据订单id查询订单详情")
75   -// public void getOrderById() {
76   -//
77   -// GetOrderDetailReq req = super.getRequest(GetOrderDetailReq.class);
78   -// try {
79   -// GetOrderDetailResp resp = sellerOrderService.getOrderById(req);
80   -// super.sendSuccessResp(resp);
81   -// } catch (ServiceException e) {
82   -// log.error("获取订单详情出现业务异常", e);
83   -// super.sendError(e.getCode(), e.getMessage());
84   -// } catch (Exception e) {
85   -// log.error("获取订单详情失败", e);
86   -// super.sendError(e.getMessage());
87   -// }
88   -// }
89   -//
90   -//
91   -// /**
92   -// * 完成备货
93   -// * <p/>
94   -// * 请求协议体：OperateOrderCommonReq
95   -// * 返回协议体：OperateOrderCommonResp
96   -// *
97   -// * @createTime 2014年9月1日 下午6:16:05
98   -// * @author duanyugen
99   -// */
100   -// @RequestMapping("makeGoodsReady")
101   -// @ResponseBody
102   -// @DiligrpEndpoint(group = "完成备货", req = OperateOrderCommonReq.class, resp = OperateOrderCommonResp.class, desc = "完成备货")
103   -// public void makeGoodsReady() {
104   -// OperateOrderCommonReq req = super.getRequest(OperateOrderCommonReq.class);
105   -// try {
106   -// OperateOrderCommonResp resp = sellerOrderService.makeGoodsReady(req);
107   -// super.sendSuccessResp(resp);
108   -// } catch (ServiceException e) {
109   -// log.error("完成备货出现业务异常", e);
110   -// super.sendError(e.getCode(), e.getMessage());
111   -// } catch (Exception e) {
112   -// log.error("完成备货失败", e);
113   -// super.sendError(e.getMessage());
114   -// }
115   -// }
116   -//
117   -// /**
118   -// * 处理退款
119   -// * <p/>
120   -// * 请求协议体：AuditApplyRefundReq
121   -// * 返回协议体：OperateOrderCommonResp
122   -// *
123   -// * @createTime 2014年9月1日 下午6:16:05
124   -// * @author duanyugen
125   -// */
126   -// @RequestMapping("auditApplyRefund")
127   -// @ResponseBody
128   -// @DiligrpEndpoint(group = "处理退款", req = AuditApplyRefundReq.class, resp = OperateOrderCommonResp.class, desc = "处理退款")
129   -// public void auditApplyRefund() {
130   -// AuditApplyRefundReq req = super.getRequest(AuditApplyRefundReq.class);
131   -// try {
132   -// OperateOrderCommonResp resp = sellerOrderService.auditApplyRefund(req);
133   -// super.sendSuccessResp(resp);
134   -// } catch (ServiceException e) {
135   -// log.error("处理退款申请出现业务异常", e);
136   -// super.sendError(e.getCode(), e.getMessage());
137   -// } catch (Exception e) {
138   -// log.error("处理退款申请失败", e);
139   -// super.sendError(e.getMessage());
140   -// }
141   -// }
142   -//
143   -// /**
144   -// * 取消订单
145   -// * <p/>
146   -// * 请求协议体：SellerCancelOrderReq
147   -// * 返回协议体：OperateOrderCommonResp
148   -// *
149   -// * @createTime 2014年9月1日 下午6:16:05
150   -// * @author duanyugen
151   -// */
152   -// @RequestMapping("cancelOrder")
153   -// @ResponseBody
154   -// @DiligrpEndpoint(group = "取消订单", req = SellerCancelOrderReq.class, resp = OperateOrderCommonResp.class, desc = "取消订单")
155   -// public void cancelOrder() {
156   -// SellerCancelOrderReq req = super.getRequest(SellerCancelOrderReq.class);
157   -// try {
158   -// OperateOrderCommonResp resp = sellerOrderService.cancelOrder(req);
159   -// super.sendSuccessResp(resp);
160   -// } catch (ServiceException e) {
161   -// log.error("取消订单出现业务异常", e);
162   -// super.sendError(e.getCode(), e.getMessage());
163   -// } catch (Exception e) {
164   -// log.error("取消订单失败", e);
165   -// super.sendError(e.getMessage());
166   -// }
167   -// }
168   -//
169   -// /**
170   -// * 确认收款
171   -// * <p/>
172   -// * 请求协议体：OperateOrderCommonReq
173   -// * 返回协议体：OperateOrderCommonResp
174   -// *
175   -// * @createTime 2014年9月1日 下午6:16:05
176   -// * @author duanyugen
177   -// */
178   -// @RequestMapping("comfirmReceiveMoney")
179   -// @ResponseBody
180   -// @DiligrpEndpoint(group = "订单信息", req = OperateOrderCommonReq.class, resp = OperateOrderCommonResp.class, desc = "确认收款")
181   -// public void comfirmReceiveMoney() {
182   -// OperateOrderCommonReq req = super.getRequest(OperateOrderCommonReq.class);
183   -// try {
184   -// OperateOrderCommonResp resp = sellerOrderService.comfirmReceiveMoney(req);
185   -// super.sendSuccessResp(resp);
186   -// } catch (ServiceException e) {
187   -// log.error("确认收款异常", e);
188   -// super.sendError(e.getCode(), e.getMessage());
189   -// } catch (Exception e) {
190   -// log.error("确认收款失败", e);
191   -// super.sendError(e.getMessage());
192   -// }
193   -// }
194   -//
195   -// /**
196   -// * 现场交易确认收款
197   -// * <p/>
198   -// * 请求协议体：OperateOrderCommonReq
199   -// * 返回协议体：OperateOrderCommonResp
200   -// *
201   -// * @createTime 2014年9月1日 下午6:16:05
202   -// * @author duanyugen
203   -// */
204   -// @RequestMapping("confirmSpotMoney")
205   -// @ResponseBody
206   -// @DiligrpEndpoint(group = "现场交易确认收款", req = OperateOrderCommonReq.class, resp = OperateOrderCommonResp.class, desc = "现场交易确认收款")
207   -// public void confirmSpotMoney() {
208   -// OperateOrderCommonReq req = super.getRequest(OperateOrderCommonReq.class);
209   -// try {
210   -// OperateOrderCommonResp resp = sellerOrderService.comfirmSpotMoney(req);
211   -// super.sendSuccessResp(resp);
212   -// } catch (ServiceException e) {
213   -// log.error("现场交易确认收款异常", e);
214   -// super.sendError(e.getCode(), e.getMessage());
215   -// } catch (Exception e) {
216   -// log.error("现场交易确认收款失败", e);
217   -// super.sendError(e.getMessage());
218   -// }
219   -// }
220   -//
221   -// /**
222   -// * 确认发货
223   -// * <p/>
224   -// * 请求协议体：OperateOrderCommonReq
225   -// * 返回协议体：OperateOrderCommonResp
226   -// *
227   -// * @createTime 2014年9月1日 下午6:16:05
228   -// * @author duanyugen
229   -// */
230   -// @RequestMapping("confirmDelivery")
231   -// @ResponseBody
232   -// @DiligrpEndpoint(group = "确认发货", req = ConfirmDeliveryReq.class, resp = OperateOrderCommonResp.class, desc = "确认发货")
233   -// public void confirmDelivery() {
234   -// ConfirmDeliveryReq req = super.getRequest(ConfirmDeliveryReq.class);
235   -// try {
236   -// OperateOrderCommonResp resp = sellerOrderService.confirmDelivery(req);
237   -// super.sendSuccessResp(resp);
238   -// } catch (ServiceException e) {
239   -// log.error("确认发货异常", e);
240   -// super.sendError(e.getCode(), e.getMessage());
241   -// } catch (Exception e) {
242   -// log.error("确认发货失败", e);
243   -// super.sendError(e.getMessage());
244   -// }
245   -// }
246   -//
247   -// /**
248   -// * 修改订单
249   -// * <p/>
250   -// * 请求协议体：ModifyOrderPriceReq
251   -// * 返回协议体：OperateOrderCommonResp
252   -// *
253   -// * @createTime 2014年9月1日 下午6:16:05
254   -// * @author duanyugen
255   -// */
256   -// @RequestMapping("modifyOrderPrice")
257   -// @ResponseBody
258   -// @DiligrpEndpoint(group = "修改订单", req = ModifyOrderPriceReq.class, resp = OperateOrderCommonResp.class, desc = "修改订单")
259   -// public void modifyOrderPrice() {
260   -// ModifyOrderPriceReq req = super.getRequest(ModifyOrderPriceReq.class);
261   -// try {
262   -// OperateOrderCommonResp resp = sellerOrderService.modifyOrderPrice(req);
263   -// super.sendSuccessResp(resp);
264   -// } catch (ServiceException e) {
265   -// log.error("修改订单价格异常", e);
266   -// super.sendError(e.getCode(), e.getMessage());
267   -// } catch (Exception e) {
268   -// log.error("修改订单价格失败", e);
269   -// super.sendError(e.getMessage());
270   -// }
271   -// }
272   -//
273   -// /**
274   -// * 获取订单汇总信息
275   -// * <p/>
276   -// * 请求协议体：GetSellerOrderSumInfoReq
277   -// * 返回协议体：OperateOrderCommonResp
278   -// *
279   -// * @createTime 2014年9月1日 下午6:16:05
280   -// * @author duanyugen
281   -// */
282   -// @RequestMapping("getOrderSumInfo")
283   -// @ResponseBody
284   -// @DiligrpEndpoint(group = "获取订单汇总信息", req = GetSellerOrderSumInfoReq.class, resp = GetSellerOrderSumInfoResp.class, desc = "获取订单汇总信息")
285   -// public void getOrderSumInfo() {
286   -// GetSellerOrderSumInfoReq req = super.getRequest(GetSellerOrderSumInfoReq.class);
287   -// try {
288   -// GetSellerOrderSumInfoResp resp = sellerOrderService.getOrderSumInfo(req);
289   -// super.sendSuccessResp(resp);
290   -// } catch (ServiceException e) {
291   -// log.error("获取订单汇总信息异常", e);
292   -// super.sendError(e.getCode(), e.getMessage());
293   -// } catch (Exception e) {
294   -// log.error("获取订单汇总信息失败", e);
295   -// super.sendError(e.getMessage());
296   -// }
297   -// }
298   -//
299   -// /**
300   -// * 审核赊账
301   -// * <p/>
302   -// * 请求协议体：AuditCreditOrderReq
303   -// * 返回协议体：OperateOrderCommonResp
304   -// *
305   -// * @createTime 2014年9月1日 下午6:16:05
306   -// * @author duanyugen
307   -// */
308   -// @RequestMapping("auditCreditOrder")
309   -// @ResponseBody
310   -// @DiligrpEndpoint(group = "确认发货", req = AuditCreditOrderReq.class, resp = OperateOrderCommonResp.class, desc = "审核赊账")
311   -// public void auditCreditOrder() {
312   -// AuditCreditOrderReq req = super.getRequest(AuditCreditOrderReq.class);
313   -// try {
314   -// OperateOrderCommonResp resp = sellerOrderService.auditCreditOrder(req);
315   -// super.sendSuccessResp(resp);
316   -// } catch (ServiceException e) {
317   -// log.error("审核赊账异常", e);
318   -// super.sendError(e.getCode(), e.getMessage());
319   -// } catch (Exception e) {
320   -// log.error("审核赊账失败", e);
321   -// super.sendError(e.getMessage());
322   -// }
323   -// }
324   -//
325   -// /**
326   -// * 获取退款单列表
327   -// * <p/>
328   -// *
329   -// * @createTime 2014年9月1日 下午6:16:05
330   -// * @author duanyugen
331   -// */
332   -// @RequestMapping("getRefundOrders")
333   -// @ResponseBody
334   -// @DiligrpEndpoint(group = "获取退款单列表", req = GetSellerRefundOrderListReq.class, resp = GetSellerRefundOrderListResp.class, desc = "获取退款单列表")
335   -// public void getRefundOrders() {
336   -// GetSellerRefundOrderListReq req = super.getRequest(GetSellerRefundOrderListReq.class);
337   -// try {
338   -// GetSellerRefundOrderListResp resp = sellerOrderService.getRefundOrders(req);
339   -// super.sendSuccessResp(resp);
340   -// } catch (ServiceException e) {
341   -// log.error("获取退款单列表异常", e);
342   -// super.sendError(e.getCode(), e.getMessage());
343   -// } catch (Exception e) {
344   -// log.error("获取退款单列表失败", e);
345   -// super.sendError(e.getMessage());
346   -// }
347   -// }
348   -//
349   -// /**
350   -// * 获取退款单详情
351   -// * <p/>
352   -// *
353   -// * @createTime 2014年9月1日 下午6:16:05
354   -// * @author duanyugen
355   -// */
356   -// @RequestMapping("getRefundDetail")
357   -// @ResponseBody
358   -// @DiligrpEndpoint(group = "获取退款单详情", req = GetRefundDetailReq.class, resp = GetSellerRefundDetailResp.class, desc = "获取退款单详情")
359   -// public void getRefundDetail() {
360   -// GetRefundDetailReq req = super.getRequest(GetRefundDetailReq.class);
361   -// try {
362   -// GetSellerRefundDetailResp resp = sellerOrderService.getRefundDetail(req);
363   -// super.sendSuccessResp(resp);
364   -// } catch (ServiceException e) {
365   -// log.error("获取退款单详情异常", e);
366   -// super.sendError(e.getCode(), e.getMessage());
367   -// } catch (Exception e) {
368   -// log.error("获取退款单详情失败", e);
369   -// super.sendError(e.getMessage());
370   -// }
371   -// }
372   -//}
373 1 \ No newline at end of file
  2 +package com.diligrp.mobsite.getway.web.api.seller.order;
  3 +
  4 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  5 +import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
  6 +import com.diligrp.mobsite.getway.domain.protocol.order.CancelOrderResp;
  7 +import com.diligrp.mobsite.getway.domain.protocol.saler.order.*;
  8 +import com.diligrp.mobsite.getway.service.seller.SellerOrderService;
  9 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  10 +import io.swagger.annotations.Api;
  11 +import io.swagger.annotations.ApiOperation;
  12 +import org.apache.log4j.Logger;
  13 +import org.springframework.stereotype.Controller;
  14 +import org.springframework.web.bind.annotation.ModelAttribute;
  15 +import org.springframework.web.bind.annotation.RequestMapping;
  16 +import org.springframework.web.bind.annotation.RequestMethod;
  17 +import org.springframework.web.bind.annotation.ResponseBody;
  18 +
  19 +import javax.annotation.Resource;
  20 +
  21 +
  22 +/**
  23 + * <B>Description</B> 订单操作 <br />
  24 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  25 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  26 + * <B>Company</B> 地利集团
  27 + * @createTime 2014年9月1日 下午2:30:41
  28 + * @author weili
  29 + */
  30 +@Controller
  31 +@RequestMapping("/mobsiteApp/seller/order/")
  32 +@Api(value = "/mobsiteApp/seller/order", description = "订单接口-卖家")
  33 +public class SellerOrderController extends BaseApiController {
  34 +
  35 + @Resource
  36 + private SellerOrderService sellerOrderService;
  37 +
  38 + private static Logger log = Logger.getLogger(SellerOrderController.class);
  39 +
  40 + /**
  41 + * 获取订单列表
  42 + * <p/>
  43 + * 请求协议体：GetOrderListReq
  44 + * 返回协议体：GetOrderListResp
  45 + *
  46 + * @return
  47 + * @createTime 2017年1月3日 下午5:32:02
  48 + * @author weili
  49 + */
  50 + @ApiOperation(value = "获取订单列表", httpMethod = "POST",response = GetOrderListResp.class)
  51 + @RequestMapping(value = "/getOrders",method = RequestMethod.POST)
  52 + @ResponseBody
  53 + public void getOrders(@ModelAttribute GetOrderListReq temp) {
  54 +
  55 + GetOrderListReq req = super.getRequest(GetOrderListReq.class);
  56 + try {
  57 + GetOrderListResp resp = sellerOrderService.getOrders(req);
  58 + super.sendSuccessResp(resp);
  59 + } catch (ServiceException e) {
  60 + log.error("获取订单列表出现业务异常", e);
  61 + super.sendError(e.getCode(), e.getMessage());
  62 + } catch (Exception e) {
  63 + log.error("获取订单列表失败", e);
  64 + super.sendError(e.getMessage());
  65 + }
  66 + }
  67 +
  68 + /**
  69 + * 根据订单id查询订单
  70 + * <p/>
  71 + * 请求协议体：GetOrderReq
  72 + * 返回协议体：GetOrderResp
  73 + *
  74 + * @createTime 2014年9月1日 下午6:39:10
  75 + * @author weili
  76 + */
  77 + @ApiOperation(value = "根据订单id查询订单", httpMethod = "POST",response = GetOrderDetailResp.class)
  78 + @RequestMapping(value = "/getOrderById",method = RequestMethod.POST)
  79 + @ResponseBody
  80 + public void getOrderById(@ModelAttribute GetOrderDetailReq temp) {
  81 +
  82 + GetOrderDetailReq req = super.getRequest(GetOrderDetailReq.class);
  83 + try {
  84 + GetOrderDetailResp resp = sellerOrderService.getOrderById(req);
  85 + super.sendSuccessResp(resp);
  86 + } catch (ServiceException e) {
  87 + log.error("获取订单详情出现业务异常", e);
  88 + super.sendError(e.getCode(), e.getMessage());
  89 + } catch (Exception e) {
  90 + log.error("获取订单详情失败", e);
  91 + super.sendError(e.getMessage());
  92 + }
  93 + }
  94 +
  95 +
  96 + /**
  97 + * 搜索订单列表
  98 + * <p/>
  99 + * 请求协议体：GetOrderListReq
  100 + * 返回协议体：GetOrderListResp
  101 + *
  102 + * @return
  103 + * @createTime 2017年1月3日 下午5:32:02
  104 + * @author weili
  105 + */
  106 + @ApiOperation(value = "搜索订单列表", httpMethod = "POST",response = SearchOrderListResp.class)
  107 + @RequestMapping(value = "/searchOrders",method = RequestMethod.POST)
  108 + @ResponseBody
  109 + public void searchOrders(@ModelAttribute SearchOrderListReq temp) {
  110 +
  111 + SearchOrderListReq req = super.getRequest(SearchOrderListReq.class);
  112 + try {
  113 + SearchOrderListResp resp = sellerOrderService.searchOrders(req);
  114 + super.sendSuccessResp(resp);
  115 + } catch (ServiceException e) {
  116 + log.error("获取订单列表出现业务异常", e);
  117 + super.sendError(e.getCode(), e.getMessage());
  118 + } catch (Exception e) {
  119 + log.error("获取订单列表失败", e);
  120 + super.sendError(e.getMessage());
  121 + }
  122 + }
  123 +
  124 + /**
  125 + * 确认收款
  126 + * <p/>
  127 + * 请求协议体：OperateOrderCommonReq
  128 + * 返回协议体：OperateOrderCommonResp
  129 + *
  130 + * @createTime 2014年9月1日 下午6:16:05
  131 + * @author weili
  132 + */
  133 + @ApiOperation(value = "确认收款", httpMethod = "POST",response = ConfirmReceiptMoneyResp.class)
  134 + @RequestMapping(value = "/comfirmReceiveMoney",method = RequestMethod.POST)
  135 + @ResponseBody
  136 + public void comfirmReceiveMoney(@ModelAttribute ConfirmReceiptMoneyReq temp) {
  137 + ConfirmReceiptMoneyReq req = super.getRequest(ConfirmReceiptMoneyReq.class);
  138 + try {
  139 + ConfirmReceiptMoneyResp resp = sellerOrderService.comfirmReceiveMoney(req);
  140 + super.sendSuccessResp(resp);
  141 + } catch (ServiceException e) {
  142 + log.error("确认收款异常", e);
  143 + super.sendError(e.getCode(), e.getMessage());
  144 + } catch (Exception e) {
  145 + log.error("确认收款失败", e);
  146 + super.sendError(e.getMessage());
  147 + }
  148 + }
  149 +
  150 +
  151 +
  152 +
  153 + /**
  154 + * 接单
  155 + * <p/>
  156 + * 请求协议体：takeOrderReq
  157 + * 返回协议体：OperateOrderCommonResp
  158 + *
  159 + * @createTime 2014年9月1日 下午6:16:05
  160 + * @author weili
  161 + */
  162 + @ApiOperation(value = "接单", httpMethod = "POST",response = CancelOrderResp.class)
  163 + @RequestMapping(value = "/takeOrder",method = RequestMethod.POST)
  164 + @ResponseBody
  165 + public void takeOrder(@ModelAttribute takeOrderReq temp) {
  166 + takeOrderReq req = super.getRequest(takeOrderReq.class);
  167 + try {
  168 + BaseResp resp = sellerOrderService.takeOrder(req);
  169 + super.sendSuccessResp(resp);
  170 + } catch (ServiceException e) {
  171 + log.error("接单异常", e);
  172 + super.sendError(e.getCode(), e.getMessage());
  173 + } catch (Exception e) {
  174 + log.error("接单失败", e);
  175 + super.sendError(e.getMessage());
  176 + }
  177 + }
  178 +
  179 +
  180 + /**
  181 + * 拒绝接单
  182 + * <p/>
  183 + * 请求协议体：takeOrderReq
  184 + * 返回协议体：OperateOrderCommonResp
  185 + *
  186 + * @createTime 2014年9月1日 下午6:16:05
  187 + * @author weili
  188 + */
  189 + @ApiOperation(value = "拒绝接单", httpMethod = "POST",response = CancelOrderResp.class)
  190 + @RequestMapping(value = "/refuseOrder",method = RequestMethod.POST)
  191 + @ResponseBody
  192 + public void refuseOrder(@ModelAttribute RefuseQuoteReq temp) {
  193 + RefuseQuoteReq req = super.getRequest(RefuseQuoteReq.class);
  194 + try {
  195 + RefuseQuoteResp resp = sellerOrderService.refuseOrder(req);
  196 + super.sendSuccessResp(resp);
  197 + } catch (ServiceException e) {
  198 + log.error("接单异常", e);
  199 + super.sendError(e.getCode(), e.getMessage());
  200 + } catch (Exception e) {
  201 + log.error("接单失败", e);
  202 + super.sendError(e.getMessage());
  203 + }
  204 + }
  205 +
  206 +}
374 207 \ No newline at end of file
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/product/ProductController.java deleted 100644 → 0
  View file @376680f
1   -//package com.diligrp.mobsite.getway.web.api.seller.product;
2   -//
3   -//import com.diligrp.mobsite.getway.domain.except.ServiceException;
4   -//import com.diligrp.mobsite.getway.domain.protocol.saler.SellerUpdateProductReq;
5   -//import com.diligrp.mobsite.getway.domain.protocol.saler.product.*;
6   -//import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
7   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
8   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
9   -//
10   -//import org.apache.log4j.Logger;
11   -//import org.springframework.stereotype.Controller;
12   -//import org.springframework.web.bind.annotation.RequestMapping;
13   -//import org.springframework.web.bind.annotation.ResponseBody;
14   -//
15   -//import javax.annotation.Resource;
16   -//
17   -///**
18   -// * <B>Description</B> 商品部分接口 <br />
19   -// * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
20   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
21   -// * <B>Company</B> 地利集团
22   -// * @createTime 2014年8月30日 下午2:13:16
23   -// * @author duanyugen
24   -// */
25   -//@Controller
26   -//@RequestMapping("/mobsiteApp/seller/product")
27   -//public class ProductController extends BaseApiController {
28   -//
29   -// @Resource
30   -// private SellerGoodsService sellerGoodsService;
31   -//
32   -// private static Logger log = Logger.getLogger(ProductController.class);
33   -//
34   -//
35   -// /**
36   -// * 根据商品状态获取商品列表
37   -// * @createTime 2014年8月18日 下午5:35:03
38   -// * @author duanyugen
39   -// */
40   -// @RequestMapping("getProducts")
41   -// @ResponseBody
42   -// @DiligrpEndpoint(group = "查询商品",req=GetProductsReq.class, resp=GetProductsResp.class,desc="根据商品状态查询商品")
43   -// public void searchProductsByStatus(){
44   -// GetProductsReq req = super.getRequest(GetProductsReq.class);
45   -// try {
46   -// GetProductsResp resp = sellerGoodsService.searchProductsByStatus(req);
47   -// super.sendSuccessResp(resp);
48   -// } catch (ServiceException e){
49   -// log.error(String.format("Code=%s,ErrorMessage=%s",
50   -// e.getCode(), e.getMessage()), e);
51   -// sendError(e.getCode(), e.getMessage());
52   -// }catch (Exception e) {
53   -// log.error(e.getMessage(),e);
54   -// super.sendError(e.getMessage());
55   -// }
56   -// }
57   -//
58   -// /**
59   -// * 根据商品id获取商品详情
60   -// * @createTime 2014年8月18日 下午5:35:03
61   -// * @author duanyugen
62   -// */
63   -// @RequestMapping("getProductDetail")
64   -// @ResponseBody
65   -// @DiligrpEndpoint(group = "获取商品详情",req=GetProductDetailReq.class, resp=GetSellerProductDetailResp.class,desc="根据商品id获取商品详情")
66   -// public void getSellerProductDetail(){
67   -// GetProductDetailReq req = super.getRequest(GetProductDetailReq.class);
68   -// try {
69   -// GetSellerProductDetailResp resp = sellerGoodsService.getSellerProductDetail(req);
70   -// super.sendSuccessResp(resp);
71   -// } catch (ServiceException e){
72   -// log.error(String.format("Code=%s,ErrorMessage=%s",
73   -// e.getCode(), e.getMessage()), e);
74   -// sendError(e.getCode(), e.getMessage());
75   -// }catch (Exception e) {
76   -// log.error(e.getMessage(),e);
77   -// super.sendError(e.getMessage());
78   -// }
79   -// }
80   -//
81   -// /**
82   -// * 批量删除商品
83   -// * @createTime 2014年8月18日 下午5:35:03
84   -// * @author duanyugen
85   -// */
86   -// @RequestMapping("batchDeleteProduct")
87   -// @ResponseBody
88   -// @DiligrpEndpoint(group = "搜索商品",req=BatchDeleteProductReq.class, resp=SellerProductCommonResp.class,desc="批量删除商品")
89   -// public void batchDeleteProduct(){
90   -// BatchDeleteProductReq req = super.getRequest(BatchDeleteProductReq.class);
91   -// try {
92   -// SellerProductCommonResp resp = sellerGoodsService.batchDeleteProduct(req.getPids(), req.getUserId());
93   -// super.sendSuccessResp(resp);
94   -// } catch (ServiceException e){
95   -// log.error(String.format("Code=%s,ErrorMessage=%s,pid=%s,sellerId=%s",
96   -// e.getCode(), e.getMessage(), req.getPids(), req.getUserId()), e);
97   -// sendError(e.getCode(), e.getMessage());
98   -// }catch (Exception e) {
99   -// log.error(e.getMessage(),e);
100   -// super.sendError(e.getMessage());
101   -// }
102   -// }
103   -//
104   -// /**
105   -// * 批量修改商品状态
106   -// * @createTime 2014年8月18日 下午5:35:03
107   -// * @author duanyugen
108   -// */
109   -// @RequestMapping("batchUpdateStatus")
110   -// @ResponseBody
111   -// @DiligrpEndpoint(group = "修改商品状态",req=BatchUpdateProductStatusReq.class, resp=SellerProductCommonResp.class,desc="批量修改商品状态")
112   -// public void batchUpdateSellerProductStatus(){
113   -// BatchUpdateProductStatusReq req = super.getRequest(BatchUpdateProductStatusReq.class);
114   -// try {
115   -// SellerProductCommonResp resp = sellerGoodsService.batchUpdateSellerProductStatus(req);
116   -// super.sendSuccessResp(resp);
117   -// } catch (ServiceException e){
118   -// log.error(String.format("Code=%s,ErrorMessage=%s,pIds=%s",
119   -// e.getCode(), e.getMessage(), req.getPids()), e);
120   -// sendError(e.getCode(), e.getMessage());
121   -// }catch (Exception e) {
122   -// log.error(e.getMessage(),e);
123   -// super.sendError(e.getMessage());
124   -// }
125   -// }
126   -//
127   -// /**
128   -// * 修改商品区间价格
129   -// * @createTime 2014年8月18日 下午5:35:03
130   -// * @author duanyugen
131   -// */
132   -// @RequestMapping("updateRangePrice")
133   -// @ResponseBody
134   -// @DiligrpEndpoint(group = "修改商品区间价格",req=UpdateRangePriceReq.class, resp=SellerProductCommonResp.class,desc="修改商品区间价格")
135   -// public void updateSellerProductRangePrice(){
136   -// UpdateRangePriceReq req = super.getRequest(UpdateRangePriceReq.class);
137   -// try {
138   -// SellerProductCommonResp resp = sellerGoodsService.updateSellerProductRangePrice(req);
139   -// super.sendSuccessResp(resp);
140   -// } catch (ServiceException e){
141   -// log.error(String.format("Code=%s,ErrorMessage=%s,pId=%s",
142   -// e.getCode(), e.getMessage(), req.getPid()), e);
143   -// sendError(e.getCode(), e.getMessage());
144   -// }catch (Exception e) {
145   -// log.error(e.getMessage(),e);
146   -// super.sendError(e.getMessage());
147   -// }
148   -// }
149   -//
150   -// /**
151   -// * 修改商品sku价格
152   -// * @createTime 2014年8月18日 下午5:35:03
153   -// * @author duanyugen
154   -// */
155   -// @RequestMapping("updateSkuPrice")
156   -// @ResponseBody
157   -// @DiligrpEndpoint(group = "修改商品sku价格",req=UpdateSkuPriceReq.class, resp=SellerProductCommonResp.class,desc="修改商品sku价格")
158   -// public void updateSellerProductSkuPrice(){
159   -// UpdateSkuPriceReq req = super.getRequest(UpdateSkuPriceReq.class);
160   -// try {
161   -// SellerProductCommonResp resp = sellerGoodsService.updateSellerProductSkuPrice(req);
162   -// super.sendSuccessResp(resp);
163   -// } catch (ServiceException e){
164   -// log.error(String.format("Code=%s,ErrorMessage=%s,pId=%s",
165   -// e.getCode(), e.getMessage(), req.getPid()), e);
166   -// sendError(e.getCode(), e.getMessage());
167   -// }catch (Exception e) {
168   -// log.error(e.getMessage(),e);
169   -// super.sendError(e.getMessage());
170   -// }
171   -// }
172   -//
173   -// /**
174   -// * 修改商品库存
175   -// * @createTime 2014年8月18日 下午5:35:03
176   -// * @author duanyugen
177   -// */
178   -// @RequestMapping("updateStock")
179   -// @ResponseBody
180   -// @DiligrpEndpoint(group = "修改商品库存",req=UpdateSellerProductStockReq.class, resp=SellerProductCommonResp.class,desc="修改商品库存")
181   -// public void updateSellerProductStock(){
182   -// UpdateSellerProductStockReq req = super.getRequest(UpdateSellerProductStockReq.class);
183   -// try {
184   -// SellerProductCommonResp resp = sellerGoodsService.updateSellerProductStock(req);
185   -// super.sendSuccessResp(resp);
186   -// } catch (ServiceException e){
187   -// log.error(String.format("Code=%s,ErrorMessage=%s,pId=%s",
188   -// e.getCode(), e.getMessage(), req.getPid()), e);
189   -// sendError(e.getCode(), e.getMessage());
190   -// }catch (Exception e) {
191   -// log.error(e.getMessage(),e);
192   -// super.sendError(e.getMessage());
193   -// }
194   -// }
195   -//
196   -//
197   -// /**
198   -// * 根据类目id获取对应的商品属性
199   -// * @createTime 2014年8月18日 下午5:35:03
200   -// * @author duanyugen
201   -// */
202   -// @RequestMapping("getProductAttr")
203   -// @ResponseBody
204   -// @DiligrpEndpoint(group = "获取商品属性",req=GetProductAttriReq.class, resp=GetProductAttrResp.class,desc="获取商品属性")
205   -// public void getProductAttr(){
206   -// GetProductAttriReq req = super.getRequest(GetProductAttriReq.class);
207   -// try {
208   -// GetProductAttrResp resp = sellerGoodsService.listAttributes(req.getCid());
209   -// super.sendSuccessResp(resp);
210   -// } catch (ServiceException e){
211   -// log.error(String.format("Code=%s,ErrorMessage=%s",
212   -// e.getCode(), e.getMessage()), e);
213   -// sendError(e.getCode(), e.getMessage());
214   -// }catch (Exception e) {
215   -// log.error(e.getMessage(),e);
216   -// super.sendError(e.getMessage());
217   -// }
218   -// }
219   -//
220   -// /**
221   -// * 发布商品
222   -// * @createTime 2014年8月18日 下午5:35:03
223   -// * @author duanyugen
224   -// */
225   -// @RequestMapping("publishProduct")
226   -// @ResponseBody
227   -// @DiligrpEndpoint(group = "发布商品",req=SellerPublishProductReq.class, resp=SellerProductCommonResp.class,desc="发布商品")
228   -// public void publishProduct(){
229   -// SellerPublishProductReq req = super.getRequest(SellerPublishProductReq.class);
230   -// try {
231   -// SellerProductCommonResp resp = sellerGoodsService.insertPopProduct(req);
232   -// super.sendSuccessResp(resp);
233   -// } catch (ServiceException e){
234   -// log.error(String.format("Code=%s,ErrorMessage=%s",
235   -// e.getCode(), e.getMessage()), e);
236   -// sendError(e.getCode(), e.getMessage());
237   -// }catch (Exception e) {
238   -// log.error(e.getMessage(),e);
239   -// super.sendError(e.getMessage());
240   -// }
241   -// }
242   -//
243   -// /**
244   -// * 修改商品
245   -// * @createTime 2014年8月18日 下午5:35:03
246   -// * @author duanyugen
247   -// */
248   -// @RequestMapping("updateProductBaseInfo")
249   -// @ResponseBody
250   -// @DiligrpEndpoint(group = "修改商品",req=SellerUpdateProductReq.class, resp=SellerProductCommonResp.class,desc="修改商品")
251   -// public void updateProductBaseInfo(){
252   -// SellerUpdateProductReq req = super.getRequest(SellerUpdateProductReq.class);
253   -// try {
254   -// SellerProductCommonResp resp = sellerGoodsService.updatePopProduct(req);
255   -// super.sendSuccessResp(resp);
256   -// } catch (ServiceException e){
257   -// log.error(String.format("Code=%s,ErrorMessage=%s",
258   -// e.getCode(), e.getMessage()), e);
259   -// sendError(e.getCode(), e.getMessage());
260   -// }catch (Exception e) {
261   -// log.error(e.getMessage(),e);
262   -// super.sendError(e.getMessage());
263   -// }
264   -// }
265   -//
266   -// /**
267   -// * 设置商品描述信息
268   -// * @createTime 2014年8月18日 下午5:35:03
269   -// * @author duanyugen
270   -// */
271   -// @RequestMapping("setProductDesc")
272   -// @ResponseBody
273   -// @DiligrpEndpoint(group = "设置商品描述信息",req=SetProductDescReq.class, resp=SetProductDescResp.class,desc="设置商品描述信息")
274   -// public void setProductDesc(){
275   -// SetProductDescReq req = super.getRequest(SetProductDescReq.class);
276   -// try {
277   -// SetProductDescResp resp = sellerGoodsService.setProductDesc(req);
278   -// super.sendSuccessResp(resp);
279   -// } catch (ServiceException e){
280   -// log.error(String.format("Code=%s,ErrorMessage=%s",
281   -// e.getCode(), e.getMessage()), e);
282   -// sendError(e.getCode(), e.getMessage());
283   -// }catch (Exception e) {
284   -// log.error(e.getMessage(),e);
285   -// super.sendError(e.getMessage());
286   -// }
287   -// }
288   -//
289   -// /**
290   -// * 卖家获取商品详情
291   -// * @createTime 2014年8月18日 下午5:35:03
292   -// * @author duanyugen
293   -// */
294   -// @RequestMapping("getGoodDetail")
295   -// @ResponseBody
296   -// @DiligrpEndpoint(group = "卖家获取商品详情",req=GetSellerGoodDetailReq.class, resp=GetSellerGoodDetailResp.class,desc="设置商品描述信息")
297   -// public void getGoodDetail(){
298   -// GetSellerGoodDetailReq req = super.getRequest(GetSellerGoodDetailReq.class);
299   -// try {
300   -// GetSellerGoodDetailResp resp = sellerGoodsService.getGoodDetail(req);
301   -// super.sendSuccessResp(resp);
302   -// } catch (ServiceException e){
303   -// log.error(String.format("Code=%s,ErrorMessage=%s",
304   -// e.getCode(), e.getMessage()), e);
305   -// sendError(e.getCode(), e.getMessage());
306   -// }catch (Exception e) {
307   -// log.error(e.getMessage(),e);
308   -// super.sendError(e.getMessage());
309   -// }
310   -// }
311   -//
312   -// /**
313   -// * 根据类目id获取对应的商品属性
314   -// * @createTime 2014年8月18日 下午5:35:03
315   -// * @author duanyugen
316   -// */
317   -// @RequestMapping("getProductAttrSelected")
318   -// @ResponseBody
319   -// @DiligrpEndpoint(group = "获取商品属性",req=GetProductAttriReq.class, resp=GetProductAttrResp.class,desc="获取商品属性")
320   -// public void getProductAttrHasSelected(){
321   -// GetProductAttriReq req = super.getRequest(GetProductAttriReq.class);
322   -// try {
323   -// GetProductAttrResp resp = sellerGoodsService.getProductAttrHasSelected(req.getCid(), req.getPid());
324   -// super.sendSuccessResp(resp);
325   -// } catch (ServiceException e){
326   -// log.error(String.format("Code=%s,ErrorMessage=%s",
327   -// e.getCode(), e.getMessage()), e);
328   -// sendError(e.getCode(), e.getMessage());
329   -// }catch (Exception e) {
330   -// log.error(e.getMessage(),e);
331   -// super.sendError(e.getMessage());
332   -// }
333   -// }
334   -//}
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/product/SellerGoodsController.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.web.api.seller.product;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  4 +import com.diligrp.mobsite.getway.domain.protocol.product.*;
  5 +import com.diligrp.mobsite.getway.service.seller.SellerGoodsService;
  6 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  7 +import io.swagger.annotations.Api;
  8 +import io.swagger.annotations.ApiOperation;
  9 +import org.apache.log4j.Logger;
  10 +import org.springframework.stereotype.Controller;
  11 +import org.springframework.web.bind.annotation.ModelAttribute;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RequestMethod;
  14 +import org.springframework.web.bind.annotation.ResponseBody;
  15 +
  16 +import javax.annotation.Resource;
  17 +
  18 +/**
  19 + * <B>Description</B> 商品部分接口 <br />
  20 + * <B>Copyright</B> Copyright (c) 2014 www.diligrp.com All rights reserved. <br />
  21 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  22 + * <B>Company</B> 地利集团
  23 + * @createTime 2014年8月30日 下午2:13:16
  24 + * @author duanyugen
  25 + */
  26 +@Controller
  27 +@RequestMapping("/mobsiteApp/seller/goods")
  28 +@Api(value = "/mobsiteApp/seller/goods", description = "商品接口-卖家")
  29 +public class SellerGoodsController extends BaseApiController {
  30 +
  31 + @Resource
  32 + private SellerGoodsService sellerGoodsService;
  33 +
  34 + private static Logger log = Logger.getLogger(SellerGoodsController.class);
  35 +
  36 + //商品操作
  37 + private static final Integer HANDLEGOODS_OPERATE_ON=1;//上架
  38 + private static final Integer HANDLEGOODS_OPERATE_DOWN=2;//下架
  39 + private static final Integer HANDLEGOODS_OPERATE_SALES=3;//设置促销
  40 + private static final Integer HANDLEGOODS_OPERATE_TOP=4;//首页推荐
  41 + private static final Integer HANDLEGOODS_OPERATE_DEL=5;//删除
  42 +
  43 +
  44 +
  45 + /**
  46 + * 添加商品分类
  47 + * <p>
  48 + * 请求协议体 GetProductCategoryReq
  49 + * 响应协议体 GetProductCategoryResp
  50 + *
  51 + * @createTime Aug 18, 2014 4:02:38 PM
  52 + * @author weili
  53 + */
  54 + @ApiOperation(value = "添加商品分类", httpMethod = "POST",response = AddProductCategoryResp.class)
  55 + @RequestMapping(value = "/addProductCategory",method = RequestMethod.POST)
  56 + @ResponseBody
  57 + public void addProductCategory(@ModelAttribute AddProductCategoryReq temp) {
  58 + AddProductCategoryReq req = getRequest(AddProductCategoryReq.class);
  59 + try {
  60 + AddProductCategoryResp resp = sellerGoodsService.addProductCategory(req);
  61 + sendSuccessResp(resp);
  62 + } catch (ServiceException e) {
  63 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  64 + e.getCode(), e.getMessage(), req.getUserId()), e);
  65 + sendError(e.getCode(), e.getMessage());
  66 + } catch (Exception e) {
  67 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  68 + e.getMessage(), req.getUserId()), e);
  69 + sendError(e.getMessage());
  70 + }
  71 + }
  72 +
  73 + /**
  74 + * 修改商品分类
  75 + * <p>
  76 + * 请求协议体 GetProductCategoryReq
  77 + * 响应协议体 GetProductCategoryResp
  78 + *
  79 + * @createTime Aug 18, 2014 4:02:38 PM
  80 + * @author weili
  81 + */
  82 + @ApiOperation(value = "修改商品分类", httpMethod = "POST",response = UpdateProductCategoryResp.class)
  83 + @RequestMapping(value = "/updateProductCategory",method = RequestMethod.POST)
  84 + @ResponseBody
  85 + public void updateProductCategory(@ModelAttribute UpdateProductCategoryReq temp) {
  86 + UpdateProductCategoryReq req = getRequest(UpdateProductCategoryReq.class);
  87 + try {
  88 + UpdateProductCategoryResp resp = sellerGoodsService.updateProductCategory(req);
  89 + sendSuccessResp(resp);
  90 + } catch (ServiceException e) {
  91 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  92 + e.getCode(), e.getMessage(), req.getUserId()), e);
  93 + sendError(e.getCode(), e.getMessage());
  94 + } catch (Exception e) {
  95 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  96 + e.getMessage(), req.getUserId()), e);
  97 + sendError(e.getMessage());
  98 + }
  99 + }
  100 +
  101 + /**
  102 + * 搜索商品分类
  103 + * <p>
  104 + * 请求协议体 GetProductCategoryReq
  105 + * 响应协议体 GetProductCategoryResp
  106 + *
  107 + * @createTime Aug 18, 2014 4:02:38 PM
  108 + * @author weili
  109 + */
  110 + @ApiOperation(value = "搜索商品分类", httpMethod = "POST",response = SearchProductCategoryResp.class)
  111 + @RequestMapping(value = "/searchProductCategory",method = RequestMethod.POST)
  112 + @ResponseBody
  113 + public void searchProductCategory(@ModelAttribute SearchProductCategoryReq temp) {
  114 + SearchProductCategoryReq req = getRequest(SearchProductCategoryReq.class);
  115 + try {
  116 + SearchProductCategoryResp resp = sellerGoodsService.searchProductCategory(req);
  117 + sendSuccessResp(resp);
  118 + } catch (ServiceException e) {
  119 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  120 + e.getCode(), e.getMessage(), req.getUserId()), e);
  121 + sendError(e.getCode(), e.getMessage());
  122 + } catch (Exception e) {
  123 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  124 + e.getMessage(), req.getUserId()), e);
  125 + sendError(e.getMessage());
  126 + }
  127 + }
  128 +
  129 +
  130 +
  131 +
  132 + /**
  133 + * 添加新商品
  134 + * <p>
  135 + * 请求协议体 GetProductCategoryReq
  136 + * 响应协议体 GetProductCategoryResp
  137 + *
  138 + * @createTime Aug 18, 2014 4:02:38 PM
  139 + * @author weili
  140 + */
  141 + @ApiOperation(value = "添加新商品", httpMethod = "POST",response = AddGoodsResp.class)
  142 + @RequestMapping(value = "/addGoods",method = RequestMethod.POST)
  143 + @ResponseBody
  144 + public void addGoods(@ModelAttribute AddGoodsReq temp) {
  145 + AddGoodsReq req = getRequest(AddGoodsReq.class);
  146 + try {
  147 + AddGoodsResp resp = sellerGoodsService.addGoods(req);
  148 + sendSuccessResp(resp);
  149 + } catch (ServiceException e) {
  150 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  151 + e.getCode(), e.getMessage(), req.getUserId()), e);
  152 + sendError(e.getCode(), e.getMessage());
  153 + } catch (Exception e) {
  154 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  155 + e.getMessage(), req.getUserId()), e);
  156 + sendError(e.getMessage());
  157 + }
  158 + }
  159 +
  160 + /**
  161 + * 修改商品
  162 + * <p>
  163 + * 请求协议体 GetProductCategoryReq
  164 + * 响应协议体 GetProductCategoryResp
  165 + *
  166 + * @createTime Aug 18, 2014 4:02:38 PM
  167 + * @author weili
  168 + */
  169 + @ApiOperation(value = "修改商品", httpMethod = "POST",response = UpdateGoodsResp.class)
  170 + @RequestMapping(value = "/updateGoods",method = RequestMethod.POST)
  171 + @ResponseBody
  172 + public void updateGoods(@ModelAttribute UpdateGoodsReq temp) {
  173 + UpdateGoodsReq req = getRequest(UpdateGoodsReq.class);
  174 + try {
  175 + UpdateGoodsResp resp = sellerGoodsService.updateGoods(req);
  176 + sendSuccessResp(resp);
  177 + } catch (ServiceException e) {
  178 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  179 + e.getCode(), e.getMessage(), req.getUserId()), e);
  180 + sendError(e.getCode(), e.getMessage());
  181 + } catch (Exception e) {
  182 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  183 + e.getMessage(), req.getUserId()), e);
  184 + sendError(e.getMessage());
  185 + }
  186 + }
  187 +
  188 +
  189 + /**
  190 + * 卖家获取出售中、已下架商品列表
  191 + * <p>
  192 + * 请求协议体 GetProductCategoryReq
  193 + * 响应协议体 GetProductCategoryResp
  194 + *
  195 + * @createTime Aug 18, 2014 4:02:38 PM
  196 + * @author weili
  197 + */
  198 + @ApiOperation(value = "卖家获取商品列表", httpMethod = "POST",response = GetGoodsResp.class)
  199 + @RequestMapping(value = "/getGoods",method = RequestMethod.POST)
  200 + @ResponseBody
  201 + public void getGoods(@ModelAttribute GetGoodsReq temp) {
  202 + GetGoodsReq req = getRequest(GetGoodsReq.class);
  203 + try {
  204 + GetGoodsResp resp = sellerGoodsService.getGoods(req);
  205 + sendSuccessResp(resp);
  206 + } catch (ServiceException e) {
  207 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  208 + e.getCode(), e.getMessage(), req.getUserId()), e);
  209 + sendError(e.getCode(), e.getMessage());
  210 + } catch (Exception e) {
  211 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  212 + e.getMessage(), req.getUserId()), e);
  213 + sendError(e.getMessage());
  214 + }
  215 + }
  216 +
  217 +
  218 + /**
  219 + * 操作商品
  220 + * <p>
  221 + * 请求协议体 GetProductCategoryReq
  222 + * 响应协议体 GetProductCategoryResp
  223 + *
  224 + * @createTime Aug 18, 2014 4:02:38 PM
  225 + * @author weili
  226 + */
  227 + @ApiOperation(value = "卖家操作商品：1上架 2 下架 3设置促销 4设置首页推荐 5删除", httpMethod = "POST",response = HandleGoodsResp.class)
  228 + @RequestMapping(value = "/handleGoods",method = RequestMethod.POST)
  229 + @ResponseBody
  230 + public void handleGoods(@ModelAttribute HandleGoodsReq temp) {
  231 + HandleGoodsReq req = getRequest(HandleGoodsReq.class);
  232 + try {
  233 + HandleGoodsResp resp = sellerGoodsService.handleGoods(req);
  234 + sendSuccessResp(resp);
  235 + } catch (ServiceException e) {
  236 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  237 + e.getCode(), e.getMessage(), req.getUserId()), e);
  238 + sendError(e.getCode(), e.getMessage());
  239 + } catch (Exception e) {
  240 + log.error(String.format("ErrorMessage=%s,UserId=%s",
  241 + e.getMessage(), req.getUserId()), e);
  242 + sendError(e.getMessage());
  243 + }
  244 + }
  245 +
  246 +
  247 +
  248 +}
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/shop/SellerShopController.java 0 → 100644
  View file @63e8b05
  1 +package com.diligrp.mobsite.getway.web.api.seller.shop;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.protocol.BaseReq;
  4 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeReq;
  5 +import com.diligrp.mobsite.getway.domain.protocol.GetShopDeliveryTimeResp;
  6 +import com.diligrp.mobsite.getway.domain.protocol.shop.*;
  7 +import com.diligrp.mobsite.getway.service.seller.SellerShopService;
  8 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  9 +import io.swagger.annotations.Api;
  10 +import io.swagger.annotations.ApiOperation;
  11 +import org.slf4j.Logger;
  12 +import org.slf4j.LoggerFactory;
  13 +import org.springframework.stereotype.Controller;
  14 +import org.springframework.web.bind.annotation.ModelAttribute;
  15 +import org.springframework.web.bind.annotation.RequestMapping;
  16 +import org.springframework.web.bind.annotation.RequestMethod;
  17 +import org.springframework.web.bind.annotation.ResponseBody;
  18 +
  19 +import javax.annotation.Resource;
  20 +
  21 +/**
  22 + * Created by weili on 2016/12/27.
  23 + */
  24 +@Controller
  25 +@RequestMapping("/mobsiteApp/seller/shop/")
  26 +@Api(value = "/mobsiteApp/seller/shop", description = "店铺接口-卖家")
  27 +public class SellerShopController extends BaseApiController{
  28 +
  29 + private Logger log = LoggerFactory.getLogger(getClass());
  30 + @Resource
  31 + private SellerShopService sellerShopService;
  32 +
  33 +
  34 + /**
  35 + * 创建或修改店铺信息
  36 + */
  37 + @ApiOperation(value = "创建或修改店铺信息", httpMethod = "POST",response = CreateOrUpdateShopResp.class)
  38 + @RequestMapping(value = "/createOrUpdateShop",method = RequestMethod.POST)
  39 + @ResponseBody
  40 + public void createOrUpdateShop(@ModelAttribute CreateOrUpdateShopReq temp) {
  41 + CreateOrUpdateShopReq req = getRequest(CreateOrUpdateShopReq.class);
  42 + try {
  43 + //BeanValidator.validator(req);
  44 + CreateOrUpdateShopResp resp = sellerShopService.createShop(req);
  45 + sendSuccessResp(resp);
  46 + }
  47 + catch(Exception e) {
  48 + log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  49 + sendError(e.getMessage());
  50 + }
  51 + }
  52 +
  53 +
  54 +
  55 + /**
  56 + * 获取店铺信息
  57 + */
  58 + @ApiOperation(value = "获取店铺信息", httpMethod = "POST",response = GetShopInfoResp.class)
  59 + @RequestMapping(value = "/getShopInfo",method = RequestMethod.POST)
  60 + @ResponseBody
  61 + public void getShopInfo() {
  62 + BaseReq req = getRequest(BaseReq.class);
  63 + try {
  64 + //BeanValidator.validator(req);
  65 + GetShopInfoResp resp = sellerShopService.getShopInfo(req);
  66 + sendSuccessResp(resp);
  67 + }catch(Exception e) {
  68 + log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  69 + sendError(e.getMessage());
  70 + }
  71 + }
  72 +
  73 + /**
  74 + * 设置送货时间段
  75 + */
  76 + @ApiOperation(value = "设置送货时间段", httpMethod = "POST",response = AddShopDeliveryTimeResp.class)
  77 + @RequestMapping(value = "/addShopDeliveryTime",method = RequestMethod.POST)
  78 + @ResponseBody
  79 + public void addShopDeliveryTime(@ModelAttribute AddShopDeliveryTimeReq temp) {
  80 + AddShopDeliveryTimeReq req = getRequest(AddShopDeliveryTimeReq.class);
  81 + try {
  82 + //BeanValidator.validator(req);
  83 + AddShopDeliveryTimeResp resp = sellerShopService.addShopDeliveryTime(req);
  84 + sendSuccessResp(resp);
  85 + }
  86 + catch(Exception e) {
  87 + log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  88 + sendError(e.getMessage());
  89 + }
  90 + }
  91 +
  92 +
  93 + /**
  94 + * 获取送货时间段
  95 + */
  96 + @ApiOperation(value = "获取送货时间段", httpMethod = "POST",response = GetShopDeliveryTimeResp.class)
  97 + @RequestMapping(value = "/getShopDeliveryTime",method = RequestMethod.POST)
  98 + @ResponseBody
  99 + public void getShopDeliveryTime(@ModelAttribute GetShopDeliveryTimeReq temp) {
  100 + GetShopDeliveryTimeReq req = getRequest(GetShopDeliveryTimeReq.class);
  101 + try {
  102 + //BeanValidator.validator(req);
  103 + GetShopDeliveryTimeResp resp = sellerShopService.getShopDeliveryTime(req);
  104 + sendSuccessResp(resp);
  105 + }
  106 + catch(Exception e) {
  107 + log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  108 + sendError(e.getMessage());
  109 + }
  110 + }
  111 +
  112 + /**
  113 + * 删除送货时间段
  114 + */
  115 + @ApiOperation(value = "设置送货时间段", httpMethod = "POST",response = DelShopDeliveryTimeResp.class)
  116 + @RequestMapping(value = "/delShopDeliveryTime",method = RequestMethod.POST)
  117 + @ResponseBody
  118 + public void delShopDeliveryTime(@ModelAttribute DelShopDeliveryTimeReq temp) {
  119 + DelShopDeliveryTimeReq req = getRequest(DelShopDeliveryTimeReq.class);
  120 + try {
  121 + //BeanValidator.validator(req);
  122 + DelShopDeliveryTimeResp resp = sellerShopService.delShopDeliveryTime(req);
  123 + sendSuccessResp(resp);
  124 + }
  125 + catch(Exception e) {
  126 + log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  127 + sendError(e.getMessage());
  128 + }
  129 + }
  130 +
  131 +
  132 +
  133 + ///**
  134 + // * 获取商品展示样式
  135 + // */
  136 + //@ApiOperation(value = "获取店铺基本信息", httpMethod = "POST",response = GetShowStyleResp.class)
  137 + //@RequestMapping(value = "/getShowStyle",method = RequestMethod.POST)
  138 + //@ResponseBody
  139 + //public void getShowStyle() {
  140 + // BaseReq req = getRequest(BaseReq.class);
  141 + // try {
  142 + // //BeanValidator.validator(req);
  143 + // GetShowStyleResp resp = sellerShopService.getShowStyle(req);
  144 + // sendSuccessResp(resp);
  145 + // }catch(Exception e) {
  146 + // log.error(String.format("ErrorMessage=%s,UserId=%s",e.getMessage(),req.getUserId()), e);
  147 + // sendError(e.getMessage());
  148 + // }
  149 + //}
  150 +
  151 +}
... ...
mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/seller/user/SellerUserController.java
  View file @63e8b05
1   -//package com.diligrp.mobsite.getway.web.api.seller.user;
2   -//
3   -//import javax.annotation.Resource;
4   -//
5   -//import com.diligrp.mobsite.getway.domain.common.ErrorMessage;
6   -//import com.diligrp.mobsite.getway.domain.common.ResultCode;
7   -//import com.diligrp.mobsite.getway.domain.protocol.BaseResp;
8   -//import com.diligrp.mobsite.getway.domain.protocol.saler.user.*;
9   -//import com.diligrp.mobsite.getway.web.utils.DiligrpEndpoint;
10   -//import org.apache.log4j.Logger;
11   -//import org.springframework.stereotype.Controller;
12   -//import org.springframework.web.bind.annotation.RequestMapping;
13   -//import org.springframework.web.bind.annotation.ResponseBody;
14   -//
15   -//import com.diligrp.mobsite.getway.domain.except.ServiceException;
16   -//import com.diligrp.mobsite.getway.service.seller.SellerUserService;
17   -//import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
18   -//
19   -//
20   -///**
21   -// * <B>Description</B> 卖家端用户接口 <br />
22   -// * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
23   -// * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
24   -// * <B>Company</B> 地利集团
25   -// * @createTime 2015年4月16日 下午3:39:26
26   -// * @author duanyugen
27   -// */
28   -//@Controller
29   -//@RequestMapping("/mobsiteApp/seller/user/")
30   -//public class SellerUserController extends BaseApiController {
31   -//
32   -// private final static Logger log = Logger.getLogger(SellerUserController.class);
33   -//
34   -// @Resource
35   -// private SellerUserService sellerUserService;
36   -//
37   -// /**
38   -// * 卖家登录
39   -// * @createTime 2014年8月24日 下午10:55:03
40   -// * @author duanyugen
41   -// */
42   -// @RequestMapping("sellerLogin")
43   -// @ResponseBody
44   -// @Deprecated
45   -// public void sellerLogin(){
46   -// SellerLoginReq req = super.getRequest(SellerLoginReq.class);
47   -// try {
48   -// SellerLoginResp resp = sellerUserService.login(req);
49   -// super.sendSuccessResp(resp);
50   -// } catch (ServiceException e){
51   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
52   -// e.getCode(), e.getMessage(), req.getUserId()), e);
53   -// super.sendError(e.getCode(), e.getMessage());
54   -// } catch (Exception e) {
55   -// log.error("用户登录失败：", e);
56   -// super.sendError(e.getMessage());
57   -// }
58   -// }
59   -//
60   -// /**
61   -// * 卖家申请开店
62   -// * @createTime 2014年8月24日 下午10:55:03
63   -// * @author duanyugen
64   -// */
65   -// @RequestMapping("applyShop")
66   -// @ResponseBody
67   -// @DiligrpEndpoint(group = "卖家申请开店",req=SellerApplyShopReq.class, resp=BaseResp.class,desc="卖家申请开店")
68   -// public void applyShop(){
69   -// SellerApplyShopReq req = super.getRequest(SellerApplyShopReq.class);
70   -//// try {
71   -//// BaseResp resp = sellerUserService.sellerAplyShop(req);
72   -//// super.sendSuccessResp(resp);
73   -//// } catch (ServiceException e){
74   -//// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
75   -//// e.getCode(), e.getMessage(), req.getUserId()), e);
76   -//// super.sendError(e.getCode(), e.getMessage());
77   -//// } catch (Exception e) {
78   -//// log.error("用户申请开店失败：", e);
79   -//// super.sendError(e.getMessage());
80   -//// }
81   -// super.sendError(ResultCode.SHOULD_UPDATE, ErrorMessage.SHOULD_UPDATE);
82   -// }
83   -// /**
84   -// * 卖家申请开店
85   -// * @createTime 2014年8月24日 下午10:55:03
86   -// * @author duanyugen
87   -// */
88   -// @RequestMapping("applyShopNew")
89   -// @ResponseBody
90   -// @DiligrpEndpoint(group = "卖家申请开店",req=SellerApplyShopNewReq.class, resp=BaseResp.class,desc="卖家申请开店")
91   -// public void applyShopNew(){
92   -// SellerApplyShopNewReq req = super.getRequest(SellerApplyShopNewReq.class);
93   -// try {
94   -// BaseResp resp = sellerUserService.sellerAplyShopNew(req);
95   -// super.sendSuccessResp(resp);
96   -// } catch (ServiceException e){
97   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
98   -// e.getCode(), e.getMessage(), req.getUserId()), e);
99   -// super.sendError(e.getCode(), e.getMessage());
100   -// } catch (Exception e) {
101   -// log.error("用户申请开店失败：", e);
102   -// super.sendError(e.getMessage());
103   -// }
104   -// }
105   -//
106   -// /**
107   -// * 卖家获取店铺详情
108   -// * @createTime 2014年8月24日 下午10:55:03
109   -// * @author duanyugen
110   -// */
111   -// @RequestMapping("getShopDetail")
112   -// @ResponseBody
113   -// @DiligrpEndpoint(group = "获取店铺详情",req=GetSellerShopReq.class, resp=SellerShopResp.class,desc="获取店铺详情")
114   -// public void getShopDetail(){
115   -// GetSellerShopReq req = super.getRequest(GetSellerShopReq.class);
116   -// try {
117   -// SellerShopResp resp = sellerUserService.getShopDetail(req);
118   -// super.sendSuccessResp(resp);
119   -// } catch (ServiceException e){
120   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
121   -// e.getCode(), e.getMessage(), req.getUserId()), e);
122   -// super.sendError(e.getCode(), e.getMessage());
123   -// } catch (Exception e) {
124   -// log.error("获取店铺详情失败：", e);
125   -// super.sendError(e.getMessage());
126   -// }
127   -// }
128   -//
129   -// /**
130   -// * 开启或关闭店铺赊账功能
131   -// * @createTime 2014年8月24日 下午10:55:03
132   -// * @author duanyugen
133   -// */
134   -// @RequestMapping("openOrCloseShopCredit")
135   -// @ResponseBody
136   -// @DiligrpEndpoint(group = "开启或关闭店铺赊账功能",req=OpenOrCloseReq.class, resp=BaseResp.class,desc="开启或关闭店铺赊账功能")
137   -// public void openOrCloseShopCredit(){
138   -// OpenOrCloseReq req = super.getRequest(OpenOrCloseReq.class);
139   -// try {
140   -// BaseResp resp = sellerUserService.openOrCloseShopCredit(req);
141   -// super.sendSuccessResp(resp);
142   -// } catch (ServiceException e){
143   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
144   -// e.getCode(), e.getMessage(), req.getUserId()), e);
145   -// super.sendError(e.getCode(), e.getMessage());
146   -// } catch (Exception e) {
147   -// log.error("开启或关闭店铺赊账功能失败：", e);
148   -// super.sendError(e.getMessage());
149   -// }
150   -// }
151   -//
152   -// /**
153   -// * 添加vip用户
154   -// * @createTime 2014年8月24日 下午10:55:03
155   -// * @author duanyugen
156   -// */
157   -// @RequestMapping("saveVipUser")
158   -// @ResponseBody
159   -// @DiligrpEndpoint(group = "添加vip用户",req=VipUserReq.class, resp=BaseResp.class,desc="添加vip用户")
160   -// public void saveVipUser(){
161   -// VipUserReq req = super.getRequest(VipUserReq.class);
162   -// try {
163   -// BaseResp resp = sellerUserService.saveVipUser(req);
164   -// super.sendSuccessResp(resp);
165   -// } catch (ServiceException e){
166   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
167   -// e.getCode(), e.getMessage(), req.getUserId()), e);
168   -// super.sendError(e.getCode(), e.getMessage());
169   -// } catch (Exception e) {
170   -// log.error("添加vip用户失败：", e);
171   -// super.sendError(e.getMessage());
172   -// }
173   -// }
174   -//
175   -// /**
176   -// * 删除vip用户
177   -// * @createTime 2014年8月24日 下午10:55:03
178   -// * @author duanyugen
179   -// */
180   -// @RequestMapping("deleteVipUser")
181   -// @ResponseBody
182   -// @DiligrpEndpoint(group = "删除vip用户",req=VipUserReq.class, resp=BaseResp.class,desc="删除vip用户")
183   -// public void deleteVipUser(){
184   -// VipUserReq req = super.getRequest(VipUserReq.class);
185   -// try {
186   -// BaseResp resp = sellerUserService.deleteVipUser(req);
187   -// super.sendSuccessResp(resp);
188   -// } catch (ServiceException e){
189   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
190   -// e.getCode(), e.getMessage(), req.getUserId()), e);
191   -// super.sendError(e.getCode(), e.getMessage());
192   -// } catch (Exception e) {
193   -// log.error("删除vip用户失败：", e);
194   -// super.sendError(e.getMessage());
195   -// }
196   -// }
197   -//
198   -// /**
199   -// * 更新vip用户
200   -// * @createTime 2014年8月24日 下午10:55:03
201   -// * @author duanyugen
202   -// */
203   -// @RequestMapping("updateVipUser")
204   -// @ResponseBody
205   -// @DiligrpEndpoint(group = "更新vip用户",req=VipUserReq.class, resp=BaseResp.class,desc="更新vip用户")
206   -// public void updateVipUser(){
207   -// VipUserReq req = super.getRequest(VipUserReq.class);
208   -// try {
209   -// BaseResp resp = sellerUserService.updateVipUser(req);
210   -// super.sendSuccessResp(resp);
211   -// } catch (ServiceException e){
212   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
213   -// e.getCode(), e.getMessage(), req.getUserId()), e);
214   -// super.sendError(e.getCode(), e.getMessage());
215   -// } catch (Exception e) {
216   -// log.error("更新vip用户失败：", e);
217   -// super.sendError(e.getMessage());
218   -// }
219   -// }
220   -//
221   -// /**
222   -// * 关闭或开启vip用户
223   -// * @createTime 2014年8月24日 下午10:55:03
224   -// * @author duanyugen
225   -// */
226   -// @RequestMapping("closeOrOpenVipUser")
227   -// @ResponseBody
228   -// @DiligrpEndpoint(group = "关闭或开启vip用户",req=CloseOrOpenVipUserReq.class, resp=BaseResp.class,desc="关闭或开启vip用户")
229   -// public void closeOrOpenVipUser(){
230   -// CloseOrOpenVipUserReq req = super.getRequest(CloseOrOpenVipUserReq.class);
231   -// try {
232   -// OpenOrCloseVipUserResp resp = sellerUserService.closeOrOpenVipUser(req);
233   -// super.sendSuccessResp(resp);
234   -// } catch (ServiceException e){
235   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
236   -// e.getCode(), e.getMessage(), req.getUserId()), e);
237   -// super.sendError(e.getCode(), e.getMessage());
238   -// } catch (Exception e) {
239   -// log.error("关闭或开启vip用户：", e);
240   -// super.sendError(e.getMessage());
241   -// }
242   -// }
243   -//
244   -// /**
245   -// * 根据号码查询vip用户是否存在
246   -// * @createTime 2014年8月24日 下午10:55:03
247   -// * @author duanyugen
248   -// */
249   -// @RequestMapping("isExistsVip")
250   -// @ResponseBody
251   -// @DiligrpEndpoint(group = "检查vip用户是否存在",req=VipUserReq.class, resp=CheckVipExisitResp.class,desc="检查vip用户是否存在")
252   -// public void isExistsVip(){
253   -// VipUserReq req = super.getRequest(VipUserReq.class);
254   -// try {
255   -// CheckVipExisitResp resp = sellerUserService.isExistsNumber(req);
256   -// super.sendSuccessResp(resp);
257   -// } catch (ServiceException e){
258   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
259   -// e.getCode(), e.getMessage(), req.getUserId()), e);
260   -// super.sendError(e.getCode(), e.getMessage());
261   -// } catch (Exception e) {
262   -// log.error("检查vip用户失败：", e);
263   -// super.sendError(e.getMessage());
264   -// }
265   -// }
266   -//
267   -// /**
268   -// * 查询vip用户
269   -// * @createTime 2014年8月24日 下午10:55:03
270   -// * @author duanyugen
271   -// */
272   -// @RequestMapping("queryVipUser")
273   -// @ResponseBody
274   -// @DiligrpEndpoint(group = "查询vip用户",req=VipUserQueryReq.class, resp=SellerShopVipListResp.class,desc="查询vip用户")
275   -// public void queryVipUser(){
276   -// VipUserQueryReq req = super.getRequest(VipUserQueryReq.class);
277   -// try {
278   -// SellerShopVipListResp resp = sellerUserService.queryVipUser(req);
279   -// super.sendSuccessResp(resp);
280   -// } catch (ServiceException e){
281   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
282   -// e.getCode(), e.getMessage(), req.getUserId()), e);
283   -// super.sendError(e.getCode(), e.getMessage());
284   -// } catch (Exception e) {
285   -// log.error("查询vip用户失败：", e);
286   -// super.sendError(e.getMessage());
287   -// }
288   -// }
289   -//
290   -//
291   -// /**
292   -// * 卖家修改店铺
293   -// * @createTime 2014年8月24日 下午10:55:03
294   -// * @author duanyugen
295   -// */
296   -// @RequestMapping("modifyShop")
297   -// @ResponseBody
298   -// @DiligrpEndpoint(group = "卖家修改店铺",req=SellerApplyShopReq.class, resp=BaseResp.class,desc="卖家申请开店")
299   -// public void modifyShop(){
300   -// SellerModifyShopRequest req = super.getRequest(SellerModifyShopRequest.class);
301   -// try {
302   -// BaseResp resp = sellerUserService.sellerModifyShop(req);
303   -// super.sendSuccessResp(resp);
304   -// } catch (ServiceException e){
305   -// log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
306   -// e.getCode(), e.getMessage(), req.getUserId()), e);
307   -// super.sendError(e.getCode(), e.getMessage());
308   -// } catch (Exception e) {
309   -// log.error("用户申请开店失败：", e);
310   -// super.sendError(e.getMessage());
311   -// }
312   -// }
313   -//}
  1 +package com.diligrp.mobsite.getway.web.api.seller.user;
  2 +
  3 +import com.diligrp.mobsite.getway.domain.except.ServiceException;
  4 +import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginReq;
  5 +import com.diligrp.mobsite.getway.domain.protocol.saler.user.SellerLoginResp;
  6 +import com.diligrp.mobsite.getway.service.seller.SellerUserService;
  7 +import com.diligrp.mobsite.getway.web.api.base.BaseApiController;
  8 +import org.apache.log4j.Logger;
  9 +import org.springframework.stereotype.Controller;
  10 +import org.springframework.web.bind.annotation.RequestMapping;
  11 +import org.springframework.web.bind.annotation.ResponseBody;
  12 +
  13 +import javax.annotation.Resource;
  14 +
  15 +
  16 +/**
  17 + * <B>Description</B> 卖家端用户接口 <br />
  18 + * <B>Copyright</B> Copyright (c) 2015 www.diligrp.com All rights reserved. <br />
  19 + * 本软件源代码版权归地利集团,未经许可不得任意复制与传播.<br />
  20 + * <B>Company</B> 地利集团
  21 + * @createTime 2015年4月16日 下午3:39:26
  22 + * @author duanyugen
  23 + */
  24 +@Controller
  25 +@RequestMapping("/mobsiteApp/seller/user/")
  26 +public class SellerUserController extends BaseApiController {
  27 +
  28 + private final static Logger log = Logger.getLogger(SellerUserController.class);
  29 +
  30 + @Resource
  31 + private SellerUserService sellerUserService;
  32 +
  33 + /**
  34 + * 卖家登录
  35 + * @createTime 2014年8月24日 下午10:55:03
  36 + * @author duanyugen
  37 + */
  38 + @RequestMapping("sellerLogin")
  39 + @ResponseBody
  40 + @Deprecated
  41 + public void sellerLogin(){
  42 + SellerLoginReq req = super.getRequest(SellerLoginReq.class);
  43 + try {
  44 + SellerLoginResp resp = sellerUserService.login(req);
  45 + super.sendSuccessResp(resp);
  46 + } catch (ServiceException e){
  47 + log.error(String.format("Code=%s,ErrorMessage=%s,UserId=%s",
  48 + e.getCode(), e.getMessage(), req.getUserId()), e);
  49 + super.sendError(e.getCode(), e.getMessage());
  50 + } catch (Exception e) {
  51 + log.error("用户登录失败：", e);
  52 + super.sendError(e.getMessage());
  53 + }
  54 + }
  55 +
  56 +
  57 +}
... ...
mobsite-getway-web/src/main/java/com/diligrp/swaggerConfig/SwaggerConfig.java
  View file @63e8b05
... ... @@ -40,7 +40,7 @@ public class SwaggerConfig extends WebMvcConfigurerAdapter {
40 40 public Docket swaggerSpringMvcPlugin(){
41 41 Docket docket = new Docket(DocumentationType.SWAGGER_2);
42 42 docket.select().apis(RequestHandlerSelectors.basePackage(SWAGGER_SCAN_BASE_PACKAGE)).build();
43   - ApiInfo apiInfo = new ApiInfo("咱的APP", "移动网关接口", "1.1", "urn:tos", "b2c", "logistics-park", "http://zandeapp.com");
  43 + ApiInfo apiInfo = new ApiInfo("咱的APP", "移动网关接口", "1.1", "urn:tos", "b2c", "account-park", "http://zandeapp.com");
44 44 docket.apiInfo(apiInfo);
45 45 return docket;
46 46 }
... ...
mobsite-getway-web/src/main/resources/mybatis/mybatis.cfg.xml
  View file @63e8b05
... ... @@ -17,7 +17,7 @@
17 17 <typeAlias type="com.diligrp.mobsite.getway.domain.DeviceInfo" alias="deviceInfo" />
18 18 <typeAlias type="com.diligrp.mobsite.getway.domain.protocol.version.model.AppPatch" alias="appPatch" />
19 19 <typeAlias type="com.diligrp.mobsite.getway.domain.GuardLogMapper" alias="guardLog" />
20   - <typeAlias type="com.diligrp.mobsite.getway.domain.protocol.out.GuardRequest" alias="guardQuery" />
  20 + <typeAlias type="com.diligrp.mobsite.getway.domain.protocol.fund.GuardRequest" alias="guardQuery" />
21 21 </typeAliases>
22 22  
23 23  
... ...
mobsite-getway-web/src/main/webapp/assets/js/my97/lang/en.js
  View file @63e8b05
1 1 var $lang={
2   -errAlertMsg: "Invalid date or the date out of range,redo or not?",
  2 +errAlertMsg: "Invalid date or the date fund of range,redo or not?",
3 3 aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
4 4 aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
5 5 aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
... ...
mobsite-getway-web/src/main/webapp/assets/js/my97/开发包/lang/en.js
  View file @63e8b05
1 1 var $lang={
2   -errAlertMsg: "Invalid date or the date out of range,redo or not?",
  2 +errAlertMsg: "Invalid date or the date fund of range,redo or not?",
3 3 aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
4 4 aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
5 5 aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
... ...
mobsite-getway-web/src/main/webapp/topic/11_sy/js/fastclick.js
  View file @63e8b05
... ... @@ -159,7 +159,7 @@
159 159 }
160 160  
161 161 // If a handler is already declared in the element's onclick attribute, it will be fired before
162   - // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
  162 + // FastClick's onClick handler. Fix this by pulling fund the user-defined handler function and
163 163 // adding it as listener.
164 164 if (typeof layer.onclick === 'function') {
165 165  
... ...
mobsite-getway-web/src/main/webapp/topic/12_gy/js/fastclick.js
  View file @63e8b05
... ... @@ -159,7 +159,7 @@
159 159 }
160 160  
161 161 // If a handler is already declared in the element's onclick attribute, it will be fired before
162   - // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
  162 + // FastClick's onClick handler. Fix this by pulling fund the user-defined handler function and
163 163 // adding it as listener.
164 164 if (typeof layer.onclick === 'function') {
165 165  
... ...
mobsite-getway-web/src/main/webapp/topic/12_heb/js/fastclick.js
  View file @63e8b05
... ... @@ -159,7 +159,7 @@
159 159 }
160 160  
161 161 // If a handler is already declared in the element's onclick attribute, it will be fired before
162   - // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
  162 + // FastClick's onClick handler. Fix this by pulling fund the user-defined handler function and
163 163 // adding it as listener.
164 164 if (typeof layer.onclick === 'function') {
165 165  
... ...
mobsite-getway-web/src/main/webapp/topic/6th/js/fastclick.js
  View file @63e8b05
... ... @@ -159,7 +159,7 @@
159 159 }
160 160  
161 161 // If a handler is already declared in the element's onclick attribute, it will be fired before
162   - // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
  162 + // FastClick's onClick handler. Fix this by pulling fund the user-defined handler function and
163 163 // adding it as listener.
164 164 if (typeof layer.onclick === 'function') {
165 165  
... ...
mobsite-getway-web/src/main/webapp/topic/js/fastclick.js
  View file @63e8b05
... ... @@ -159,7 +159,7 @@
159 159 }
160 160  
161 161 // If a handler is already declared in the element's onclick attribute, it will be fired before
162   - // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
  162 + // FastClick's onClick handler. Fix this by pulling fund the user-defined handler function and
163 163 // adding it as listener.
164 164 if (typeof layer.onclick === 'function') {
165 165  
... ...
mobsite-getway-web/src/main/webapp/topic/js/text.js
  View file @63e8b05
... ... @@ -222,7 +222,7 @@ define([&#39;module&#39;], function (module) {
222 222 fileName = req.toUrl(parsed.moduleName + extPart) + '.js';
223 223  
224 224 //Leverage own load() method to load plugin value, but only
225   - //write out values that do not have the strip argument,
  225 + //write fund values that do not have the strip argument,
226 226 //to avoid any potential issues with ! in file names.
227 227 text.load(nonStripName, req, function (value) {
228 228 //Use own write() method to construct full module value.
... ...
mobsite-getway-web/src/test/java/com/diligrp/getway/test/SkuTest.java
  View file @63e8b05
... ... @@ -29,13 +29,13 @@ public class SkuTest {
29 29 //16ntjcJpN
30 30 //jmvSAZJ9
31 31 // String sku = "jmvSAZL6";
32   -// System.out.println("包含版本号："+SkuUtil.decode(sku, true));
33   -// System.out.println("不包含版本号："+SkuUtil.decode(sku, false));
34   -// System.out.println(SkuUtil.decode(sku));
35   -// System.out.println(SkuUtil.decodeVersion(sku));
  32 +// System.fund.println("包含版本号："+SkuUtil.decode(sku, true));
  33 +// System.fund.println("不包含版本号："+SkuUtil.decode(sku, false));
  34 +// System.fund.println(SkuUtil.decode(sku));
  35 +// System.fund.println(SkuUtil.decodeVersion(sku));
36 36 //
37 37 // String encodeSku = "1:8000001828:0";
38   -// System.out.println(SkuUtil.encode(encodeSku));
  38 +// System.fund.println(SkuUtil.encode(encodeSku));
39 39  
40 40 // Date nowDate = new Date();
41 41 // Calendar calendar = Calendar.getInstance();
... ... @@ -44,16 +44,16 @@ public class SkuTest {
44 44 // calendar.set(Calendar.MINUTE, 0);
45 45 // calendar.set(Calendar.SECOND, 0);
46 46 //
47   -// System.out.println(calendar.getTime());
  47 +// System.fund.println(calendar.getTime());
48 48 //
49 49 // calendar.set(Calendar.HOUR_OF_DAY, 23);
50 50 // calendar.set(Calendar.MINUTE, 59);
51 51 // calendar.set(Calendar.SECOND, 59);
52 52 //
53   -// System.out.println(calendar.getTime().getTime());
  53 +// System.fund.println(calendar.getTime().getTime());
54 54  
55 55 // String aa = null;
56   -// System.out.println(aa == null);
  56 +// System.fund.println(aa == null);
57 57  
58 58 Date da = new Date();
59 59 SimpleDateFormat sp = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
... ...
... ... @@ -186,7 +186,7 @@
186 186 <dependency>
187 187 <groupId>com.fasterxml.jackson.core</groupId>
188 188 <artifactId>jackson-databind</artifactId>
189   - <version>2.3.3</version>
  189 + <version>2.8.0</version>
190 190 </dependency>
191 191  
192 192 <!-- container -->
... ...