xtrade / order-service · Commits

Commit 3eb82ab2daae8848daa436c8395f0a9c151aae20

Authored by zhangxing
1 parent 675db715

[增加字段]

Inline Side-by-side
Showing 4 changed files with 294 additions and 260 deletions
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryRequestDto.java
  View file @3eb82ab
... ... @@ -39,6 +39,9 @@ public class OrderQueryRequestDto extends BaseDo{
39 39  
40 40 // 订单状态
41 41 private Integer orderStatus;
  42 +
  43 + //订单类型
  44 + private Integer orderType;
42 45  
43 46 // 支付方式
44 47 private Integer payType;
... ... @@ -145,4 +148,12 @@ public class OrderQueryRequestDto extends BaseDo{
145 148 this.payTime = payTime;
146 149 }
147 150  
  151 + public Integer getOrderType() {
  152 + return orderType;
  153 + }
  154 +
  155 + public void setOrderType(Integer orderType) {
  156 + this.orderType = orderType;
  157 + }
  158 +
148 159 }
... ...
src/main/java/com/diligrp/xtrade/order/domain/dto/OrderQueryResponseDto.java
  View file @3eb82ab
... ... @@ -68,6 +68,9 @@ public class OrderQueryResponseDto {
68 68  
69 69 //总重量
70 70 private Double weight;
  71 +
  72 + //订单类型
  73 + private Integer orderType;
71 74  
72 75 //支付方式
73 76 private Integer payType;
... ... @@ -264,5 +267,13 @@ public class OrderQueryResponseDto {
264 267 public void setItems(List<OrderItemDto> items) {
265 268 this.items = items;
266 269 }
  270 +
  271 + public Integer getOrderType() {
  272 + return orderType;
  273 + }
  274 +
  275 + public void setOrderType(Integer orderType) {
  276 + this.orderType = orderType;
  277 + }
267 278  
268 279 }
... ...
src/main/java/com/diligrp/xtrade/order/domain/entity/OrderDo.java
  View file @3eb82ab
1   -package com.diligrp.xtrade.order.domain.entity;
2   -
3   -import java.time.LocalDateTime;
4   -
5   -import com.diligrp.xtrade.shared.domain.BaseDo;
6   -
7   -/**
8   - * 订单实体
9   - * @author zhangxing
10   - *
11   - */
12   -public class OrderDo 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 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   - public Long getOrderId() {
81   - return orderId;
82   - }
83   -
84   - public void setOrderId(Long orderId) {
85   - this.orderId = orderId;
86   - }
87   -
88   - public Long getSaccount() {
89   - return saccount;
90   - }
91   -
92   - public void setSaccount(Long saccount) {
93   - this.saccount = saccount;
94   - }
95   -
96   - public String getScardNo() {
97   - return scardNo;
98   - }
99   -
100   - public void setScardNo(String scardNo) {
101   - this.scardNo = scardNo;
102   - }
103   -
104   - public Integer getScardType() {
105   - return scardType;
106   - }
107   -
108   - public void setScardType(Integer scardType) {
109   - this.scardType = scardType;
110   - }
111   -
112   - public String getSname() {
113   - return sname;
114   - }
115   -
116   - public void setSname(String sname) {
117   - this.sname = sname;
118   - }
119   -
120   - public String getSmobile() {
121   - return smobile;
122   - }
123   -
124   - public void setSmobile(String smobile) {
125   - this.smobile = smobile;
126   - }
127   -
128   - public Long getBaccount() {
129   - return baccount;
130   - }
131   -
132   - public void setBaccount(Long baccount) {
133   - this.baccount = baccount;
134   - }
135   -
136   - public String getBcardNo() {
137   - return bcardNo;
138   - }
139   -
140   - public void setBcardNo(String bcardNo) {
141   - this.bcardNo = bcardNo;
142   - }
143   -
144   - public Integer getBcardType() {
145   - return bcardType;
146   - }
147   -
148   - public void setBcardType(Integer bcardType) {
149   - this.bcardType = bcardType;
150   - }
151   -
152   - public String getBname() {
153   - return bname;
154   - }
155   -
156   - public void setBname(String bname) {
157   - this.bname = bname;
158   - }
159   -
160   - public String getBmobile() {
161   - return bmobile;
162   - }
163   -
164   - public void setBmobile(String bmobile) {
165   - this.bmobile = bmobile;
166   - }
167   -
168   - public Integer getPaySrc() {
169   - return paySrc;
170   - }
171   -
172   - public void setPaySrc(Integer paySrc) {
173   - this.paySrc = paySrc;
174   - }
175   -
176   - public String getMarketCode() {
177   - return marketCode;
178   - }
179   -
180   - public void setMarketCode(String marketCode) {
181   - this.marketCode = marketCode;
182   - }
183   -
184   - public Integer getOrderStatus() {
185   - return orderStatus;
186   - }
187   -
188   - public void setOrderStatus(Integer orderStatus) {
189   - this.orderStatus = orderStatus;
190   - }
191   -
192   - public Long getTradeNo() {
193   - return tradeNo;
194   - }
195   -
196   - public void setTradeNo(Long tradeNo) {
197   - this.tradeNo = tradeNo;
198   - }
199   -
200   - public Long getTotalMoney() {
201   - return totalMoney;
202   - }
203   -
204   - public void setTotalMoney(Long totalMoney) {
205   - this.totalMoney = totalMoney;
206   - }
207   -
208   - public Long getScommission() {
209   - return scommission;
210   - }
211   -
212   - public void setScommission(Long scommission) {
213   - this.scommission = scommission;
214   - }
215   -
216   - public Long getBcommission() {
217   - return bcommission;
218   - }
219   -
220   - public void setBcommission(Long bcommission) {
221   - this.bcommission = bcommission;
222   - }
223   -
224   - public Double getWeight() {
225   - return weight;
226   - }
227   -
228   - public void setWeight(Double weight) {
229   - this.weight = weight;
230   - }
231   -
232   - public Integer getPayType() {
233   - return payType;
234   - }
235   -
236   - public void setPayType(Integer payType) {
237   - this.payType = payType;
238   - }
239   -
240   - public Integer getCreatedSrc() {
241   - return createdSrc;
242   - }
243   -
244   - public void setCreatedSrc(Integer createdSrc) {
245   - this.createdSrc = createdSrc;
246   - }
247   -
248   - public LocalDateTime getPayTime() {
249   - return payTime;
250   - }
251   -
252   - public void setPayTime(LocalDateTime payTime) {
253   - this.payTime = payTime;
254   - }
255   -
256   -
257   -}
  1 +package com.diligrp.xtrade.order.domain.entity;
  2 +
  3 +import java.time.LocalDateTime;
  4 +
  5 +import com.diligrp.xtrade.shared.domain.BaseDo;
  6 +
  7 +/**
  8 + * 订单实体
  9 + * @author zhangxing
  10 + *
  11 + */
  12 +public class OrderDo 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 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 orderType;
  73 +
  74 + //支付方式
  75 + private Integer payType;
  76 +
  77 + //订单来源
  78 + private Integer createdSrc;
  79 +
  80 + //支付时间
  81 + private LocalDateTime payTime;
  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 Integer getOrderType() {
  260 + return orderType;
  261 + }
  262 +
  263 + public void setOrderType(Integer orderType) {
  264 + this.orderType = orderType;
  265 + }
  266 +
  267 +
  268 +}
