xtrade / order-service · Commits

Commit 67fef66fad840da5d12fb337414b63867741532d

Authored by zhangxing
1 parent 19fa1260
build: skipped

订单相关一些注释修改和字段调整

Inline Side-by-side
Showing 6 changed files with 622 additions and 609 deletions
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderCreateRequestDto.java
  View file @67fef66
1 -package com.diligrp.xtrade.order.domain.dto;  
2 -  
3 -import java.util.List;  
4 -  
5 -/**  
6 - * 创建订单实体  
7 - * @author zhangxing  
8 - *  
9 - */  
10 -public class OrderCreateRequestDto {  
11 -  
12 - // 卖家账号  
13 - private Long saccount;  
14 -  
15 - // 买家账号  
16 - private Long baccount;  
17 -  
18 - // 市场编码  
19 - private String marketCode;  
20 -  
21 - // 总金额  
22 - private Long totalMoney;  
23 -  
24 - // 订单来源  
25 - private Integer orderCreatedSrc;  
26 -  
27 - List<OrderItemDto> orderItemDtos;  
28 -  
29 - public Long getSaccount() {  
30 - return saccount;  
31 - }  
32 -  
33 - public void setSaccount(Long saccount) {  
34 - this.saccount = saccount;  
35 - }  
36 -  
37 - public Long getBaccount() {  
38 - return baccount;  
39 - }  
40 -  
41 - public void setBaccount(Long baccount) {  
42 - this.baccount = baccount;  
43 - }  
44 -  
45 - public String getMarketCode() {  
46 - return marketCode;  
47 - }  
48 -  
49 - public void setMarketCode(String marketCode) {  
50 - this.marketCode = marketCode;  
51 - }  
52 -  
53 - public Long getTotalMoney() {  
54 - return totalMoney;  
55 - }  
56 -  
57 - public void setTotalMoney(Long totalMoney) {  
58 - this.totalMoney = totalMoney;  
59 - }  
60 -  
61 - public Integer getOrderCreatedSrc() {  
62 - return orderCreatedSrc;  
63 - }  
64 -  
65 - public void setOrderCreatedSrc(Integer orderCreatedSrc) {  
66 - this.orderCreatedSrc = orderCreatedSrc;  
67 - }  
68 -  
69 - public List<OrderItemDto> getOrderItemDtos() {  
70 - return orderItemDtos;  
71 - }  
72 -  
73 - public void setOrderItemDtos(List<OrderItemDto> orderItemDtos) {  
74 - this.orderItemDtos = orderItemDtos;  
75 - }  
76 -  
77 -  
78 -} 1 +package com.diligrp.xtrade.order.domain.dto;
  2 +
  3 +import java.util.List;
  4 +
  5 +/**
  6 + * @ClassName: OrderCreateRequestDto
  7 + * @Description 创建订单实体
  8 + * @author zhangxing
  9 + * @date 2020年4月21日
  10 + */
  11 +public class OrderCreateRequestDto {
  12 +
  13 + // 卖家账号
  14 + private Long saccount;
  15 +
  16 + // 买家账号
  17 + private Long baccount;
  18 +
  19 + // 市场编码
  20 + private String marketCode;
  21 +
  22 + // 总金额
  23 + private Long totalMoney;
  24 +
  25 + // 订单来源
  26 + private Integer createdSrc;
  27 +
  28 + //订单详情
  29 + private List<OrderItemDto> items;
  30 +
  31 + public Long getSaccount() {
  32 + return saccount;
  33 + }
  34 +
  35 + public void setSaccount(Long saccount) {
  36 + this.saccount = saccount;
  37 + }
  38 +
  39 + public Long getBaccount() {
  40 + return baccount;
  41 + }
  42 +
  43 + public void setBaccount(Long baccount) {
  44 + this.baccount = baccount;
  45 + }
  46 +
  47 + public String getMarketCode() {
  48 + return marketCode;
  49 + }
  50 +
  51 + public void setMarketCode(String marketCode) {
  52 + this.marketCode = marketCode;
  53 + }
  54 +
  55 + public Long getTotalMoney() {
  56 + return totalMoney;
  57 + }
  58 +
  59 + public void setTotalMoney(Long totalMoney) {
  60 + this.totalMoney = totalMoney;
  61 + }
  62 +
  63 + public List<OrderItemDto> getItems() {
  64 + return items;
  65 + }
  66 +
  67 + public void setItems(List<OrderItemDto> items) {
  68 + this.items = items;
  69 + }
  70 +
  71 + public Integer getCreatedSrc() {
  72 + return createdSrc;
  73 + }
  74 +
  75 + public void setCreatedSrc(Integer createdSrc) {
  76 + this.createdSrc = createdSrc;
  77 + }
  78 +
  79 +
  80 +}
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderItemDto.java
  View file @67fef66
