Commit 87c1dc625ce723027061f8fa22d24d08ef41ef29
1 parent
fa0dbc71
update:pc报表查询
Showing
10 changed files
with
215 additions
and
10 deletions
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/WeightK2JJsonSerializer.java
... | ... | @@ -20,7 +20,7 @@ public class WeightK2JJsonSerializer extends JsonSerializer<Long> { |
20 | 20 | if(null == value){ |
21 | 21 | return; |
22 | 22 | } |
23 | - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP)); | |
23 | + BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP)); | |
24 | 24 | |
25 | 25 | DecimalFormat df = new DecimalFormat("#0.###"); |
26 | 26 | gen.writeString(df.format(ans.doubleValue())); | ... | ... |
etrade-order/doc/job配置.txt
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
... | ... | @@ -813,6 +813,7 @@ public class OrderController { |
813 | 813 | ConfigQueryDto query = new ConfigQueryDto(); |
814 | 814 | query.setName("甄选运费"); |
815 | 815 | query.setMarketId(order.getMarketId()); |
816 | + query.setType("TransportFee"); | |
816 | 817 | BaseOutput<List<ConfigDto>> listBaseOutput = basicDataConfigRpc.queryAll(query); |
817 | 818 | if("200".equals(listBaseOutput.getCode())){ |
818 | 819 | List<ConfigDto> configDtos = listBaseOutput.getData(); | ... | ... |
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderDto.java
... | ... | @@ -240,7 +240,7 @@ public class OrderDto { |
240 | 240 | /** 订单配送状态 */ |
241 | 241 | private Integer achieveState; |
242 | 242 | /** 运费 */ |
243 | - private Long transportFee; | |
243 | + private BigDecimal transportFee; | |
244 | 244 | |
245 | 245 | public Integer getAchieveType() { |
246 | 246 | return achieveType; |
... | ... | @@ -317,6 +317,14 @@ public class OrderDto { |
317 | 317 | * 关联订单id |
318 | 318 | */ |
319 | 319 | private Long relationId; |
320 | + /** 订单收货人姓名 */ | |
321 | + private String receiverName; | |
322 | + /** 订单收货人电话 */ | |
323 | + private String receiverPhone; | |
324 | + /** 订单收货人地址 */ | |
325 | + private String address; | |
326 | + /** 配送方式 */ | |
327 | + private String wayType; | |
320 | 328 | |
321 | 329 | public BigDecimal getTotleSellerFee() { |
322 | 330 | return totleSellerFee; |
... | ... | @@ -720,11 +728,11 @@ public class OrderDto { |
720 | 728 | this.relationId = relationId; |
721 | 729 | } |
722 | 730 | |
723 | - public Long getTransportFee() { | |
731 | + public BigDecimal getTransportFee() { | |
724 | 732 | return transportFee; |
725 | 733 | } |
726 | 734 | |
727 | - public void setTransportFee(Long transportFee) { | |
735 | + public void setTransportFee(BigDecimal transportFee) { | |
728 | 736 | this.transportFee = transportFee; |
729 | 737 | } |
730 | 738 | |
... | ... | @@ -735,4 +743,36 @@ public class OrderDto { |
735 | 743 | public void setLocation(String location) { |
736 | 744 | this.location = location; |
737 | 745 | } |
746 | + | |
747 | + public String getReceiverName() { | |
748 | + return receiverName; | |
749 | + } | |
750 | + | |
751 | + public void setReceiverName(String receiverName) { | |
752 | + this.receiverName = receiverName; | |
753 | + } | |
754 | + | |
755 | + public String getReceiverPhone() { | |
756 | + return receiverPhone; | |
757 | + } | |
758 | + | |
759 | + public void setReceiverPhone(String receiverPhone) { | |
760 | + this.receiverPhone = receiverPhone; | |
761 | + } | |
762 | + | |
763 | + public String getAddress() { | |
764 | + return address; | |
765 | + } | |
766 | + | |
767 | + public void setAddress(String address) { | |
768 | + this.address = address; | |
769 | + } | |
770 | + | |
771 | + public String getWayType() { | |
772 | + return wayType; | |
773 | + } | |
774 | + | |
775 | + public void setWayType(String wayType) { | |
776 | + this.wayType = wayType; | |
777 | + } | |
738 | 778 | } | ... | ... |
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderQueryDto.java
... | ... | @@ -64,6 +64,11 @@ public class OrderQueryDto extends BasePageQuery { |
64 | 64 | |
65 | 65 | /** 支付结束时间 */ |
66 | 66 | private LocalDateTime payEndTime; |
67 | + /** 更新开始时间 */ | |
68 | + private LocalDateTime modifyTimeStart; | |
69 | + | |
70 | + /** 更新结束 */ | |
71 | + private LocalDateTime modifyTimeEnd; | |
67 | 72 | |
68 | 73 | private Integer verifyState; |
69 | 74 | |
... | ... | @@ -232,4 +237,20 @@ public class OrderQueryDto extends BasePageQuery { |
232 | 237 | public void setAchieveState(Integer achieveState) { |
233 | 238 | this.achieveState = achieveState; |
234 | 239 | } |
240 | + | |
241 | + public LocalDateTime getModifyTimeStart() { | |
242 | + return modifyTimeStart; | |
243 | + } | |
244 | + | |
245 | + public void setModifyTimeStart(LocalDateTime modifyTimeStart) { | |
246 | + this.modifyTimeStart = modifyTimeStart; | |
247 | + } | |
248 | + | |
249 | + public LocalDateTime getModifyTimeEnd() { | |
250 | + return modifyTimeEnd; | |
251 | + } | |
252 | + | |
253 | + public void setModifyTimeEnd(LocalDateTime modifyTimeEnd) { | |
254 | + this.modifyTimeEnd = modifyTimeEnd; | |
255 | + } | |
235 | 256 | } | ... | ... |
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowCO.java
... | ... | @@ -42,6 +42,13 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable { |
42 | 42 | */ |
43 | 43 | private Long source; |
44 | 44 | |
45 | + /** 订单状态 */ | |
46 | + private Integer state; | |
47 | + /** 订单状态 */ | |
48 | + private Integer verifyState; | |
49 | + /** 订单状态 */ | |
50 | + private Integer achieveState; | |
51 | + | |
45 | 52 | /** |
46 | 53 | * 开始时间 |
47 | 54 | */ |
... | ... | @@ -52,10 +59,16 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable { |
52 | 59 | */ |
53 | 60 | private LocalDateTime startSettleDateTime; |
54 | 61 | |
62 | + /** 更新开始时间 */ | |
63 | + private LocalDateTime modifyTimeStart; | |
64 | + | |
65 | + /** 更新结束 */ | |
66 | + private LocalDateTime modifyTimeEnd; | |
67 | + | |
55 | 68 | /** |
56 | 69 | *市场id |
57 | 70 | */ |
58 | - @NotNull | |
71 | + @NotNull(message = "市场不能为空") | |
59 | 72 | private Long marketId; |
60 | 73 | |
61 | 74 | public List<Long> getProducts() { |
... | ... | @@ -137,4 +150,44 @@ public class BusinessFlowCO extends ClientPageQueryCO implements Serializable { |
137 | 150 | public void setMarketId(Long marketId) { |
138 | 151 | this.marketId = marketId; |
139 | 152 | } |
153 | + | |
154 | + public Integer getState() { | |
155 | + return state; | |
156 | + } | |
157 | + | |
158 | + public void setState(Integer state) { | |
159 | + this.state = state; | |
160 | + } | |
161 | + | |
162 | + public Integer getVerifyState() { | |
163 | + return verifyState; | |
164 | + } | |
165 | + | |
166 | + public void setVerifyState(Integer verifyState) { | |
167 | + this.verifyState = verifyState; | |
168 | + } | |
169 | + | |
170 | + public Integer getAchieveState() { | |
171 | + return achieveState; | |
172 | + } | |
173 | + | |
174 | + public void setAchieveState(Integer achieveState) { | |
175 | + this.achieveState = achieveState; | |
176 | + } | |
177 | + | |
178 | + public LocalDateTime getModifyTimeStart() { | |
179 | + return modifyTimeStart; | |
180 | + } | |
181 | + | |
182 | + public void setModifyTimeStart(LocalDateTime modifyTimeStart) { | |
183 | + this.modifyTimeStart = modifyTimeStart; | |
184 | + } | |
185 | + | |
186 | + public LocalDateTime getModifyTimeEnd() { | |
187 | + return modifyTimeEnd; | |
188 | + } | |
189 | + | |
190 | + public void setModifyTimeEnd(LocalDateTime modifyTimeEnd) { | |
191 | + this.modifyTimeEnd = modifyTimeEnd; | |
192 | + } | |
140 | 193 | } | ... | ... |
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowVO.java
... | ... | @@ -108,14 +108,40 @@ public class BusinessFlowVO implements Serializable { |
108 | 108 | */ |
109 | 109 | private String sellerCode; |
110 | 110 | /** |
111 | + * 店铺名称 | |
112 | + */ | |
113 | + private String shopName; | |
114 | + /** | |
111 | 115 | * 卖家卡号 |
112 | 116 | */ |
113 | 117 | private String sellerCardNo; |
118 | + /** | |
119 | + * 商品单位 | |
120 | + */ | |
121 | + private String productUint; | |
122 | + /** | |
123 | + * 收货人 | |
124 | + */ | |
125 | + private String receiverName; | |
126 | + /** | |
127 | + * 收货人电话 | |
128 | + */ | |
129 | + private String receiverPhone; | |
130 | + /** | |
131 | + * 收货人地址 | |
132 | + */ | |
133 | + private String address; | |
114 | 134 | |
115 | 135 | /** |
116 | 136 | * 卖方店员名称 |
117 | 137 | */ |
118 | 138 | private String sellerName; |
139 | + /** 核销状态(1待核销,2已核销,0无需核销) */ | |
140 | + private Integer verifyState; | |
141 | + /** 配送状态(1待配送,2配送中,3已收货) */ | |
142 | + private Integer achieveState; | |
143 | + /** 送达类型(1自提,2配送) */ | |
144 | + private Integer achieveType; | |
119 | 145 | |
120 | 146 | public Long getId() { |
121 | 147 | return id; |
... | ... | @@ -284,4 +310,68 @@ public class BusinessFlowVO implements Serializable { |
284 | 310 | public void setProductSellerFee(Long productSellerFee) { |
285 | 311 | this.productSellerFee = productSellerFee; |
286 | 312 | } |
313 | + | |
314 | + public String getShopName() { | |
315 | + return shopName; | |
316 | + } | |
317 | + | |
318 | + public void setShopName(String shopName) { | |
319 | + this.shopName = shopName; | |
320 | + } | |
321 | + | |
322 | + public String getProductUint() { | |
323 | + return productUint; | |
324 | + } | |
325 | + | |
326 | + public void setProductUint(String productUint) { | |
327 | + this.productUint = productUint; | |
328 | + } | |
329 | + | |
330 | + public String getReceiverName() { | |
331 | + return receiverName; | |
332 | + } | |
333 | + | |
334 | + public void setReceiverName(String receiverName) { | |
335 | + this.receiverName = receiverName; | |
336 | + } | |
337 | + | |
338 | + public String getReceiverPhone() { | |
339 | + return receiverPhone; | |
340 | + } | |
341 | + | |
342 | + public void setReceiverPhone(String receiverPhone) { | |
343 | + this.receiverPhone = receiverPhone; | |
344 | + } | |
345 | + | |
346 | + public String getAddress() { | |
347 | + return address; | |
348 | + } | |
349 | + | |
350 | + public void setAddress(String address) { | |
351 | + this.address = address; | |
352 | + } | |
353 | + | |
354 | + public Integer getVerifyState() { | |
355 | + return verifyState; | |
356 | + } | |
357 | + | |
358 | + public void setVerifyState(Integer verifyState) { | |
359 | + this.verifyState = verifyState; | |
360 | + } | |
361 | + | |
362 | + public Integer getAchieveState() { | |
363 | + return achieveState; | |
364 | + } | |
365 | + | |
366 | + public void setAchieveState(Integer achieveState) { | |
367 | + this.achieveState = achieveState; | |
368 | + } | |
369 | + | |
370 | + public Integer getAchieveType() { | |
371 | + return achieveType; | |
372 | + } | |
373 | + | |
374 | + public void setAchieveType(Integer achieveType) { | |
375 | + this.achieveType = achieveType; | |
376 | + } | |
287 | 377 | } | ... | ... |
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
... | ... | @@ -123,7 +123,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { |
123 | 123 | |
124 | 124 | @Override |
125 | 125 | public BusinessFlowPageMessage<BusinessFlowVO> businessFlow(BusinessFlowCO co) { |
126 | - PageHelper.startPage(co.getPageNo(), co.getPageSize()); | |
126 | + PageHelper.startPage(co.getPageNo()==null?1:co.getPageNo(), co.getPageSize()==null?10:co.getPageSize()); | |
127 | 127 | List<BusinessFlowVO> list = orderQueryMapper.queryBusinessFlow(co); |
128 | 128 | BusinessFlowSumVO sumFlowVO = orderQueryMapper.querySumBusinessFlow(co); |
129 | 129 | // list.forEach(e->{ | ... | ... |
scripts/etrade-coupon/etrade_coupon_conf.txt
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | 任务配置 |
13 | 13 | |
14 | 14 | 运行模式* BEAN |
15 | - JobHandler* templateJobHandler | |
15 | + JobHandler* xtradeTemplateJobHandler | |
16 | 16 | |
17 | 17 | 2、优惠劵有效期定时任务 |
18 | 18 | 执行器* 电子交易结算 |
... | ... | @@ -26,7 +26,7 @@ |
26 | 26 | 任务配置 |
27 | 27 | |
28 | 28 | 运行模式* BEAN |
29 | - JobHandler* couponJobHandler | |
29 | + JobHandler* xtradeCouponJobHandler | |
30 | 30 | |
31 | 31 | 3、新增用户发放优惠劵 |
32 | 32 | 基础数据中心 | ... | ... |