... ...
src/main/resources/mapping/com/diligrp/xtrade/order/OrderDao.xml
  View file @3eb82ab
... ... @@ -4,8 +4,8 @@
4 4  
5 5 <sql id="QUERY_COLUMN_LIST">
6 6 <![CDATA[id,`order_id` AS orderId, `saccount`, `scard_no` AS scardNo, `scard_type` AS scardType, `sname`, `smobile`, `baccount`, `bcard_no` AS bcardNo, `bcard_type` AS bcardType,
7   - `bname`, `bmobile`,`market_code` AS marketCode, `order_status` AS orderStatus, `trade_no` AS tradeNo, `total_money` AS totalMoney,`scommission`, `bcommission`, `weight`,
8   - `pay_type` AS payType, `pay_src` AS paySrc, `created_src` AS createdSrc, `order_type` AS orderType, `pay_time` AS payTime, `created_time` AS createdTime, `modified_time`AS modifiedTime, `is_del` AS isDel]]>
  7 + `bname`, `bmobile`,`market_code` AS marketCode, `order_status` AS orderStatus, `trade_no` AS tradeNo, `total_money` AS totalMoney,`scommission`, `bcommission`, `weight`, order_type AS orderType,
  8 + `pay_type` AS payType, `pay_src` AS paySrc, `created_src` AS createdSrc, `order_type` AS orderType, `pay_time` AS payTime, `created_time` AS createdTime, `modified_time`AS modifiedTime, `deleted`]]>
9 9 </sql>
10 10  
11 11 <sql id="QUERY_WHERE_CLAUSE">
... ... @@ -16,6 +16,7 @@
16 16 <if test="sname != null and sname != ''"><![CDATA[AND xt_order.sname = #{sname}]]></if>
17 17 <if test="bcardNo != null and bcardNo != ''"><![CDATA[AND xt_order.bcard_no = #{bcardNo}]]></if>
18 18 <if test="bname != null and bname != ''"><![CDATA[AND xt_order.bname = #{bname}]]></if>
  19 + <if test="orderType != null and orderType != ''"><![CDATA[AND xt_order.order_type = #{orderType}]]></if>
19 20 <if test="payType != null and payType != ''"><![CDATA[AND xt_order.pay_type = #{payType}]]></if>
20 21 <if test="paySrc != null and paySrc != ''"><![CDATA[AND xt_order.pay_src = #{paySrc}]]></if>
21 22 <if test="createdSrc != null and createdSrc != '0'.toString() "><![CDATA[AND xt_order.created_src = #{createdSrc} ]]></if>
... ... @@ -33,7 +34,7 @@
33 34 <insert id="insertEntity" parameterType="orderDo">
34 35 <![CDATA[
35 36 INSERT INTO `xt_order`(`order_id`, `saccount`, `scard_no`, `scard_type`, `sname`, `smobile`, `baccount`, `bcard_no`, `bcard_type`, `bname`, `bmobile`, `market_code`,
36   - `order_status`, `trade_no`, `total_money`, `scommission`, `bcommission`, `weight`, `pay_type`, `pay_src`, `created_src`, `pay_time`, `created_time`, `modified_time`, `is_del`)
  37 + `order_status`, `trade_no`, `total_money`, `scommission`, `bcommission`, `weight`, `pay_type`, `pay_src`, `created_src`, `pay_time`, `created_time`, `modified_time`, `deleted`)
37 38 VALUES(#{orderId}, #{saccount}, #{scardNo}, #{scardType}, #{sname}, #{smobile}, #{baccount}, #{bcardNo}, #{bcardType}, #{bname}, #{bmobile},
38 39 #{marketCode}, #{orderStatus}, #{tradeNo}, #{totalMoney}, #{scommission}, #{bcommission},#{weight}, #{payType}, #{paySrc}, #{createdSrc}, #{payTime}, #{createdTime}, NOW(),1);
39 40 ]]>
... ...