1 -package com.diligrp.xtrade.order.domain.dto;  
2 -  
3 -/**  
4 - *  
5 - * @author zhangxing  
6 - *  
7 - */  
8 -public class OrderItemDto {  
9 - //商品id  
10 - private Long productId;  
11 - //商品名称  
12 - private Long productName;  
13 - //销售单位  
14 - private Integer saleUnit;  
15 - //价格  
16 - private Integer price;  
17 - //数量  
18 - private Double amount;  
19 - //件重  
20 - private Double unitWeight;  
21 -  
22 - public Long getProductId() {  
23 - return productId;  
24 - }  
25 -  
26 - public void setProductId(Long productId) {  
27 - this.productId = productId;  
28 - }  
29 -  
30 - public Long getProductName() {  
31 - return productName;  
32 - }  
33 -  
34 - public void setProductName(Long productName) {  
35 - this.productName = productName;  
36 - }  
37 -  
38 - public Integer getSaleUnit() {  
39 - return saleUnit;  
40 - }  
41 -  
42 - public void setSaleUnit(Integer saleUnit) {  
43 - this.saleUnit = saleUnit;  
44 - }  
45 -  
46 - public Integer getPrice() {  
47 - return price;  
48 - }  
49 -  
50 - public void setPrice(Integer price) {  
51 - this.price = price;  
52 - }  
53 -  
54 - public Double getAmount() {  
55 - return amount;  
56 - }  
57 -  
58 - public void setAmount(Double amount) {  
59 - this.amount = amount;  
60 - }  
61 -  
62 - public Double getUnitWeight() {  
63 - return unitWeight;  
64 - }  
65 -  
66 - public void setUnitWeight(Double unitWeight) {  
67 - this.unitWeight = unitWeight;  
68 - }  
69 -  
70 -} 1 +package com.diligrp.xtrade.order.domain.dto;
  2 +
  3 +/**
  4 + *
  5 + * @ClassName: OrderItemDto
  6 + * @Description 订单详情相关数据实体
  7 + * @author zhangxing
  8 + * @date 2020年4月21日
  9 + */
  10 +public class OrderItemDto {
  11 +
  12 + //商品id
  13 + private Long productId;
  14 +
  15 + //商品名称
  16 + private Long productName;
  17 +
  18 + //销售单位
  19 + private Integer saleUnit;
  20 +
  21 + //价格
  22 + private Integer price;
  23 +
  24 + //数量
  25 + private Double amount;
  26 +
  27 + //件重
  28 + private Double unitWeight;
  29 +
  30 + public Long getProductId() {
  31 + return productId;
  32 + }
  33 +
  34 + public void setProductId(Long productId) {
  35 + this.productId = productId;
  36 + }
  37 +
  38 + public Long getProductName() {
  39 + return productName;
  40 + }
  41 +
  42 + public void setProductName(Long productName) {
  43 + this.productName = productName;
  44 + }
  45 +
  46 + public Integer getSaleUnit() {
  47 + return saleUnit;
  48 + }
  49 +
  50 + public void setSaleUnit(Integer saleUnit) {
  51 + this.saleUnit = saleUnit;
  52 + }
  53 +
  54 + public Integer getPrice() {
  55 + return price;
  56 + }
  57 +
  58 + public void setPrice(Integer price) {
  59 + this.price = price;
  60 + }
  61 +
  62 + public Double getAmount() {
  63 + return amount;
  64 + }
  65 +
  66 + public void setAmount(Double amount) {
  67 + this.amount = amount;
  68 + }
  69 +
  70 + public Double getUnitWeight() {
  71 + return unitWeight;
  72 + }
  73 +
  74 + public void setUnitWeight(Double unitWeight) {
  75 + this.unitWeight = unitWeight;
  76 + }
  77 +
  78 +}
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryRequestDto.java
  View file @67fef66
