etrade / zr-report · Commits

Commit 199dcc853d942028ab3ff83f2ea11879f6073eb7

Authored by zhangmeiyang
1 parent 5785e763
build: skipped

卖方小程序导出数据增加单位

Inline Side-by-side
Showing 6 changed files with 32 additions and 6 deletions
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderProductNewVO.java
  View file @199dcc8
... ... @@ -68,6 +68,10 @@ public class OrderProductNewVO implements Serializable {
68 68 private Integer productTradeType;
69 69  
70 70 private String redInk;
  71 + /**
  72 + * 产品单位
  73 + */
  74 + private String productUnit;
71 75  
72 76 public Long getId() {
73 77 return id;
... ... @@ -236,4 +240,12 @@ public class OrderProductNewVO implements Serializable {
236 240 public void setRedInk(String redInk) {
237 241 this.redInk = redInk;
238 242 }
  243 +
  244 + public String getProductUnit() {
  245 + return productUnit;
  246 + }
  247 +
  248 + public void setProductUnit(String productUnit) {
  249 + this.productUnit = productUnit;
  250 + }
239 251 }
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/ProductVO.java
  View file @199dcc8
... ... @@ -48,6 +48,11 @@ public class ProductVO {
48 48 /** 订单商品图片地址 */
49 49 private String productImgUrl;
50 50  
  51 + /**
  52 + * 产品单位
  53 + */
  54 + private String productUnit;
  55 +
51 56 public Long getId() {
52 57 return id;
53 58 }
... ... @@ -151,4 +156,12 @@ public class ProductVO {
151 156 public void setProductImgUrl(String productImgUrl) {
152 157 this.productImgUrl = productImgUrl;
153 158 }
  159 +
  160 + public String getProductUnit() {
  161 + return productUnit;
  162 + }
  163 +
  164 + public void setProductUnit(String productUnit) {
  165 + this.productUnit = productUnit;
  166 + }
154 167 }
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerImageMapper.xml
  View file @199dcc8
... ... @@ -353,6 +353,7 @@
353 353 , og.id AS id
354 354 , og.product_piece_weight AS productPieceWeight
355 355 , og.product_price AS productPrice
  356 + , og.product_unit AS productUnit
356 357 FROM
357 358 `zr_etrade`.`order_goods` og
358 359 WHERE 1=1
... ...
scripts/data_rec_dev.bat
  View file @199dcc8
... ... @@ -4,7 +4,7 @@ rem header
4 4 set header="Content-Type: application/json"
5 5 rem gateway
6 6 rem set gateway=http://test.gateway.diligrp.com:8285/ereport-start
7   -set gateway=http://localhost:9851
  7 +set gateway=http://localhost:9853
8 8 rem url
9 9 set tool_url=%gateway%/tool/settleDateTime
10 10 set buyer_url=%gateway%/api/statistics/order/buyer/generateImage
... ... @@ -14,7 +14,7 @@ set product_url=%gateway%/api/statistics/order/seller/generateImage
14 14 rem parameter config
15 15 curl -X GET -H %header% %tool_url% >daytime.txt
16 16  
17   -set startSettleDate=2023-01-01
  17 +set startSettleDate=2024-09-10
18 18 set endSettleDate=""
19 19 set /p endSettleDate=<daytime.txt
20 20 del %cd%\daytime.txt
... ...
scripts/data_rec_prod.bat
  View file @199dcc8
... ... @@ -3,7 +3,7 @@
3 3 rem header
4 4 set header="Content-Type: application/json"
5 5 rem gateway
6   -set gateway=https://gateway.diligrp.com/ereport-start
  6 +set gateway=https://gateway.diligrp.com/zrereport-start
7 7 rem url
8 8 set tool_url=%gateway%/tool/settleDateTime
9 9 set buyer_url=%gateway%/api/statistics/order/buyer/generateImage
... ... @@ -13,7 +13,7 @@ set product_url=%gateway%/api/statistics/product/generateImage
13 13 rem parameter config
14 14 curl -X GET -H %header% %tool_url% >daytime.txt
15 15  
16   -set startSettleDate=2023-01-01
  16 +set startSettleDate=2024-09-10
17 17 set endSettleDate=""
18 18 set /p endSettleDate=<daytime.txt
19 19 del %cd%\daytime.txt
... ...
scripts/data_rec_test.bat
  View file @199dcc8
... ... @@ -3,7 +3,7 @@
3 3 rem header
4 4 set header="Content-Type: application/json"
5 5 rem gateway
6   -set gateway=http://test.gateway.diligrp.com:8285/ereport-start
  6 +set gateway=http://test.gateway.diligrp.com:8285/zrereport-start
7 7 rem url
8 8 set tool_url=%gateway%/tool/settleDateTime
9 9 set buyer_url=%gateway%/api/statistics/order/buyer/generateImage
... ... @@ -13,7 +13,7 @@ set product_url=%gateway%/api/statistics/product/generateImage
13 13 rem parameter config
14 14 curl -X GET -H %header% %tool_url% >daytime.txt
15 15  
16   -set startSettleDate=2023-01-01
  16 +set startSettleDate=2024-09-10
17 17 set endSettleDate=""
18 18 set /p endSettleDate=<daytime.txt
19 19 del %cd%\daytime.txt
... ...