1 -package com.diligrp.xtrade.order.domain.dto;  
2 -  
3 -import java.time.LocalDateTime;  
4 -  
5 -import com.diligrp.xtrade.shared.domain.BaseDo;  
6 -  
7 -/**  
8 - * 订单查询等请求实体  
9 - * @author kuk  
10 - *  
11 - */  
12 -public class OrderQueryRequestDto extends BaseDo{  
13 -  
14 - // 订单业务id  
15 - private Long orderId;  
16 -  
17 - // 卖家账号  
18 - private Long saccount;  
19 -  
20 - // 卖家卡号  
21 - private String scardNo;  
22 -  
23 - // 卖家姓名  
24 - private String sname;  
25 -  
26 - // 买家账号  
27 - private Long baccount;  
28 -  
29 - // 买家卡号  
30 - private String bcardNo;  
31 -  
32 - // 买家姓名  
33 - private String bname;  
34 -  
35 - // 支付来源  
36 - private Integer paySrc;  
37 -  
38 - // 订单状态  
39 - private Integer orderStatus;  
40 -  
41 - // 支付方式  
42 - private Integer payType;  
43 -  
44 - // 订单来源  
45 - private Integer createdSrc;  
46 -  
47 - // 支付时间  
48 - private LocalDateTime payTime;  
49 -  
50 - public Long getOrderId() {  
51 - return orderId;  
52 - }  
53 -  
54 - public void setOrderId(Long orderId) {  
55 - this.orderId = orderId;  
56 - }  
57 -  
58 - public Long getSaccount() {  
59 - return saccount;  
60 - }  
61 -  
62 - public void setSaccount(Long saccount) {  
63 - this.saccount = saccount;  
64 - }  
65 -  
66 - public String getScardNo() {  
67 - return scardNo;  
68 - }  
69 -  
70 - public void setScardNo(String scardNo) {  
71 - this.scardNo = scardNo;  
72 - }  
73 -  
74 - public String getSname() {  
75 - return sname;  
76 - }  
77 -  
78 - public void setSname(String sname) {  
79 - this.sname = sname;  
80 - }  
81 -  
82 - public Long getBaccount() {  
83 - return baccount;  
84 - }  
85 -  
86 - public void setBaccount(Long baccount) {  
87 - this.baccount = baccount;  
88 - }  
89 -  
90 - public String getBcardNo() {  
91 - return bcardNo;  
92 - }  
93 -  
94 - public void setBcardNo(String bcardNo) {  
95 - this.bcardNo = bcardNo;  
96 - }  
97 -  
98 - public String getBname() {  
99 - return bname;  
100 - }  
101 -  
102 - public void setBname(String bname) {  
103 - this.bname = bname;  
104 - }  
105 -  
106 - public Integer getPaySrc() {  
107 - return paySrc;  
108 - }  
109 -  
110 - public void setPaySrc(Integer paySrc) {  
111 - this.paySrc = paySrc;  
112 - }  
113 -  
114 - public Integer getOrderStatus() {  
115 - return orderStatus;  
116 - }  
117 -  
118 - public void setOrderStatus(Integer orderStatus) {  
119 - this.orderStatus = orderStatus;  
120 - }  
121 -  
122 - public Integer getPayType() {  
123 - return payType;  
124 - }  
125 -  
126 - public void setPayType(Integer payType) {  
127 - this.payType = payType;  
128 - }  
129 -  
130 - public Integer getCreatedSrc() {  
131 - return createdSrc;  
132 - }  
133 -  
134 - public void setCreatedSrc(Integer createdSrc) {  
135 - this.createdSrc = createdSrc;  
136 - }  
137 -  
138 - public LocalDateTime getPayTime() {  
139 - return payTime;  
140 - }  
141 -  
142 - public void setPayTime(LocalDateTime payTime) {  
143 - this.payTime = payTime;  
144 - }  
145 -  
146 -} 1 +package com.diligrp.xtrade.order.domain.dto;
  2 +
  3 +import java.time.LocalDateTime;
  4 +
  5 +import com.diligrp.xtrade.shared.domain.BaseDo;
  6 +
  7 +/**
  8 + *
  9 + * @ClassName: OrderQueryRequestDto
  10 + * @Description 订单查询等请求实体
  11 + * @author zhangxing
  12 + * @date 2020年4月21日
  13 + */
  14 +public class OrderQueryRequestDto extends BaseDo{
  15 +
  16 + // 订单业务id
  17 + private Long orderId;
  18 +
  19 + // 卖家账号
  20 + private Long saccount;
  21 +
  22 + // 卖家卡号
  23 + private String scardNo;
  24 +
  25 + // 卖家姓名
  26 + private String sname;
  27 +
  28 + // 买家账号
  29 + private Long baccount;
  30 +
  31 + // 买家卡号
  32 + private String bcardNo;
  33 +
  34 + // 买家姓名
  35 + private String bname;
  36 +
  37 + // 支付来源
  38 + private Integer paySrc;
  39 +
  40 + // 订单状态
  41 + private Integer orderStatus;
  42 +
  43 + // 支付方式
  44 + private Integer payType;
  45 +
  46 + // 订单来源
  47 + private Integer createdSrc;
  48 +
  49 + // 支付时间
  50 + private LocalDateTime payTime;
  51 +
  52 + public Long getOrderId() {
  53 + return orderId;
  54 + }
  55 +
  56 + public void setOrderId(Long orderId) {
  57 + this.orderId = orderId;
  58 + }
  59 +
  60 + public Long getSaccount() {
  61 + return saccount;
  62 + }
  63 +
  64 + public void setSaccount(Long saccount) {
  65 + this.saccount = saccount;
  66 + }
  67 +
  68 + public String getScardNo() {
  69 + return scardNo;
  70 + }
  71 +
  72 + public void setScardNo(String scardNo) {
  73 + this.scardNo = scardNo;
  74 + }
  75 +
  76 + public String getSname() {
  77 + return sname;
  78 + }
  79 +
  80 + public void setSname(String sname) {
  81 + this.sname = sname;
  82 + }
  83 +
  84 + public Long getBaccount() {
  85 + return baccount;
  86 + }
  87 +
  88 + public void setBaccount(Long baccount) {
  89 + this.baccount = baccount;
  90 + }
  91 +
  92 + public String getBcardNo() {
  93 + return bcardNo;
  94 + }
  95 +
  96 + public void setBcardNo(String bcardNo) {
  97 + this.bcardNo = bcardNo;
  98 + }
  99 +
  100 + public String getBname() {
  101 + return bname;
  102 + }
  103 +
  104 + public void setBname(String bname) {
  105 + this.bname = bname;
  106 + }
  107 +
  108 + public Integer getPaySrc() {
  109 + return paySrc;
  110 + }
  111 +
  112 + public void setPaySrc(Integer paySrc) {
  113 + this.paySrc = paySrc;
  114 + }
  115 +
  116 + public Integer getOrderStatus() {
  117 + return orderStatus;
  118 + }
  119 +
  120 + public void setOrderStatus(Integer orderStatus) {
  121 + this.orderStatus = orderStatus;
  122 + }
  123 +
  124 + public Integer getPayType() {
  125 + return payType;
  126 + }
  127 +
  128 + public void setPayType(Integer payType) {
  129 + this.payType = payType;
  130 + }
  131 +
  132 + public Integer getCreatedSrc() {
  133 + return createdSrc;
  134 + }
  135 +
  136 + public void setCreatedSrc(Integer createdSrc) {
  137 + this.createdSrc = createdSrc;
  138 + }
  139 +
  140 + public LocalDateTime getPayTime() {
  141 + return payTime;
  142 + }
  143 +
  144 + public void setPayTime(LocalDateTime payTime) {
  145 + this.payTime = payTime;
  146 + }
  147 +
  148 +}
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryResponseDto.java
  View file @67fef66
1 -package com.diligrp.xtrade.order.domain.dto;  
2 -  
3 -import java.time.LocalDateTime;  
4 -import java.util.List;  
5 -  
6 -/**  
7 - * 订单响应实体  
8 - * @author zhangxing  
9 - *  
10 - */  
11 -public class OrderQueryResponseDto {  
12 -  
13 -  
14 - //订单业务id  
15 - private Long orderId;  
16 -  
17 - //卖家账号  
18 - private Long saccount;  
19 -  
20 - //卖家卡号  
21 - private String scardNo;  
22 -  
23 - //卖家卡类型  
24 - private Integer scardType;  
25 -  
26 - //卖家姓名  
27 - private String sname;  
28 -  
29 - //卖家手机号  
30 - private String smobile;  
31 -  
32 - //买家账号  
33 - private Long baccount;  
34 -  
35 - //买家卡号  
36 - private String bcardNo;  
37 -  
38 - //买家卡类型  
39 - private Integer bcardType;  
40 -  
41 - //买家姓名  
42 - private String bname;  
43 -  
44 - //买家手机号  
45 - private String bmobile;  
46 -  
47 - //支付来源  
48 - private Integer paySrc;  
49 -  
50 - //市场编码  
51 - private String marketCode;  
52 -  
53 - //订单状态  
54 - private Integer orderStatus;  
55 -  
56 - //交易流水号或结算单号  
57 - private Long tradeNo;  
58 -  
59 - //总金额  
60 - private Long totalMoney;  
61 -  
62 - //卖家佣金  
63 - private Long scommission;  
64 -  
65 - //买家佣金  
66 - private Long bcommission;  
67 -  
68 - //总重量  
69 - private Double weight;  
70 -  
71 - //支付方式  
72 - private Integer payType;  
73 -  
74 - //订单来源  
75 - private Integer createdSrc;  
76 -  
77 - //支付时间  
78 - private LocalDateTime payTime;  
79 -  
80 - //订单详情  
81 - private List<OrderItemDto> orderItemDtos;  
82 -  
83 - public Long getOrderId() {  
84 - return orderId;  
85 - }  
86 -  
87 - public void setOrderId(Long orderId) {  
88 - this.orderId = orderId;  
89 - }  
90 -  
91 - public Long getSaccount() {  
92 - return saccount;  
93 - }  
94 -  
95 - public void setSaccount(Long saccount) {  
96 - this.saccount = saccount;  
97 - }  
98 -  
99 - public String getScardNo() {  
100 - return scardNo;  
101 - }  
102 -  
103 - public void setScardNo(String scardNo) {  
104 - this.scardNo = scardNo;  
105 - }  
106 -  
107 - public Integer getScardType() {  
108 - return scardType;  
109 - }  
110 -  
111 - public void setScardType(Integer scardType) {  
112 - this.scardType = scardType;  
113 - }  
114 -  
115 - public String getSname() {  
116 - return sname;  
117 - }  
118 -  
119 - public void setSname(String sname) {  
120 - this.sname = sname;  
121 - }  
122 -  
123 - public String getSmobile() {  
124 - return smobile;  
125 - }  
126 -  
127 - public void setSmobile(String smobile) {  
128 - this.smobile = smobile;  
129 - }  
130 -  
131 - public Long getBaccount() {  
132 - return baccount;  
133 - }  
134 -  
135 - public void setBaccount(Long baccount) {  
136 - this.baccount = baccount;  
137 - }  
138 -  
139 - public String getBcardNo() {  
140 - return bcardNo;  
141 - }  
142 -  
143 - public void setBcardNo(String bcardNo) {  
144 - this.bcardNo = bcardNo;  
145 - }  
146 -  
147 - public Integer getBcardType() {  
148 - return bcardType;  
149 - }  
150 -  
151 - public void setBcardType(Integer bcardType) {  
152 - this.bcardType = bcardType;  
153 - }  
154 -  
155 - public String getBname() {  
156 - return bname;  
157 - }  
158 -  
159 - public void setBname(String bname) {  
160 - this.bname = bname;  
161 - }  
162 -  
163 - public String getBmobile() {  
164 - return bmobile;  
165 - }  
166 -  
167 - public void setBmobile(String bmobile) {  
168 - this.bmobile = bmobile;  
169 - }  
170 -  
171 - public Integer getPaySrc() {  
172 - return paySrc;  
173 - }  
174 -  
175 - public void setPaySrc(Integer paySrc) {  
176 - this.paySrc = paySrc;  
177 - }  
178 -  
179 - public String getMarketCode() {  
180 - return marketCode;  
181 - }  
182 -  
183 - public void setMarketCode(String marketCode) {  
184 - this.marketCode = marketCode;  
185 - }  
186 -  
187 - public Integer getOrderStatus() {  
188 - return orderStatus;  
189 - }  
190 -  
191 - public void setOrderStatus(Integer orderStatus) {  
192 - this.orderStatus = orderStatus;  
193 - }  
194 -  
195 - public Long getTradeNo() {  
196 - return tradeNo;  
197 - }  
198 -  
199 - public void setTradeNo(Long tradeNo) {  
200 - this.tradeNo = tradeNo;  
201 - }  
202 -  
203 - public Long getTotalMoney() {  
204 - return totalMoney;  
205 - }  
206 -  
207 - public void setTotalMoney(Long totalMoney) {  
208 - this.totalMoney = totalMoney;  
209 - }  
210 -  
211 - public Long getScommission() {  
212 - return scommission;  
213 - }  
214 -  
215 - public void setScommission(Long scommission) {  
216 - this.scommission = scommission;  
217 - }  
218 -  
219 - public Long getBcommission() {  
220 - return bcommission;  
221 - }  
222 -  
223 - public void setBcommission(Long bcommission) {  
224 - this.bcommission = bcommission;  
225 - }  
226 -  
227 - public Double getWeight() {  
228 - return weight;  
229 - }  
230 -  
231 - public void setWeight(Double weight) {  
232 - this.weight = weight;  
233 - }  
234 -  
235 - public Integer getPayType() {  
236 - return payType;  
237 - }  
238 -  
239 - public void setPayType(Integer payType) {  
240 - this.payType = payType;  
241 - }  
242 -  
243 - public Integer getCreatedSrc() {  
244 - return createdSrc;  
245 - }  
246 -  
247 - public void setCreatedSrc(Integer createdSrc) {  
248 - this.createdSrc = createdSrc;  
249 - }  
250 -  
251 - public LocalDateTime getPayTime() {  
252 - return payTime;  
253 - }  
254 -  
255 - public void setPayTime(LocalDateTime payTime) {  
256 - this.payTime = payTime;  
257 - }  
258 -  
259 - public List<OrderItemDto> getOrderItemDtos() {  
260 - return orderItemDtos;  
261 - }  
262 -  
263 - public void setOrderItemDtos(List<OrderItemDto> orderItemDtos) {  
264 - this.orderItemDtos = orderItemDtos;  
265 - }  
266 -  
267 -} 1 +package com.diligrp.xtrade.order.domain.dto;
  2 +
  3 +import java.time.LocalDateTime;
  4 +import java.util.List;
  5 +
  6 +/**
  7 + * @ClassName: OrderQueryResponseDto
  8 + * @Description 订单响应实体
  9 + * @author zhangxing
  10 + * @date 2020年4月21日
  11 + */
  12 +public class OrderQueryResponseDto {
  13 +
  14 +
  15 + //订单业务id
  16 + private Long orderId;
  17 +
  18 + //卖家账号
  19 + private Long saccount;
  20 +
  21 + //卖家卡号
  22 + private String scardNo;
  23 +
  24 + //卖家卡类型
  25 + private Integer scardType;
  26 +
  27 + //卖家姓名
  28 + private String sname;
  29 +
  30 + //卖家手机号
  31 + private String smobile;
  32 +
  33 + //买家账号
  34 + private Long baccount;
  35 +
  36 + //买家卡号
  37 + private String bcardNo;
  38 +
  39 + //买家卡类型
  40 + private Integer bcardType;
  41 +
  42 + //买家姓名
  43 + private String bname;
  44 +
  45 + //买家手机号
  46 + private String bmobile;
  47 +
  48 + //支付来源
  49 + private Integer paySrc;
  50 +
  51 + //市场编码
  52 + private String marketCode;
  53 +
  54 + //订单状态
  55 + private Integer orderStatus;
  56 +
  57 + //交易流水号或结算单号
  58 + private Long tradeNo;
  59 +
  60 + //总金额
  61 + private Long totalMoney;
  62 +
  63 + //卖家佣金
  64 + private Long scommission;
  65 +
  66 + //买家佣金
  67 + private Long bcommission;
  68 +
  69 + //总重量
  70 + private Double weight;
  71 +
  72 + //支付方式
  73 + private Integer payType;
  74 +
  75 + //订单来源
  76 + private Integer createdSrc;
  77 +
  78 + //支付时间
  79 + private LocalDateTime payTime;
  80 +
  81 + //订单详情
  82 + private List<OrderItemDto> items;
  83 +
  84 + public Long getOrderId() {
  85 + return orderId;
  86 + }
  87 +
  88 + public void setOrderId(Long orderId) {
  89 + this.orderId = orderId;
  90 + }
  91 +
  92 + public Long getSaccount() {
  93 + return saccount;
  94 + }
  95 +
  96 + public void setSaccount(Long saccount) {
  97 + this.saccount = saccount;
  98 + }
  99 +
  100 + public String getScardNo() {
  101 + return scardNo;
  102 + }
  103 +
  104 + public void setScardNo(String scardNo) {
  105 + this.scardNo = scardNo;
  106 + }
  107 +
  108 + public Integer getScardType() {
  109 + return scardType;
  110 + }
  111 +
  112 + public void setScardType(Integer scardType) {
  113 + this.scardType = scardType;
  114 + }
  115 +
  116 + public String getSname() {
  117 + return sname;
  118 + }
  119 +
  120 + public void setSname(String sname) {
  121 + this.sname = sname;
  122 + }
  123 +
  124 + public String getSmobile() {
  125 + return smobile;
  126 + }
  127 +
  128 + public void setSmobile(String smobile) {
  129 + this.smobile = smobile;
  130 + }
  131 +
  132 + public Long getBaccount() {
  133 + return baccount;
  134 + }
  135 +
  136 + public void setBaccount(Long baccount) {
  137 + this.baccount = baccount;
  138 + }
  139 +
  140 + public String getBcardNo() {
  141 + return bcardNo;
  142 + }
  143 +
  144 + public void setBcardNo(String bcardNo) {
  145 + this.bcardNo = bcardNo;
  146 + }
  147 +
  148 + public Integer getBcardType() {
  149 + return bcardType;
  150 + }
  151 +
  152 + public void setBcardType(Integer bcardType) {
  153 + this.bcardType = bcardType;
  154 + }
  155 +
  156 + public String getBname() {
  157 + return bname;
  158 + }
  159 +
  160 + public void setBname(String bname) {
  161 + this.bname = bname;
  162 + }
  163 +
  164 + public String getBmobile() {
  165 + return bmobile;
  166 + }
  167 +
  168 + public void setBmobile(String bmobile) {
  169 + this.bmobile = bmobile;
  170 + }
  171 +
  172 + public Integer getPaySrc() {
  173 + return paySrc;
  174 + }
  175 +
  176 + public void setPaySrc(Integer paySrc) {
  177 + this.paySrc = paySrc;
  178 + }
  179 +
  180 + public String getMarketCode() {
  181 + return marketCode;
  182 + }
  183 +
  184 + public void setMarketCode(String marketCode) {
  185 + this.marketCode = marketCode;
  186 + }
  187 +
  188 + public Integer getOrderStatus() {
  189 + return orderStatus;
  190 + }
  191 +
  192 + public void setOrderStatus(Integer orderStatus) {
  193 + this.orderStatus = orderStatus;
  194 + }
  195 +
  196 + public Long getTradeNo() {
  197 + return tradeNo;
  198 + }
  199 +
  200 + public void setTradeNo(Long tradeNo) {
  201 + this.tradeNo = tradeNo;
  202 + }
  203 +
  204 + public Long getTotalMoney() {
  205 + return totalMoney;
  206 + }
  207 +
  208 + public void setTotalMoney(Long totalMoney) {
  209 + this.totalMoney = totalMoney;
  210 + }
  211 +
  212 + public Long getScommission() {
  213 + return scommission;
  214 + }
  215 +
  216 + public void setScommission(Long scommission) {
  217 + this.scommission = scommission;
  218 + }
  219 +
  220 + public Long getBcommission() {
  221 + return bcommission;
  222 + }
  223 +
  224 + public void setBcommission(Long bcommission) {
  225 + this.bcommission = bcommission;
  226 + }
  227 +
  228 + public Double getWeight() {
  229 + return weight;
  230 + }
  231 +
  232 + public void setWeight(Double weight) {
  233 + this.weight = weight;
  234 + }
  235 +
  236 + public Integer getPayType() {
  237 + return payType;
  238 + }
  239 +
  240 + public void setPayType(Integer payType) {
  241 + this.payType = payType;
  242 + }
  243 +
  244 + public Integer getCreatedSrc() {
  245 + return createdSrc;
  246 + }
  247 +
  248 + public void setCreatedSrc(Integer createdSrc) {
  249 + this.createdSrc = createdSrc;
  250 + }
  251 +
  252 + public LocalDateTime getPayTime() {
  253 + return payTime;
  254 + }
  255 +
  256 + public void setPayTime(LocalDateTime payTime) {
  257 + this.payTime = payTime;
  258 + }
  259 +
  260 + public List<OrderItemDto> getItems() {
  261 + return items;
  262 + }
  263 +
  264 + public void setItems(List<OrderItemDto> items) {
  265 + this.items = items;
  266 + }
  267 +
  268 +}
src/main/java/com/diligrp/xtrade/order/service/OrderService.java
  View file @67fef66
@@ -13,7 +13,7 @@ import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto; @@ -13,7 +13,7 @@ import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
13 * @author zhangxing 13 * @author zhangxing
14 * @date 2020年4月21日 14 * @date 2020年4月21日
15 */ 15 */
16 -public interface Orderservice { 16 +public interface OrderService {
17 17
18 /** 18 /**
19 * @Title createOrder 19 * @Title createOrder
src/main/java/com/diligrp/xtrade/order/service/impl/OrderServiceImpl.java
  View file @67fef66
1 -package com.diligrp.xtrade.order.service.impl;  
2 -  
3 -import java.util.List;  
4 -  
5 -import javax.annotation.Resource;  
6 -  
7 -import org.springframework.beans.BeanUtils;  
8 -import org.springframework.stereotype.Service;  
9 -  
10 -import com.diligrp.xtrade.order.dao.OrderDao;  
11 -import com.diligrp.xtrade.order.domain.builder.DefaultOrderCreator;  
12 -import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;  
13 -import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;  
14 -import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;  
15 -import com.diligrp.xtrade.order.domain.emuns.IDGenerator;  
16 -import com.diligrp.xtrade.order.domain.entity.OrderDo;  
17 -import com.diligrp.xtrade.order.service.Orderservice;  
18 -import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;  
19 -  
20 -@Service("orderService")  
21 -public class OrderServiceImpl implements Orderservice {  
22 -  
23 - @Resource private OrderDao orderDao;  
24 -  
25 - @Resource KeyGeneratorManager keyGeneratorManager;  
26 -  
27 - @Override  
28 - public void createOrder(OrderCreateRequestDto orderCreateRequestDto) {  
29 - OrderDo order = DefaultOrderCreator.build(orderCreateRequestDto);  
30 - order.setOrderId(keyGeneratorManager.getKeyGenerator(IDGenerator.ORDER_SEQUENCE).nextId());  
31 - orderDao.insertEntity(order);  
32 - }  
33 -  
34 - @Override  
35 - public List<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {  
36 - return null;  
37 - }  
38 -  
39 - @Override  
40 - public OrderQueryResponseDto orderDetail(OrderQueryRequestDto orderQueryRequestDto) {  
41 - OrderDo order = orderDao.selectEntityByOrderId(orderQueryRequestDto.getOrderId());  
42 - OrderQueryResponseDto queryResponseDto = new OrderQueryResponseDto();  
43 - BeanUtils.copyProperties(order, queryResponseDto);  
44 - return queryResponseDto;  
45 - }  
46 -  
47 -} 1 +package com.diligrp.xtrade.order.service.impl;
  2 +
  3 +import java.util.List;
  4 +
  5 +import javax.annotation.Resource;
  6 +
  7 +import org.springframework.beans.BeanUtils;
  8 +import org.springframework.stereotype.Service;
  9 +
  10 +import com.diligrp.xtrade.order.dao.OrderDao;
  11 +import com.diligrp.xtrade.order.domain.builder.DefaultOrderCreator;
  12 +import com.diligrp.xtrade.order.domain.dto.OrderCreateRequestDto;
  13 +import com.diligrp.xtrade.order.domain.dto.OrderQueryRequestDto;
  14 +import com.diligrp.xtrade.order.domain.dto.OrderQueryResponseDto;
  15 +import com.diligrp.xtrade.order.domain.emuns.IDGenerator;
  16 +import com.diligrp.xtrade.order.domain.entity.OrderDo;
  17 +import com.diligrp.xtrade.order.service.OrderService;
  18 +import com.diligrp.xtrade.shared.sequence.KeyGeneratorManager;
  19 +
  20 +@Service("orderService")
  21 +public class OrderServiceImpl implements OrderService {
  22 +
  23 + @Resource private OrderDao orderDao;
  24 +
  25 + @Resource KeyGeneratorManager keyGeneratorManager;
  26 +
  27 + @Override
  28 + public void createOrder(OrderCreateRequestDto orderCreateRequestDto) {
  29 + OrderDo order = DefaultOrderCreator.build(orderCreateRequestDto);
  30 + order.setOrderId(keyGeneratorManager.getKeyGenerator(IDGenerator.ORDER_SEQUENCE).nextId());
  31 + orderDao.insertEntity(order);
  32 + }
  33 +
  34 + @Override
  35 + public List<OrderQueryResponseDto> orderLists(OrderQueryRequestDto orderQueryRequestDto) {
  36 + return null;
  37 + }
  38 +
  39 + @Override
  40 + public OrderQueryResponseDto orderDetail(OrderQueryRequestDto orderQueryRequestDto) {
  41 + OrderDo order = orderDao.selectEntityByOrderId(orderQueryRequestDto.getOrderId());
  42 + OrderQueryResponseDto queryResponseDto = new OrderQueryResponseDto();
  43 + BeanUtils.copyProperties(order, queryResponseDto);
  44 + return queryResponseDto;
  45 + }
  46 +
  47 +}