etrade / zr-report · Commits

Commit e4b3607460af39724c8c590ad6e6b3b1a39846e9

Authored by zhangmeiyang
1 parent c510bebc
build: skipped

feature商品修改

Inline Side-by-side
Showing 58 changed files with 374 additions and 1440 deletions
ereport-core/src/main/java/com/diligrp/etrade/report/controller/StatController.java
  View file @e4b3607
... ... @@ -5,7 +5,6 @@ import com.diligrp.etrade.report.domain.co.*;
5 5 import com.diligrp.etrade.report.domain.message.*;
6 6 import com.diligrp.etrade.report.domain.vo.*;
7 7 import com.diligrp.etrade.report.service.StatService;
8   -import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
9 8 import jakarta.annotation.Resource;
10 9 import org.springframework.validation.annotation.Validated;
11 10 import org.springframework.web.bind.annotation.PostMapping;
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/controller/ToolController.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.controller;
2 2  
3   -import com.diligrp.etrade.core.domain.Message;
4   -import com.diligrp.etrade.core.domain.PageMessage;
5 3 import com.diligrp.etrade.core.util.DateUtils;
6   -import com.diligrp.etrade.core.util.JsonUtils;
7 4 import com.diligrp.etrade.report.constant.NumberConstant;
8   -import com.diligrp.etrade.report.domain.co.DistributionAndSalesCO;
9   -import com.diligrp.etrade.report.domain.co.ImageCreateCO;
10   -import com.diligrp.etrade.report.domain.vo.DistributionAndSalesVO;
11 5 import com.diligrp.etrade.report.service.ImageCreateService;
12   -import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
13 6 import jakarta.annotation.Resource;
14   -import org.springframework.validation.annotation.Validated;
15 7 import org.springframework.web.bind.annotation.GetMapping;
16   -import org.springframework.web.bind.annotation.RequestBody;
17 8 import org.springframework.web.bind.annotation.RequestMapping;
18 9 import org.springframework.web.bind.annotation.RestController;
19 10  
20   -import java.time.LocalDate;
21 11 import java.time.LocalDateTime;
22   -import java.time.LocalTime;
23 12  
24 13 /**
25 14 * 工具控制器
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/BusinessFlowPageMessage.java
  View file @e4b3607
... ... @@ -2,20 +2,14 @@ package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
6   -import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
7 5 import com.diligrp.etrade.report.constant.NumberConstant;
8 6 import com.diligrp.etrade.report.domain.vo.BusinessFlowVO;
9 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
10   -import com.github.pagehelper.PageInfo;
11   -
12   -import java.util.List;
13 8  
14 9 public class BusinessFlowPageMessage extends PageMessage<BusinessFlowVO> {
15 10 /**
16 11 *订单商品总重量 单位斤
17 12 */
18   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
19 13 private Long totalProductWeight;
20 14  
21 15 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/CategoriesBusinessPageMessage.java
  View file @e4b3607
... ... @@ -2,14 +2,9 @@ package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
6   -import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
7 5 import com.diligrp.etrade.report.constant.NumberConstant;
8 6 import com.diligrp.etrade.report.domain.vo.CategoriesBusinessVO;
9 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
10   -import com.github.pagehelper.PageInfo;
11   -
12   -import java.util.List;
13 8  
14 9 public class CategoriesBusinessPageMessage extends PageMessage<CategoriesBusinessVO> {
15 10 /**
... ... @@ -19,7 +14,6 @@ public class CategoriesBusinessPageMessage extends PageMessage&lt;CategoriesBusines
19 14 /**
20 15 * 业务总重量
21 16 */
22   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
23 17 private Long totalBusinessWeight;
24 18 /**
25 19 * 业务总金额
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/DistributionAndSalesPageMessage.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
5 5 import com.diligrp.etrade.report.constant.NumberConstant;
6 6 import com.diligrp.etrade.report.domain.vo.DistributionAndSalesVO;
7 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
... ... @@ -17,18 +17,18 @@ public class DistributionAndSalesPageMessage extends PageMessage&lt;DistributionAnd
17 17 /**
18 18 * 进门净重
19 19 */
20   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  20 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
21 21 private BigDecimal totalSumWeightEntrance;
22 22 /**
23 23 * 分货重量
24 24 */
25   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  25 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
26 26 private BigDecimal totalSumWeightPick;
27 27  
28 28 /**
29 29 * 交易量
30 30 */
31   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  31 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
32 32 private BigDecimal totalTrading;
33 33  
34 34 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/InventoryPageMessage.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
5 5 import com.diligrp.etrade.report.constant.NumberConstant;
6 6 import com.diligrp.etrade.report.domain.vo.InventoryStatVO;
7 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
... ... @@ -18,38 +18,38 @@ public class InventoryPageMessage extends PageMessage&lt;InventoryStatVO&gt; {
18 18 /**
19 19 * 起始库存
20 20 */
21   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  21 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
22 22 private BigDecimal totalStartStock;
23 23 /**
24 24 * 运营库存
25 25 */
26   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  26 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
27 27 private BigDecimal totalOperateStock;
28 28 /**
29 29 * 期末库存
30 30 */
31   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  31 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
32 32 private BigDecimal totalEndStock;
33 33 /**
34 34 * 进门分货
35 35 *
36 36 */
37   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  37 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
38 38 private BigDecimal totalDoorStock;
39 39 /**
40 40 * 管理员调整库存
41 41 */
42   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  42 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
43 43 private BigDecimal totalAdminAdjustStock;
44 44 /**
45 45 * 商户调整库存
46 46 */
47   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  47 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
48 48 private BigDecimal totalMerchantAdjustmentStock;
49 49 /**
50 50 * 交易库存
51 51 */
52   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  52 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
53 53 private BigDecimal totalTradingStock;
54 54  
55 55 public InventoryPageMessage() {
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/SellerBusinessPageMessage.java
  View file @e4b3607
... ... @@ -2,14 +2,10 @@ package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
6   -import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
  5 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
7 6 import com.diligrp.etrade.report.constant.NumberConstant;
8 7 import com.diligrp.etrade.report.domain.vo.SellerBusinessVO;
9 8 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
10   -import com.github.pagehelper.PageInfo;
11   -
12   -import java.util.List;
13 9  
14 10 public class SellerBusinessPageMessage extends PageMessage<SellerBusinessVO> {
15 11 /**
... ... @@ -17,9 +13,9 @@ public class SellerBusinessPageMessage extends PageMessage&lt;SellerBusinessVO&gt; {
17 13 */
18 14 private Long totalBusinessCount;
19 15 /**
20   - *交易量 输出单位 公斤
  16 + *交易量 输出单位
21 17 */
22   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
  18 + @JsonSerialize(using = PieceSerializer.class)
23 19 private Long totalBusinessWeight;
24 20 /**
25 21 *交易额
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/SellerDistributionPageMessage.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.message;
2 2  
3 3 import com.diligrp.etrade.core.domain.PageMessage;
4   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
5 5 import com.diligrp.etrade.report.constant.NumberConstant;
6 6 import com.diligrp.etrade.report.domain.vo.SellerDistributionVO;
7 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
... ... @@ -17,31 +17,31 @@ public class SellerDistributionPageMessage extends PageMessage&lt;SellerDistributio
17 17 /**
18 18 * 到货量 合计
19 19 */
20   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  20 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
21 21 private BigDecimal totalArrival;
22 22 /**
23 23 * 分货量 合计
24 24 *
25 25 */
26   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  26 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
27 27 private BigDecimal totalDivide;
28 28  
29 29 /**
30 30 * 交易量 合计
31 31 */
32   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  32 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
33 33 private BigDecimal totalTrading;
34 34  
35 35 /**
36 36 * 商户调整量 合计
37 37 */
38   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  38 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
39 39 private BigDecimal totalMerchantAdjustment;
40 40  
41 41 /**
42 42 * 管理员调整 合计
43 43 */
44   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  44 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
45 45 private BigDecimal totalAdminAdjust;
46 46  
47 47 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/BusinessFlowVO.java
  View file @e4b3607
... ... @@ -50,25 +50,25 @@ public class BusinessFlowVO implements Serializable {
50 50 /**
51 51 *订单商品总重量 输出单位 公斤
52 52 */
53   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
  53 + @JsonSerialize(using = PieceSerializer.class)
54 54 private Long productWeight;
55 55  
56 56 /**
57 57 *订单商品件数 单位件
58 58 */
59   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  59 + @JsonSerialize(using = PieceSerializer.class)
60 60 private Long productPieces;
61 61  
62 62 /**
63 63 *订单商品件重单位 输出单位 公斤
64 64 */
65   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
  65 + @JsonSerialize(using = PieceSerializer.class)
66 66 private Long productPieceWeight;
67 67  
68 68 /**
69 69 * 产品单件价格
70 70 */
71   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  71 + @JsonSerialize(using = PieceSerializer.class)
72 72 private Long productPiecePrice;
73 73  
74 74 /**
... ... @@ -81,7 +81,7 @@ public class BusinessFlowVO implements Serializable {
81 81 * 商品重量单价 输出单位 元/公斤
82 82 *
83 83 */
84   - @JsonSerialize(using = CentToKiloJsonSerializer.class)
  84 + @JsonSerialize(using = PieceSerializer.class)
85 85 private Long productPrice;
86 86  
87 87 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/CategoriesBusinessVO.java
  View file @e4b3607
... ... @@ -35,7 +35,7 @@ public class CategoriesBusinessVO implements Serializable {
35 35 /**
36 36 *交易量 输出单位 公斤
37 37 */
38   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
  38 + @JsonSerialize(using = PieceSerializer.class)
39 39 private Long businessWeight;
40 40 /**
41 41 *交易额
... ... @@ -45,18 +45,18 @@ public class CategoriesBusinessVO implements Serializable {
45 45 /**
46 46 *最高单价 输出单位 元/公斤
47 47 */
48   - @JsonSerialize(using = CentToKiloJsonSerializer.class)
  48 + @JsonSerialize(using = PieceSerializer.class)
49 49 private Long maxAmount;
50 50 /**
51 51 *最低单价 输出单位 元/公斤
52 52 */
53   - @JsonSerialize(using = CentToKiloJsonSerializer.class)
  53 + @JsonSerialize(using = PieceSerializer.class)
54 54 private Long minAmount;
55 55  
56 56 /**
57 57 *平均价
58 58 */
59   - @JsonSerialize(using = PoundsToKiloStringSerializer.class)
  59 + @JsonSerialize(using = PieceSerializer.class)
60 60 private String avgAmount;
61 61  
62 62 public Long getCategoryId() {
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/DistributionAndSalesVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
5 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
6 6  
7 7 import java.io.Serializable;
... ... @@ -46,12 +46,12 @@ public class DistributionAndSalesVO implements Serializable {
46 46 /**
47 47 * 进门净重
48 48 */
49   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  49 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
50 50 private BigDecimal sumWeightEntrance;
51 51 /**
52 52 * 分货重量
53 53 */
54   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  54 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
55 55 private BigDecimal sumWeightPick;
56 56  
57 57 /**
... ... @@ -63,7 +63,7 @@ public class DistributionAndSalesVO implements Serializable {
63 63 /**
64 64 * 交易量
65 65 */
66   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  66 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
67 67 private BigDecimal trading;
68 68  
69 69 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/InventoryStatVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
  3 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
4 4 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
5 5  
6 6 import java.io.Serializable;
... ... @@ -49,38 +49,38 @@ public class InventoryStatVO implements Serializable {
49 49 /**
50 50 * 起始库存
51 51 */
52   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  52 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
53 53 private BigDecimal startStock;
54 54 /**
55 55 * 运营库存
56 56 */
57   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  57 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
58 58 private BigDecimal operateStock;
59 59 /**
60 60 * 期末库存
61 61 */
62   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  62 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
63 63 private BigDecimal endStock;
64 64 /**
65 65 * 进门分货
66 66 *
67 67 */
68   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  68 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
69 69 private BigDecimal doorStock;
70 70 /**
71 71 * 管理员调整库存
72 72 */
73   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  73 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
74 74 private BigDecimal adminAdjustStock;
75 75 /**
76 76 * 商户调整库存
77 77 */
78   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  78 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
79 79 private BigDecimal merchantAdjustmentStock;
80 80 /**
81 81 * 交易库存
82 82 */
83   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  83 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
84 84 private BigDecimal tradingStock;
85 85  
86 86 public String getCustomerCode() {
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderExportVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
5 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
6 6  
7 7 import java.io.Serializable;
... ... @@ -16,19 +16,19 @@ public class OrderExportVO implements Serializable {
16 16 /**
17 17 *订单净重合计
18 18 */
19   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  19 + @JsonSerialize(using = PieceSerializer.class)
20 20 private Long weightTotal;
21 21  
22 22 /**
23 23 *订单件重合计
24 24 */
25   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  25 + @JsonSerialize(using = PieceSerializer.class)
26 26 private Long pieceWeightTotal;
27 27  
28 28 /**
29 29 *订单件数合计
30 30 */
31   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  31 + @JsonSerialize(using = PieceSerializer.class)
32 32 private Long pieceTotal;
33 33  
34 34 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderProductNewVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3   -import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
4 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
6 5 import com.diligrp.etrade.report.enums.PayChannel;
7 6 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
8 7  
... ... @@ -41,8 +40,8 @@ public class OrderProductNewVO implements Serializable {
41 40 /** 商品名称 */
42 41 private String productName;
43 42  
44   - /** 商品重量单价 元/斤 */
45   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  43 + /** 商品重量单价 元/单位 */
  44 + @JsonSerialize(using = PieceSerializer.class)
46 45 private Long productPrice;
47 46  
48 47 /** 订单商品总价 元 */
... ... @@ -50,21 +49,13 @@ public class OrderProductNewVO implements Serializable {
50 49 private Long productTotalPrice;
51 50  
52 51 /** 订单商品总重量 单位斤*/
53   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  52 + @JsonSerialize(using = PieceSerializer.class)
54 53 private Long productWeight;
55 54  
56 55 /** 订单商品件数 单位件 */
57   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  56 + @JsonSerialize(using = PieceSerializer.class)
58 57 private Long productPieces;
59 58  
60   - /** 订单商品件重单位 斤 */
61   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
62   - private Long productPieceWeight;
63   -
64   - /** 订单商品件价单位 元 */
65   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
66   - private Long productPiecePrice;
67   -
68 59 /** 订单商品交易类型（1、按重方式，2、按件方式） */
69 60 private Integer productTradeType;
70 61  
... ... @@ -206,22 +197,6 @@ public class OrderProductNewVO implements Serializable {
206 197 this.productPieces = productPieces;
207 198 }
208 199  
209   - public Long getProductPieceWeight() {
210   - return productPieceWeight;
211   - }
212   -
213   - public void setProductPieceWeight(Long productPieceWeight) {
214   - this.productPieceWeight = productPieceWeight;
215   - }
216   -
217   - public Long getProductPiecePrice() {
218   - return productPiecePrice;
219   - }
220   -
221   - public void setProductPiecePrice(Long productPiecePrice) {
222   - this.productPiecePrice = productPiecePrice;
223   - }
224   -
225 200 public Integer getProductTradeType() {
226 201 return productTradeType;
227 202 }
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderProductVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
5 4 import com.diligrp.etrade.report.enums.PayChannel;
6 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
7 6  
8 7 import java.io.Serializable;
9   -import java.time.LocalDate;
10   -import java.time.LocalDateTime;
11 8 import java.util.List;
12 9  
13 10 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderVO.java
  View file @e4b3607
... ... @@ -2,13 +2,11 @@ package com.diligrp.etrade.report.domain.vo;
2 2  
3 3  
4 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  5 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
6 6 import com.diligrp.etrade.report.enums.PayChannel;
7 7 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
8 8  
9 9 import java.io.Serializable;
10   -import java.math.BigDecimal;
11   -import java.math.RoundingMode;
12 10 import java.time.LocalDateTime;
13 11 import java.util.List;
14 12  
... ... @@ -143,7 +141,7 @@ public class OrderVO implements Serializable {
143 141 /**
144 142 * 订单总重量
145 143 */
146   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  144 + @JsonSerialize(using = PieceSerializer.class)
147 145 private Long totleWeight;
148 146  
149 147 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/ProductRecordVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
5 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
6 6  
7 7 import java.io.Serializable;
... ... @@ -22,7 +22,7 @@ public class ProductRecordVO implements Serializable {
22 22 /**
23 23 * 交易重量
24 24 */
25   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  25 + @JsonSerialize(using = PieceSerializer.class)
26 26 private Long countGoods;
27 27  
28 28 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/ProductVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3   -import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
4 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
6 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
7 6  
8 7 public class ProductVO {
... ... @@ -20,7 +19,7 @@ public class ProductVO {
20 19 private String productName;
21 20  
22 21 /** 商品重量单价 元/斤 */
23   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  22 + @JsonSerialize(using = PieceSerializer.class)
24 23 private Long productPrice;
25 24  
26 25 /** 订单商品总价 元 */
... ... @@ -28,19 +27,19 @@ public class ProductVO {
28 27 private Long productTotalPrice;
29 28  
30 29 /** 订单商品总重量 单位斤*/
31   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  30 + @JsonSerialize(using = PieceSerializer.class)
32 31 private Long productWeight;
33 32  
34 33 /** 订单商品件数 单位件 */
35   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  34 + @JsonSerialize(using = PieceSerializer.class)
36 35 private Long productPieces;
37 36  
38 37 /** 订单商品件重单位 斤 */
39   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  38 + @JsonSerialize(using = PieceSerializer.class)
40 39 private Long productPieceWeight;
41 40  
42 41 /** 订单商品件价单位 元 */
43   - @JsonSerialize(using = MoneyF2YJsonSerializer.class)
  42 + @JsonSerialize(using = PieceSerializer.class)
44 43 private Long productPiecePrice;
45 44  
46 45 /** 订单商品交易类型（1、按重方式，2、按件方式） */
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/SellerBusinessVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
6 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
7 6  
8 7 import java.io.Serializable;
... ... @@ -62,7 +61,7 @@ public class SellerBusinessVO implements Serializable {
62 61 /**
63 62 *交易量
64 63 */
65   - @JsonSerialize(using = WeightKiloJsonSerializer.class)
  64 + @JsonSerialize(using = PieceSerializer.class)
66 65 private Long businessWeight;
67 66 /**
68 67 *交易额
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/SellerDistributionVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
5   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
6   -import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
7 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
8 6  
9 7 import java.io.Serializable;
... ... @@ -43,19 +41,19 @@ public class SellerDistributionVO implements Serializable {
43 41 /**
44 42 * 到货量
45 43 */
46   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  44 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
47 45 private BigDecimal arrival;
48 46 /**
49 47 * 分货量
50 48 *
51 49 */
52   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  50 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
53 51 private BigDecimal divide;
54 52  
55 53 /**
56 54 * 交易量
57 55 */
58   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  56 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
59 57 private BigDecimal trading;
60 58  
61 59 /**
... ... @@ -66,7 +64,7 @@ public class SellerDistributionVO implements Serializable {
66 64 /**
67 65 * 分货交易量
68 66 */
69   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  67 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
70 68 private BigDecimal split;
71 69 /**
72 70 * 拆分到达率
... ... @@ -76,7 +74,7 @@ public class SellerDistributionVO implements Serializable {
76 74 /**
77 75 * 商户调整量
78 76 */
79   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  77 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
80 78 private BigDecimal merchantAdjustment;
81 79 /**
82 80 * 商户调整到达率
... ... @@ -86,7 +84,7 @@ public class SellerDistributionVO implements Serializable {
86 84 /**
87 85 * 管理员调整金额
88 86 */
89   - @JsonSerialize(using = KiloBigDecimalSerializer.class)
  87 + @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
90 88 private BigDecimal adminAdjust;
91 89 /**
92 90 * 管理员调整到达率
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/StatOrderBuyerVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
5 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
6 6  
7 7 import java.io.Serializable;
... ... @@ -42,7 +42,7 @@ public class StatOrderBuyerVO implements Serializable {
42 42 /**
43 43 * 总计交易重量
44 44 */
45   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  45 + @JsonSerialize(using = PieceSerializer.class)
46 46 private Long totalCountGoods;
47 47  
48 48 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/StatOrderSellerVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
5 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
6 6  
7 7 import java.io.Serializable;
... ... @@ -38,7 +38,7 @@ public class StatOrderSellerVO implements Serializable {
38 38 /**
39 39 * 总计交易重量
40 40 */
41   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  41 + @JsonSerialize(using = PieceSerializer.class)
42 42 private Long totalCountGoods;
43 43  
44 44 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/StatProductSettleDateVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
5 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
6   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  5 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
7 6 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
8 7  
9 8 import java.io.Serializable;
... ... @@ -37,7 +36,7 @@ public class StatProductSettleDateVO implements Serializable {
37 36 /**
38 37 * 产品销售
39 38 */
40   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  39 + @JsonSerialize(using = PieceSerializer.class)
41 40 private Long productSales;
42 41  
43 42  
... ... @@ -50,7 +49,7 @@ public class StatProductSettleDateVO implements Serializable {
50 49 /**
51 50 * 商品最高单价
52 51 */
53   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  52 + @JsonSerialize(using = PieceSerializer.class)
54 53 private Long productHighPrice;
55 54  
56 55 /**
... ... @@ -65,7 +64,7 @@ public class StatProductSettleDateVO implements Serializable {
65 64 /**
66 65 * 商品最低单价
67 66 */
68   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  67 + @JsonSerialize(using = PieceSerializer.class)
69 68 private Long productLowPrice;
70 69  
71 70 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/StatProductVO.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3 3 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
4   -import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
5 4 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
6   -import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
  5 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
7 6 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
8 7  
9 8 import java.io.Serializable;
... ... @@ -40,7 +39,7 @@ public class StatProductVO implements Serializable {
40 39 /**
41 40 * 产品销售
42 41 */
43   - @JsonSerialize(using = WeightK2JJsonSerializer.class)
  42 + @JsonSerialize(using = PieceSerializer.class)
44 43 private Long productSales;
45 44  
46 45 /**
... ... @@ -52,7 +51,7 @@ public class StatProductVO implements Serializable {
52 51 /**
53 52 * 商品最高单价
54 53 */
55   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  54 + @JsonSerialize(using = PieceSerializer.class)
56 55 private Long productHighPrice;
57 56  
58 57 /**
... ... @@ -63,7 +62,7 @@ public class StatProductVO implements Serializable {
63 62 /**
64 63 * 商品最低单价
65 64 */
66   - @JsonSerialize(using = Cent2KiloJsonSerializer.class)
  65 + @JsonSerialize(using = PieceSerializer.class)
67 66 private Long productLowPrice;
68 67  
69 68 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/service/StatService.java
  View file @e4b3607
... ... @@ -4,8 +4,6 @@ import com.diligrp.etrade.core.domain.PageMessage;
4 4 import com.diligrp.etrade.report.domain.co.*;
5 5 import com.diligrp.etrade.report.domain.message.*;
6 6 import com.diligrp.etrade.report.domain.vo.*;
7   -import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
8   -import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
9 7  
10 8 public interface StatService {
11 9 /**
... ...
ereport-core/src/main/java/com/diligrp/etrade/report/service/impl/ImageCreateServiceImpl.java
  View file @e4b3607
1 1 package com.diligrp.etrade.report.service.impl;
2 2  
3   -import com.diligrp.etrade.core.util.DateUtils;
4 3 import com.diligrp.etrade.report.anno.DataSource;
5 4 import com.diligrp.etrade.report.anno.LogArgsInfo;
6 5 import com.diligrp.etrade.report.constant.DataSourceConstants;
7 6 import com.diligrp.etrade.report.constant.NumberConstant;
8 7 import com.diligrp.etrade.report.dao.ImageCreateMapper;
9   -import com.diligrp.etrade.report.domain.co.*;
10   -import com.diligrp.etrade.report.domain.vo.StatProductVO;
  8 +import com.diligrp.etrade.report.domain.co.ImageCreateCO;
  9 +import com.diligrp.etrade.report.domain.co.StatProductCO;
11 10 import com.diligrp.etrade.report.service.*;
12 11 import com.xxl.job.core.handler.annotation.XxlJob;
13 12 import jakarta.annotation.Resource;
14 13 import org.springframework.stereotype.Service;
15 14 import org.springframework.transaction.annotation.Transactional;
16 15 import org.springframework.util.CollectionUtils;
17   -import org.springframework.util.ObjectUtils;
18 16  
19 17 import java.time.LocalDate;
20 18 import java.time.LocalDateTime;
21 19 import java.time.LocalTime;
22   -import java.util.ArrayList;
23 20 import java.util.List;
24 21  
25 22 @Service
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/DataChangeMapper.xml
  View file @e4b3607
... ... @@ -5,14 +5,14 @@
5 5 <delete id="deleteByPrimaryKeyStatOrderBuyer" parameterType="java.lang.Long">
6 6 DELETE
7 7 FROM
8   - `dili_etrade`.`statistics_order_buyer`
  8 + `zr_etrade`.`statistics_order_buyer`
9 9 WHERE
10 10 id = #{id,jdbcType=BIGINT}
11 11 </delete>
12 12 <delete id="deleteBatchStatOrderBuyer">
13 13 DELETE
14 14 FROM
15   - `dili_etrade`.`statistics_order_buyer`
  15 + `zr_etrade`.`statistics_order_buyer`
16 16 WHERE
17 17 1 = 1
18 18 AND settle_date <![CDATA[>= #{startSettleDate}]]>
... ... @@ -23,7 +23,7 @@
23 23 parameterType="com.diligrp.etrade.report.model.StatOrderBuyer"
24 24 useGeneratedKeys="true">
25 25 INSERT INTO
26   - `dili_etrade`.`statistics_order_buyer` ( id
  26 + `zr_etrade`.`statistics_order_buyer` ( id
27 27 , market_id
28 28 , buyer_code
29 29 , buyer_id
... ... @@ -50,7 +50,7 @@
50 50 , #{version,jdbcType=INTEGER})
51 51 </insert>
52 52 <update id="updateByPrimaryKeyStatOrderBuyer" parameterType="com.diligrp.etrade.report.model.StatOrderBuyer">
53   - UPDATE `dili_etrade`.`statistics_order_buyer`
  53 + UPDATE `zr_etrade`.`statistics_order_buyer`
54 54 SET
55 55 market_id = #{marketId,jdbcType=BIGINT}
56 56 , buyer_code = #{buyerCode,jdbcType=VARCHAR}
... ... @@ -70,14 +70,14 @@
70 70 <delete id="deleteByPrimaryKeyStatOrderBuyerProduct" parameterType="java.lang.Long">
71 71 DELETE
72 72 FROM
73   - `dili_etrade`.`statistics_order_buyer_product`
  73 + `zr_etrade`.`statistics_order_buyer_product`
74 74 WHERE
75 75 id = #{id,jdbcType=BIGINT}
76 76 </delete>
77 77 <delete id="deleteBatchStatOrderBuyerProduct">
78 78 DELETE
79 79 FROM
80   - `dili_etrade`.`statistics_order_buyer_product`
  80 + `zr_etrade`.`statistics_order_buyer_product`
81 81 WHERE
82 82 1 = 1
83 83 AND settle_date <![CDATA[>= #{startSettleDate}]]>
... ... @@ -87,7 +87,7 @@
87 87 <insert id="insertStatOrderBuyerProduct" keyColumn="id" keyProperty="id"
88 88 parameterType="com.diligrp.etrade.report.model.StatOrderBuyerProduct" useGeneratedKeys="true">
89 89 INSERT INTO
90   - `dili_etrade`.`statistics_order_buyer_product`
  90 + `zr_etrade`.`statistics_order_buyer_product`
91 91 ( id
92 92 , market_id
93 93 , buyer_code
... ... @@ -120,7 +120,7 @@
120 120 </insert>
121 121 <update id="updateByPrimaryKeyStatOrderBuyerProduct"
122 122 parameterType="com.diligrp.etrade.report.model.StatOrderBuyerProduct">
123   - UPDATE `dili_etrade`.`statistics_order_buyer_product`
  123 + UPDATE `zr_etrade`.`statistics_order_buyer_product`
124 124 SET
125 125 market_id = #{marketId,jdbcType=BIGINT}
126 126 , buyer_code = #{buyerCode,jdbcType=VARCHAR}
... ... @@ -142,14 +142,14 @@
142 142 <delete id="deleteByPrimaryKeyStatOrderSeller" parameterType="java.lang.Long">
143 143 DELETE
144 144 FROM
145   - `dili_etrade`.`statistics_order_seller`
  145 + `zr_etrade`.`statistics_order_seller`
146 146 WHERE
147 147 id = #{id,jdbcType=BIGINT}
148 148 </delete>
149 149 <delete id="deleteBatchStatOrderSeller">
150 150 DELETE
151 151 FROM
152   - `dili_etrade`.`statistics_order_seller`
  152 + `zr_etrade`.`statistics_order_seller`
153 153 WHERE
154 154 1 = 1
155 155 AND settle_date <![CDATA[>= #{startSettleDate}]]>
... ... @@ -160,7 +160,7 @@
160 160 parameterType="com.diligrp.etrade.report.model.StatOrderSeller"
161 161 useGeneratedKeys="true">
162 162 INSERT INTO
163   - `dili_etrade`.`statistics_order_seller` ( id
  163 + `zr_etrade`.`statistics_order_seller` ( id
164 164 , market_id
165 165 , shop_id
166 166 , shop_name
... ... @@ -189,7 +189,7 @@
189 189 , #{version,jdbcType=INTEGER})
190 190 </insert>
191 191 <update id="updateByPrimaryKeyStatOrderSeller" parameterType="com.diligrp.etrade.report.model.StatOrderSeller">
192   - UPDATE `dili_etrade`.`statistics_order_seller`
  192 + UPDATE `zr_etrade`.`statistics_order_seller`
193 193 SET
194 194 market_id = #{marketId,jdbcType=BIGINT}
195 195 , shop_id = #{shopId,jdbcType=BIGINT}
... ... @@ -210,14 +210,14 @@
210 210 <delete id="deleteByPrimaryKeyStatOrderSellerProduct" parameterType="java.lang.Long">
211 211 DELETE
212 212 FROM
213   - `dili_etrade`.`statistics_order_seller_product`
  213 + `zr_etrade`.`statistics_order_seller_product`
214 214 WHERE
215 215 id = #{id,jdbcType=BIGINT}
216 216 </delete>
217 217 <delete id="deleteBatchStatOrderSellerProduct">
218 218 DELETE
219 219 FROM
220   - `dili_etrade`.`statistics_order_seller_product`
  220 + `zr_etrade`.`statistics_order_seller_product`
221 221 WHERE
222 222 1 = 1
223 223 AND settle_date <![CDATA[>= #{startSettleDate}]]>
... ... @@ -227,7 +227,7 @@
227 227 <insert id="insertStatOrderSellerProduct" keyColumn="id" keyProperty="id"
228 228 parameterType="com.diligrp.etrade.report.model.StatOrderSellerProduct" useGeneratedKeys="true">
229 229 INSERT INTO
230   - `dili_etrade`.`statistics_order_seller_product` ( id
  230 + `zr_etrade`.`statistics_order_seller_product` ( id
231 231 , market_id
232 232 , shop_id
233 233 , shop_name
... ... @@ -257,7 +257,7 @@
257 257 </insert>
258 258 <update id="updateByPrimaryKeyStatOrderSellerProduct"
259 259 parameterType="com.diligrp.etrade.report.model.StatOrderSellerProduct">
260   - UPDATE `dili_etrade`.`statistics_order_seller_product`
  260 + UPDATE `zr_etrade`.`statistics_order_seller_product`
261 261 SET
262 262 market_id = #{marketId,jdbcType=BIGINT}
263 263 , shop_id = #{shopId,jdbcType=BIGINT}
... ... @@ -278,14 +278,14 @@
278 278 <delete id="deleteByPrimaryKeyStatProduct" parameterType="java.lang.Long">
279 279 DELETE
280 280 FROM
281   - `dili_etrade`.`statistics_product`
  281 + `zr_etrade`.`statistics_product`
282 282 WHERE
283 283 id = #{id,jdbcType=BIGINT}
284 284 </delete>
285 285 <delete id="deleteBatchStatProduct">
286 286 DELETE
287 287 FROM
288   - `dili_etrade`.`statistics_product`
  288 + `zr_etrade`.`statistics_product`
289 289 WHERE
290 290 1 = 1
291 291 AND settle_date <![CDATA[>= #{startSettleDate}]]>
... ... @@ -295,7 +295,7 @@
295 295 <insert id="insertStatProduct" keyColumn="id" keyProperty="id"
296 296 parameterType="com.diligrp.etrade.report.model.StatProduct" useGeneratedKeys="true">
297 297 INSERT INTO
298   - `dili_etrade`.`statistics_product` ( id
  298 + `zr_etrade`.`statistics_product` ( id
299 299 , market_id
300 300 , product_id
301 301 , product_code
... ... @@ -322,7 +322,7 @@
322 322 , #{version,jdbcType=INTEGER})
323 323 </insert>
324 324 <update id="updateByPrimaryKeyStatProduct" parameterType="com.diligrp.etrade.report.model.StatProduct">
325   - UPDATE `dili_etrade`.`statistics_product`
  325 + UPDATE `zr_etrade`.`statistics_product`
326 326 SET
327 327 market_id = #{marketId,jdbcType=BIGINT}
328 328 , product_id = #{productId,jdbcType=BIGINT}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/ImageCreateMapper.xml
  View file @e4b3607
... ... @@ -16,8 +16,8 @@
16 16 , CONVERT(o.pay_time, date) AS settleDate
17 17 , op.payee_seller_id AS employeeId
18 18 FROM
19   - `dili_etrade`.`order` o
20   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  19 + `zr_etrade`.`order` o
  20 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
21 21 WHERE
22 22 o.state IN (3,5)
23 23 AND o.order_status IS NULL
... ... @@ -40,9 +40,9 @@
40 40 , CONVERT(o.pay_time, date) AS settleDate
41 41 , op.payee_seller_id AS employeeId
42 42 FROM
43   - `dili_etrade`.`order_goods` og
44   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
45   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  43 + `zr_etrade`.`order_goods` og
  44 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  45 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
46 46 WHERE
47 47 o.state IN (3,5)
48 48 AND o.order_status IS NULL
... ... @@ -64,8 +64,8 @@
64 64 , op.pay_channel AS payChannel
65 65 , CONVERT(o.pay_time, date) AS settleDate
66 66 FROM
67   - `dili_etrade`.`order` o
68   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  67 + `zr_etrade`.`order` o
  68 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
69 69 WHERE
70 70 o.state IN (3,5)
71 71 AND o.order_status IS NULL
... ... @@ -89,9 +89,9 @@
89 89 , op.pay_channel AS payChannel
90 90 , CONVERT(o.pay_time, date) AS settleDate
91 91 FROM
92   - `dili_etrade`.`order_goods` og
93   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
94   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  92 + `zr_etrade`.`order_goods` og
  93 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  94 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
95 95 WHERE
96 96 o.state IN (3,5)
97 97 AND o.order_status IS NULL
... ... @@ -124,9 +124,9 @@
124 124 , MIN(og.product_price) AS productLowPrice
125 125 , CONVERT(o.pay_time, date) AS settleDate
126 126 FROM
127   - `dili_etrade`.`order_goods` og
128   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
129   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  127 + `zr_etrade`.`order_goods` og
  128 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  129 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
130 130 WHERE 1=1
131 131 AND o.state IN (3,5)
132 132 AND o.order_status IS NULL
... ... @@ -145,9 +145,9 @@
145 145 , NULL AS productLowPrice
146 146 , CONVERT(o.created_time, date) AS settleDate
147 147 FROM
148   - `dili_etrade`.`order_goods` og
149   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
150   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  148 + `zr_etrade`.`order_goods` og
  149 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  150 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
151 151 WHERE 1=1
152 152 AND o.state = 3
153 153 AND o.order_status = 2
... ... @@ -174,9 +174,9 @@
174 174 , SUM(IFNULL(og.product_total_price, 0)) AS productSalesAmount
175 175 , CONVERT(o.pay_time, date) AS settleDate
176 176 FROM
177   - `dili_etrade`.`order_goods` og
178   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
179   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  177 + `zr_etrade`.`order_goods` og
  178 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  179 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
180 180 WHERE 1=1
181 181 AND o.state = 3
182 182 AND o.order_status = 2
... ... @@ -185,7 +185,7 @@
185 185 GROUP BY marketId, productId, settleDate
186 186 </select>
187 187 <select id="queryProduct" resultType="com.diligrp.etrade.report.domain.co.StatProductCO">
188   - SELECT * FROM `dili_etrade`.`statistics_product` sp
  188 + SELECT * FROM `zr_etrade`.`statistics_product` sp
189 189 WHERE 1=1
190 190 AND sp.market_id = #{marketId}
191 191 AND sp.product_id = #{productId}
... ... @@ -196,9 +196,9 @@
196 196 MAX(og.product_price) AS productHighPrice
197 197 , MIN(og.product_price) AS productLowPrice
198 198 FROM
199   - `dili_etrade`.`order_goods` og
200   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
201   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  199 + `zr_etrade`.`order_goods` og
  200 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  201 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
202 202 WHERE 1=1
203 203 AND o.market_id = #{marketId}
204 204 AND p.category_id = #{productId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatMapper.xml
  View file @e4b3607
... ... @@ -50,11 +50,11 @@
50 50 , se.card_no AS payeeCardNo
51 51 , se.name AS creater
52 52 FROM
53   - `dili_etrade`.`order_goods` og
54   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
55   - LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
56   - LEFT JOIN `dili_etrade`.`shop` s ON s.id = o.shop_id
57   - LEFT JOIN `dili_etrade`.`store_employee` se ON se.id = o.seller_id
  53 + `zr_etrade`.`order_goods` og
  54 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  55 + LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
  56 + LEFT JOIN `zr_etrade`.`shop` s ON s.id = o.shop_id
  57 + LEFT JOIN `zr_etrade`.`store_employee` se ON se.id = o.seller_id
58 58 WHERE 1=1
59 59 AND o.state IN (3,5)
60 60 AND o.order_status IS NULL
... ... @@ -115,11 +115,11 @@
115 115 , se.card_no AS payeeCardNo
116 116 , se.name AS creater
117 117 FROM
118   - `dili_etrade`.`order_goods` og
119   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
120   - LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
121   - LEFT JOIN `dili_etrade`.`shop` s ON s.id = o.shop_id
122   - LEFT JOIN `dili_etrade`.`store_employee` se ON se.id = o.seller_id
  118 + `zr_etrade`.`order_goods` og
  119 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  120 + LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
  121 + LEFT JOIN `zr_etrade`.`shop` s ON s.id = o.shop_id
  122 + LEFT JOIN `zr_etrade`.`store_employee` se ON se.id = o.seller_id
123 123 WHERE 1=1
124 124 AND o.state =3
125 125 AND o.order_status = 2
... ... @@ -173,9 +173,9 @@
173 173 , og.product_total_price AS productTotalPrice
174 174 , og.product_seller_fee AS productSellerFee
175 175 FROM
176   - `dili_etrade`.`order_goods` og
177   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
178   - LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
  176 + `zr_etrade`.`order_goods` og
  177 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  178 + LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
179 179 WHERE 1=1
180 180 AND o.state IN (3,5)
181 181 AND o.order_status IS NULL
... ... @@ -218,9 +218,9 @@
218 218 , og.product_total_price AS productTotalPrice
219 219 , og.product_seller_fee AS productSellerFee
220 220 FROM
221   - `dili_etrade`.`order_goods` og
222   - LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
223   - LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
  221 + `zr_etrade`.`order_goods` og
  222 + LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
  223 + LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
224 224 WHERE 1=1
225 225 AND o.state = 3
226 226 AND o.order_status = 2
... ... @@ -290,9 +290,9 @@
290 290 , p.`alias` AS productName
291 291 , COUNT(1) AS businessCount
292 292 FROM
293   - `dili_etrade`.`order_goods` og
294   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
295   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  293 + `zr_etrade`.`order_goods` og
  294 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  295 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
296 296 LEFT JOIN (
297 297 SELECT
298 298 ss.id
... ... @@ -305,7 +305,7 @@
305 305 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
306 306 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
307 307 FROM
308   - `dili_etrade`.`shop` ss
  308 + `zr_etrade`.`shop` ss
309 309 ) s ON s.id = o.shop_id
310 310 WHERE 1=1
311 311 AND og.state = 1
... ... @@ -365,9 +365,9 @@
365 365 , p.`alias` AS productName
366 366 , -COUNT(1) AS businessCount
367 367 FROM
368   - `dili_etrade`.`order_goods` og
369   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
370   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  368 + `zr_etrade`.`order_goods` og
  369 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  370 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
371 371 LEFT JOIN (
372 372 SELECT
373 373 ss.id
... ... @@ -380,7 +380,7 @@
380 380 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
381 381 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
382 382 FROM
383   - `dili_etrade`.`shop` ss
  383 + `zr_etrade`.`shop` ss
384 384 ) s ON s.id = o.shop_id
385 385 WHERE 1=1
386 386 AND og.state = 1
... ... @@ -454,9 +454,9 @@
454 454 , s.id AS shopId
455 455 , o.shop_customer_id AS customId
456 456 FROM
457   - `dili_etrade`.`order_goods` og
458   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
459   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  457 + `zr_etrade`.`order_goods` og
  458 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  459 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
460 460 LEFT JOIN (
461 461 SELECT
462 462 ss.id
... ... @@ -468,7 +468,7 @@
468 468 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
469 469 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
470 470 FROM
471   - `dili_etrade`.`shop` ss
  471 + `zr_etrade`.`shop` ss
472 472 ) s ON s.id = o.shop_id
473 473 WHERE
474 474 og.state = 1
... ... @@ -522,9 +522,9 @@
522 522 , s.id AS shopId
523 523 , o.shop_customer_id AS customId
524 524 FROM
525   - `dili_etrade`.`order_goods` og
526   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
527   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  525 + `zr_etrade`.`order_goods` og
  526 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  527 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
528 528 LEFT JOIN (
529 529 SELECT
530 530 ss.id
... ... @@ -536,7 +536,7 @@
536 536 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
537 537 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
538 538 FROM
539   - `dili_etrade`.`shop` ss
  539 + `zr_etrade`.`shop` ss
540 540 ) s ON s.id = o.shop_id
541 541 WHERE
542 542 og.state = 1
... ... @@ -622,14 +622,14 @@
622 622 ,s.xname AS districtName
623 623 ,p.category_id AS categoryId
624 624 ,p.category_id_path_json -> '$[2]' AS categoryThreeId
625   - FROM `dili_etrade`.`order_goods` og
626   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
627   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  625 + FROM `zr_etrade`.`order_goods` og
  626 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  627 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
628 628 LEFT JOIN ( SELECT
629 629 ss.id
630 630 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
631 631 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
632   - FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
  632 + FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
633 633 WHERE 1=1
634 634 AND og.state = 1
635 635 AND o.state = 3
... ... @@ -698,14 +698,14 @@
698 698 ,s.xname AS districtName
699 699 ,p.category_id AS categoryId
700 700 ,p.category_id_path_json -> '$[2]' AS categoryThreeId
701   - FROM `dili_etrade`.`order_goods` og
702   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
703   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  701 + FROM `zr_etrade`.`order_goods` og
  702 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  703 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
704 704 LEFT JOIN ( SELECT
705 705 ss.id
706 706 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
707 707 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
708   - FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
  708 + FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
709 709 WHERE 1=1
710 710 AND og.state = 1
711 711 AND o.state = 5
... ... @@ -774,14 +774,14 @@
774 774 ,s.xname AS districtName
775 775 ,p.category_id AS categoryId
776 776 ,p.category_id_path_json -> '$[2]' AS categoryThreeId
777   - FROM `dili_etrade`.`order_goods` og
778   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
779   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  777 + FROM `zr_etrade`.`order_goods` og
  778 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  779 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
780 780 LEFT JOIN ( SELECT
781 781 ss.id
782 782 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
783 783 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
784   - FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
  784 + FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
785 785 WHERE 1=1
786 786 AND og.state = 1
787 787 AND o.state = 3
... ... @@ -870,14 +870,14 @@
870 870 ,s.xname AS districtName
871 871 ,p.category_id AS categoryId
872 872 ,p.category_id_path_json -> '$[2]' AS categoryThreeId
873   - FROM `dili_etrade`.`order_goods` og
874   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
875   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  873 + FROM `zr_etrade`.`order_goods` og
  874 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  875 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
876 876 LEFT JOIN ( SELECT
877 877 ss.id
878 878 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
879 879 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
880   - FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
  880 + FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
881 881 WHERE 1=1
882 882 AND og.state = 1
883 883 AND o.state IN (3,5)
... ... @@ -946,14 +946,14 @@
946 946 ,s.xname AS districtName
947 947 ,p.category_id AS categoryId
948 948 ,p.category_id_path_json -> '$[2]' AS categoryThreeId
949   - FROM `dili_etrade`.`order_goods` og
950   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
951   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  949 + FROM `zr_etrade`.`order_goods` og
  950 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  951 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
952 952 LEFT JOIN ( SELECT
953 953 ss.id
954 954 , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
955 955 , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
956   - FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
  956 + FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
957 957 WHERE 1=1
958 958 AND og.state = 1
959 959 AND o.state = 3
... ... @@ -1038,8 +1038,8 @@
1038 1038 , sd.source_type
1039 1039 , sd.operate_stock
1040 1040 FROM
1041   - `dili_etrade`.`stock_details` sd
1042   - LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
  1041 + `zr_etrade`.`stock_details` sd
  1042 + LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
1043 1043 WHERE 1 = 1
1044 1044 AND sd.parent = 0
1045 1045 AND sd.market_id = #{marketId}
... ... @@ -1090,9 +1090,9 @@
1090 1090 , sdc.operate_stock AS sdc_operate_stock
1091 1091 , sdc.source_type AS sdc_source_type
1092 1092 FROM
1093   - `dili_etrade`.`stock_details` sd
1094   - LEFT JOIN `dili_etrade`.`stock_details` sdc ON sdc.parent = sd.id
1095   - LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
  1093 + `zr_etrade`.`stock_details` sd
  1094 + LEFT JOIN `zr_etrade`.`stock_details` sdc ON sdc.parent = sd.id
  1095 + LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
1096 1096 WHERE 1 = 1
1097 1097 AND sd.source_type = 4
1098 1098 AND sd.market_id = #{marketId}
... ... @@ -1238,9 +1238,9 @@
1238 1238 , p.category_id_path_json -> '$[2]' AS three_category_id
1239 1239 , og.product_weight AS weight
1240 1240 , o.order_status AS order_status
1241   - FROM `dili_etrade`.`order_goods` og
1242   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
1243   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  1241 + FROM `zr_etrade`.`order_goods` og
  1242 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  1243 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
1244 1244 WHERE 1=1
1245 1245 AND og.state = 1
1246 1246 AND o.state IN (3,5)
... ... @@ -1274,9 +1274,9 @@
1274 1274 , p.category_id_path_json -> '$[2]' AS three_category_id
1275 1275 , og.product_weight AS weight
1276 1276 , o.order_status AS order_status
1277   - FROM `dili_etrade`.`order_goods` og
1278   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
1279   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  1277 + FROM `zr_etrade`.`order_goods` og
  1278 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  1279 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
1280 1280 WHERE 1=1
1281 1281 AND og.state = 1
1282 1282 AND o.state = 3
... ... @@ -1362,8 +1362,8 @@
1362 1362 , sd.source_type
1363 1363 , sd.operate_stock
1364 1364 FROM
1365   - `dili_etrade`.`stock_details` sd
1366   - LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
  1365 + `zr_etrade`.`stock_details` sd
  1366 + LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
1367 1367 WHERE 1 = 1
1368 1368 AND sd.parent = 0
1369 1369 AND sd.market_id = #{marketId}
... ... @@ -1414,9 +1414,9 @@
1414 1414 , sdc.operate_stock AS sdc_operate_stock
1415 1415 , sdc.source_type AS sdc_source_type
1416 1416 FROM
1417   - `dili_etrade`.`stock_details` sd
1418   - LEFT JOIN `dili_etrade`.`stock_details` sdc ON sdc.parent = sd.id
1419   - LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
  1417 + `zr_etrade`.`stock_details` sd
  1418 + LEFT JOIN `zr_etrade`.`stock_details` sdc ON sdc.parent = sd.id
  1419 + LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
1420 1420 WHERE 1 = 1
1421 1421 AND sd.source_type = 4
1422 1422 AND sd.market_id = #{marketId}
... ... @@ -1556,9 +1556,9 @@
1556 1556 , p.category_id_path_json -> '$[2]' AS three_category_id
1557 1557 , og.product_weight AS weight
1558 1558 , o.order_status as order_status
1559   - FROM `dili_etrade`.`order_goods` og
1560   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
1561   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  1559 + FROM `zr_etrade`.`order_goods` og
  1560 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  1561 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
1562 1562 WHERE 1=1
1563 1563 AND og.state = 1
1564 1564 AND o.state IN (3,5)
... ... @@ -1592,9 +1592,9 @@
1592 1592 , p.category_id_path_json -> '$[2]' AS three_category_id
1593 1593 , og.product_weight AS weight
1594 1594 , o.order_status as order_status
1595   - FROM `dili_etrade`.`order_goods` og
1596   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
1597   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  1595 + FROM `zr_etrade`.`order_goods` og
  1596 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  1597 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
1598 1598 WHERE 1=1
1599 1599 AND og.state = 1
1600 1600 AND o.state = 3
... ... @@ -2096,9 +2096,9 @@
2096 2096 , p.category_id AS category_id
2097 2097 , p.category_id_path_json -> '$[2]' AS three_category_id
2098 2098 , og.product_weight AS weight
2099   - FROM `dili_etrade`.`order_goods` og
2100   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2101   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2099 + FROM `zr_etrade`.`order_goods` og
  2100 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2101 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2102 2102 WHERE 1=1
2103 2103 AND og.state = 1
2104 2104 AND o.state IN (3,5)
... ... @@ -2116,9 +2116,9 @@
2116 2116 , p.category_id AS category_id
2117 2117 , p.category_id_path_json -> '$[2]' AS three_category_id
2118 2118 , og.product_weight AS weight
2119   - FROM `dili_etrade`.`order_goods` og
2120   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2121   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2119 + FROM `zr_etrade`.`order_goods` og
  2120 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2121 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2122 2122 WHERE 1=1
2123 2123 AND og.state = 1
2124 2124 AND o.state = 3
... ... @@ -2270,9 +2270,9 @@
2270 2270 , p.category_id AS category_id
2271 2271 , p.category_id_path_json -> '$[2]' AS three_category_id
2272 2272 , og.product_weight AS weight
2273   - FROM `dili_etrade`.`order_goods` og
2274   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2275   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2273 + FROM `zr_etrade`.`order_goods` og
  2274 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2275 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2276 2276 WHERE 1=1
2277 2277 AND og.state = 1
2278 2278 AND o.state IN (3,5)
... ... @@ -2290,9 +2290,9 @@
2290 2290 , p.category_id AS category_id
2291 2291 , p.category_id_path_json -> '$[2]' AS three_category_id
2292 2292 , og.product_weight AS weight
2293   - FROM `dili_etrade`.`order_goods` og
2294   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2295   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2293 + FROM `zr_etrade`.`order_goods` og
  2294 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2295 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2296 2296 WHERE 1=1
2297 2297 AND og.state = 1
2298 2298 AND o.state = 3
... ... @@ -2452,9 +2452,9 @@
2452 2452 , p.category_id AS category_id
2453 2453 , p.category_id_path_json -> '$[2]' AS three_category_id
2454 2454 , og.product_weight AS weight
2455   - FROM `dili_etrade`.`order_goods` og
2456   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2457   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2455 + FROM `zr_etrade`.`order_goods` og
  2456 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2457 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2458 2458 WHERE 1=1
2459 2459 AND og.state = 1
2460 2460 AND o.state IN (3,5)
... ... @@ -2472,9 +2472,9 @@
2472 2472 , p.category_id AS category_id
2473 2473 , p.category_id_path_json -> '$[2]' AS three_category_id
2474 2474 , og.product_weight AS weight
2475   - FROM `dili_etrade`.`order_goods` og
2476   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2477   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2475 + FROM `zr_etrade`.`order_goods` og
  2476 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2477 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2478 2478 WHERE 1=1
2479 2479 AND og.state = 1
2480 2480 AND o.state = 3
... ... @@ -2633,9 +2633,9 @@
2633 2633 , p.category_id AS category_id
2634 2634 , p.category_id_path_json -> '$[2]' AS three_category_id
2635 2635 , og.product_weight AS weight
2636   - FROM `dili_etrade`.`order_goods` og
2637   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2638   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2636 + FROM `zr_etrade`.`order_goods` og
  2637 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2638 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2639 2639 WHERE 1=1
2640 2640 AND og.state = 1
2641 2641 AND o.state IN (3,5)
... ... @@ -2653,9 +2653,9 @@
2653 2653 , p.category_id AS category_id
2654 2654 , p.category_id_path_json -> '$[2]' AS three_category_id
2655 2655 , og.product_weight AS weight
2656   - FROM `dili_etrade`.`order_goods` og
2657   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
2658   - LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
  2656 + FROM `zr_etrade`.`order_goods` og
  2657 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  2658 + LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
2659 2659 WHERE 1=1
2660 2660 AND og.state = 1
2661 2661 AND o.state = 3
... ... @@ -2739,7 +2739,7 @@
2739 2739 , SUM(IF(sd.source_type = 3, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock) AS merchantAdjustmentStock
2740 2740 , SUM(IF(sd.source_type = 4, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock) AS tradingStock
2741 2741 FROM
2742   - `dili_etrade`.`stock_details` sd
  2742 + `zr_etrade`.`stock_details` sd
2743 2743 WHERE
2744 2744 1 = 1
2745 2745 AND sd.market_id = #{marketId}
... ... @@ -2753,21 +2753,21 @@
2753 2753 sd.product_id
2754 2754 , MAX(sd.id) AS 'max_id'
2755 2755 FROM
2756   - `dili_etrade`.`stock_details` sd
  2756 + `zr_etrade`.`stock_details` sd
2757 2757 WHERE
2758 2758 1 = 1
2759 2759 AND sd.created_time BETWEEN #{startSettleDateTime} AND #{endSettleDateTime}
2760 2760 AND sd.parent = 0
2761 2761 GROUP BY sd.product_id
2762 2762 ) t2 ON t2.product_id = t1.product_id
2763   - LEFT JOIN `dili_etrade`.`stock_details` t3 ON t3.id = t2.max_id
  2763 + LEFT JOIN `zr_etrade`.`stock_details` t3 ON t3.id = t2.max_id
2764 2764 LEFT JOIN
2765 2765 (
2766 2766 SELECT
2767 2767 sd.product_id
2768 2768 , MAX(sd.id) AS 'min_id'
2769 2769 FROM
2770   - `dili_etrade`.`stock_details` sd
  2770 + `zr_etrade`.`stock_details` sd
2771 2771 WHERE
2772 2772 1 = 1
2773 2773 AND sd.created_time <![CDATA[< #{startSettleDateTime}]]>
... ... @@ -2776,9 +2776,9 @@
2776 2776 ) t4 ON t4.product_id = t1.product_id
2777 2777 LEFT JOIN dili_etrade.stock_details t5 ON t5.id = t4.min_id
2778 2778 ) t
2779   - LEFT JOIN `dili_etrade`.`product` p ON t.product_id = p.id
  2779 + LEFT JOIN `zr_etrade`.`product` p ON t.product_id = p.id
2780 2780 LEFT JOIN `dili-customer`.customer c ON t.customer_id = c.id
2781   - LEFT JOIN `dili_etrade`.`shop` s ON s.id = t.shop_id
  2781 + LEFT JOIN `zr_etrade`.`shop` s ON s.id = t.shop_id
2782 2782 WHERE 1=1
2783 2783 <if test="categoryIds !=null and categoryIds.size() > 0 ">
2784 2784 and p.category_id in
... ... @@ -2858,7 +2858,7 @@
2858 2858 , SUM(IF(sd.source_type = 3, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock) AS merchantAdjustmentStock
2859 2859 , SUM(IF(sd.source_type = 4, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock) AS tradingStock
2860 2860 FROM
2861   - `dili_etrade`.`stock_details` sd
  2861 + `zr_etrade`.`stock_details` sd
2862 2862 WHERE
2863 2863 1 = 1
2864 2864 AND sd.market_id = #{marketId}
... ... @@ -2872,21 +2872,21 @@
2872 2872 sd.product_id
2873 2873 , MAX(sd.id) AS 'max_id'
2874 2874 FROM
2875   - `dili_etrade`.`stock_details` sd
  2875 + `zr_etrade`.`stock_details` sd
2876 2876 WHERE
2877 2877 1 = 1
2878 2878 AND sd.created_time BETWEEN #{startSettleDateTime} AND #{endSettleDateTime}
2879 2879 AND sd.parent = 0
2880 2880 GROUP BY sd.product_id
2881 2881 ) t2 ON t2.product_id = t1.product_id
2882   - LEFT JOIN `dili_etrade`.`stock_details` t3 ON t3.id = t2.max_id
  2882 + LEFT JOIN `zr_etrade`.`stock_details` t3 ON t3.id = t2.max_id
2883 2883 LEFT JOIN
2884 2884 (
2885 2885 SELECT
2886 2886 sd.product_id
2887 2887 , MAX(sd.id) AS 'min_id'
2888 2888 FROM
2889   - `dili_etrade`.`stock_details` sd
  2889 + `zr_etrade`.`stock_details` sd
2890 2890 WHERE
2891 2891 1 = 1
2892 2892 AND sd.created_time <![CDATA[< #{startSettleDateTime}]]>
... ... @@ -2895,9 +2895,9 @@
2895 2895 ) t4 ON t4.product_id = t1.product_id
2896 2896 LEFT JOIN dili_etrade.stock_details t5 ON t5.id = t4.min_id
2897 2897 ) t
2898   - LEFT JOIN `dili_etrade`.`product` p ON t.product_id = p.id
  2898 + LEFT JOIN `zr_etrade`.`product` p ON t.product_id = p.id
2899 2899 LEFT JOIN `dili-customer`.customer c ON t.customer_id = c.id
2900   - LEFT JOIN `dili_etrade`.`shop` s ON s.id = t.shop_id
  2900 + LEFT JOIN `zr_etrade`.`shop` s ON s.id = t.shop_id
2901 2901 WHERE 1=1
2902 2902 <if test="categoryIds !=null and categoryIds.size() > 0 ">
2903 2903 and p.category_id in
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerCurrentImageMapper.xml
  View file @e4b3607
... ... @@ -31,8 +31,8 @@
31 31 , IFNULL(o.totle_weight, 0) AS totleWeight
32 32 , IFNULL(op.pay_amount, 0) AS payAmount
33 33 FROM
34   - `dili_etrade`.`order` o
35   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  34 + `zr_etrade`.`order` o
  35 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
36 36 WHERE 1=1
37 37 AND o.buyer_id = #{buyerId}
38 38 AND o.market_id = #{marketId}
... ... @@ -64,7 +64,7 @@
64 64 , IFNULL(sob.total_count_goods, 0) AS goods
65 65 , IFNULL(sob.total_count_amount, 0) AS amount
66 66 FROM
67   - `dili_etrade`.`statistics_order_buyer` sob
  67 + `zr_etrade`.`statistics_order_buyer` sob
68 68 WHERE 1=1
69 69 AND sob.market_id = #{marketId}
70 70 AND sob.buyer_id = #{buyerId}
... ... @@ -91,8 +91,8 @@
91 91 , IFNULL(o.totle_weight, 0) AS totleWeight
92 92 , IFNULL(op.pay_amount, 0) AS payAmount
93 93 FROM
94   - `dili_etrade`.`order` o
95   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  94 + `zr_etrade`.`order` o
  95 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
96 96 WHERE 1=1
97 97 AND o.buyer_id = #{buyerId}
98 98 AND o.market_id = #{marketId}
... ... @@ -121,7 +121,7 @@
121 121 , SUM(IFNULL(sob.total_count_goods, 0)) AS totalCountGoods
122 122 , sob.settle_date AS settleDate
123 123 FROM
124   - `dili_etrade`.`statistics_order_buyer` sob
  124 + `zr_etrade`.`statistics_order_buyer` sob
125 125 WHERE
126 126 sob.market_id = #{marketId}
127 127 AND sob.buyer_id = #{buyerId}
... ... @@ -141,8 +141,8 @@
141 141 , IFNULL(op.pay_amount, 0) AS payAmount
142 142 , CONVERT(o.pay_time, date) AS settleDate
143 143 FROM
144   - `dili_etrade`.`order` o
145   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  144 + `zr_etrade`.`order` o
  145 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
146 146 WHERE
147 147 o.buyer_id = #{buyerId}
148 148 AND o.market_id = #{marketId}
... ... @@ -164,8 +164,8 @@
164 164 , IFNULL(op.pay_amount, 0) AS payAmount
165 165 , CONVERT(o.created_time, date) AS settleDate
166 166 FROM
167   - `dili_etrade`.`order` o
168   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  167 + `zr_etrade`.`order` o
  168 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
169 169 WHERE
170 170 o.buyer_id = #{buyerId}
171 171 AND o.market_id = #{marketId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerCurrentMapper.xml
  View file @e4b3607
... ... @@ -30,8 +30,8 @@
30 30 , IFNULL(o.totle_weight, 0) AS totleWeight
31 31 , IFNULL(op.pay_amount, 0) AS payAmount
32 32 FROM
33   - `dili_etrade`.`order` o
34   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  33 + `zr_etrade`.`order` o
  34 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
35 35 WHERE
36 36 1 = 1
37 37 AND o.buyer_id = #{buyerId}
... ... @@ -62,8 +62,8 @@
62 62 , IFNULL(o.totle_weight, 0) AS totleWeight
63 63 , IFNULL(op.pay_amount, 0) AS payAmount
64 64 FROM
65   - `dili_etrade`.`order` o
66   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  65 + `zr_etrade`.`order` o
  66 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
67 67 WHERE
68 68 1 = 1
69 69 AND o.buyer_id = #{buyerId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerImageMapper.xml
  View file @e4b3607
... ... @@ -20,7 +20,7 @@
20 20 , sob.id AS id
21 21 , sob.total_count_amount AS totalCountAmount
22 22 FROM
23   - `dili_etrade`.`statistics_order_buyer` sob
  23 + `zr_etrade`.`statistics_order_buyer` sob
24 24 WHERE
25 25 id = #{id,jdbcType=BIGINT}
26 26 </select>
... ... @@ -45,7 +45,7 @@
45 45 , IFNULL(sob.total_count_goods, 0) AS totalCountGoods
46 46 , IFNULL(sob.total_count_amount, 0) AS totalCountAmount
47 47 FROM
48   - `dili_etrade`.`statistics_order_buyer` sob
  48 + `zr_etrade`.`statistics_order_buyer` sob
49 49 WHERE 1=1
50 50 AND sob.market_id = #{marketId}
51 51 AND sob.buyer_id = #{buyerId}
... ... @@ -63,8 +63,8 @@
63 63 , 0 AS totalRefundAmount
64 64 , SUM(IFNULL(o.totle_weight, 0)) AS totalCountGoods
65 65 , SUM(IFNULL(op.pay_amount, 0)) AS totalCountAmount
66   - FROM `dili_etrade`.`order` o
67   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  66 + FROM `zr_etrade`.`order` o
  67 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
68 68 WHERE 1=1
69 69 AND o.state = 3
70 70 AND o.order_status = 2
... ... @@ -90,7 +90,7 @@
90 90 , SUM(IFNULL(sob.total_count_goods, 0)) AS totalCountGoods
91 91 , sob.settle_date AS settleDate
92 92 FROM
93   - `dili_etrade`.`statistics_order_buyer` sob
  93 + `zr_etrade`.`statistics_order_buyer` sob
94 94 WHERE
95 95 sob.market_id = #{marketId}
96 96 AND sob.buyer_id = #{buyerId}
... ... @@ -103,8 +103,8 @@
103 103 , -SUM(IFNULL(op.pay_amount, 0)) AS totalCountAmount
104 104 , CONVERT(o.pay_time, date) AS settleDate
105 105 FROM
106   - `dili_etrade`.`order` o
107   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  106 + `zr_etrade`.`order` o
  107 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
108 108 WHERE
109 109 o.state = 4
110 110 AND o.buyer_id = #{buyerId}
... ... @@ -219,8 +219,8 @@
219 219 , o.order_status AS orderStatus
220 220 , o.relation_id AS relationId
221 221 FROM
222   - `dili_etrade`.`order` o
223   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  222 + `zr_etrade`.`order` o
  223 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
224 224 WHERE 1=1
225 225 AND o.state = 3
226 226 AND o.order_status IS NULL
... ... @@ -230,8 +230,8 @@
230 230 <if test="productId !=null">
231 231 AND o.id IN (
232 232 SELECT DISTINCT o2.id
233   - FROM `dili_etrade`.`order_goods` og
234   - LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
  233 + FROM `zr_etrade`.`order_goods` og
  234 + LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
235 235 WHERE 1=1
236 236 AND og.state = 1
237 237 AND o2.state = 3
... ... @@ -302,9 +302,9 @@
302 302 , o.order_status AS orderStatus
303 303 , o.relation_id AS relationId
304 304 FROM
305   - `dili_etrade`.`order` reto
306   - LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
307   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  305 + `zr_etrade`.`order` reto
  306 + LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
  307 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
308 308 WHERE 1=1
309 309 AND reto.state = 3
310 310 AND reto.order_status = 2
... ... @@ -314,7 +314,7 @@
314 314 <if test="productId !=null">
315 315 AND reto.id IN (
316 316 SELECT DISTINCT o2.id
317   - FROM `dili_etrade`.`order_goods` og LEFT JOIN `order` o2 ON o2.id = og.order_id
  317 + FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
318 318 WHERE 1=1
319 319 AND o2.state = 3
320 320 AND o2.order_status = 2
... ... @@ -354,7 +354,7 @@
354 354 , og.product_piece_weight AS productPieceWeight
355 355 , og.product_price AS productPrice
356 356 FROM
357   - `dili_etrade`.`order_goods` og
  357 + `zr_etrade`.`order_goods` og
358 358 WHERE 1=1
359 359 AND og.state = 1
360 360 AND og.order_id = #{orderId}
... ... @@ -410,8 +410,8 @@
410 410 , o.order_status AS orderStatus
411 411 , o.relation_id AS relationId
412 412 FROM
413   - `dili_etrade`.`order` o
414   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  413 + `zr_etrade`.`order` o
  414 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
415 415 WHERE 1=1
416 416 AND o.state IN (3,5)
417 417 AND o.id = #{orderId}
... ... @@ -517,8 +517,8 @@
517 517 , o.order_status AS orderStatus
518 518 , o.relation_id AS relationId
519 519 FROM
520   - `dili_etrade`.`order` o
521   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  520 + `zr_etrade`.`order` o
  521 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
522 522 WHERE 1=1
523 523 AND o.state IN (3,5)
524 524 AND o.order_status IS NULL
... ... @@ -579,8 +579,8 @@
579 579 , o.order_status AS orderStatus
580 580 , o.relation_id AS relationId
581 581 FROM
582   - `dili_etrade`.`order` o
583   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  582 + `zr_etrade`.`order` o
  583 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
584 584 WHERE 1=1
585 585 AND o.state = 3
586 586 AND o.order_status = 2
... ... @@ -612,8 +612,8 @@
612 612 , op.pay_channel AS payChannel
613 613 , o.id AS id
614 614 FROM
615   - `dili_etrade`.`order` o
616   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  615 + `zr_etrade`.`order` o
  616 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
617 617 WHERE 1=1
618 618 AND o.state = 3
619 619 AND o.order_status IS NULL
... ... @@ -626,7 +626,7 @@
626 626 <if test="productId != null">
627 627 AND o.id IN (
628 628 SELECT DISTINCT o2.id
629   - FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
  629 + FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
630 630 WHERE 1=1
631 631 AND o2.state IN (3,5)
632 632 AND o2.order_status IS NULL
... ... @@ -653,9 +653,9 @@
653 653 , op.pay_channel AS payChannel
654 654 , o.id AS id
655 655 FROM
656   - `dili_etrade`.`order` reto
657   - LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
658   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  656 + `zr_etrade`.`order` reto
  657 + LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
  658 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
659 659 WHERE 1=1
660 660 AND reto.state = 3
661 661 AND reto.order_status = 2
... ... @@ -668,7 +668,7 @@
668 668 <if test="productId != null">
669 669 AND reto.id IN (
670 670 SELECT DISTINCT o2.id
671   - FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
  671 + FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
672 672 WHERE 1=1
673 673 AND o2.state = 3
674 674 AND o2.order_status = 2
... ... @@ -715,8 +715,8 @@
715 715 , IFNULL(o.totle_weight, 0) AS totleWeight
716 716 , IFNULL(op.pay_amount, 0) AS payAmount
717 717 FROM
718   - `dili_etrade`.`order` o
719   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  718 + `zr_etrade`.`order` o
  719 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
720 720 WHERE 1=1
721 721 AND o.state IN (3,5)
722 722 AND o.order_status IS NULL
... ... @@ -726,7 +726,7 @@
726 726 <if test="productId !=null">
727 727 AND o.id IN (
728 728 SELECT DISTINCT o2.id
729   - FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
  729 + FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
730 730 WHERE 1=1
731 731 AND og.state = 1
732 732 AND o2.state IN (3,5)
... ... @@ -763,8 +763,8 @@
763 763 , IFNULL(o.totle_weight, 0) AS totleWeight
764 764 , IFNULL(op.pay_amount, 0) AS payAmount
765 765 FROM
766   - `dili_etrade`.`order` o
767   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  766 + `zr_etrade`.`order` o
  767 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
768 768 WHERE 1=1
769 769 AND o.state = 3
770 770 AND o.order_status = 2
... ... @@ -774,7 +774,7 @@
774 774 <if test="productId !=null">
775 775 AND o.id IN (
776 776 SELECT DISTINCT o2.id
777   - FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
  777 + FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
778 778 WHERE 1=1
779 779 AND o2.state = 3
780 780 AND o2.order_status = 2
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerProductCurrentImageMapper.xml
  View file @e4b3607
... ... @@ -11,9 +11,9 @@
11 11 SUM(IFNULL(og.product_total_price,0)) AS totalCountAmount,
12 12 SUM(IFNULL(og.product_weight,0)) AS totalCountGoods,
13 13 COUNT(1) AS totalCountOrders
14   - FROM `dili_etrade`.`order_goods` og
15   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
16   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  14 + FROM `zr_etrade`.`order_goods` og
  15 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  16 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
17 17 WHERE 1=1
18 18 AND o.market_id = #{marketId}
19 19 AND o.buyer_id = #{buyerId}
... ... @@ -31,7 +31,7 @@
31 31 SUM(IFNULL(sobp.order_amount,0)) AS totalCountAmount,
32 32 SUM(IFNULL(sobp.count_goods,0)) AS totalCountOrders,
33 33 SUM(IFNULL(sobp.orders,0)) AS totalCountGoods
34   - FROM `dili_etrade`.`statistics_order_buyer_product` sobp
  34 + FROM `zr_etrade`.`statistics_order_buyer_product` sobp
35 35 WHERE sobp.market_id = #{marketId}
36 36 AND sobp.buyer_id = #{buyerId}
37 37 <if test="productId !=null">
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerProductCurrentMapper.xml
  View file @e4b3607
... ... @@ -8,9 +8,9 @@
8 8 , sum(IFNULL(og.product_weight, 0)) as totalCountGoods
9 9 , count(1) as totalCountOrders
10 10 from
11   - `dili_etrade`.`order_goods` og
12   - left join `dili_etrade`.`order` o on og.order_id = o.id
13   - left join `dili_etrade`.`order_payment` op on o.id = op.order_id AND op.state = 2
  11 + `zr_etrade`.`order_goods` og
  12 + left join `zr_etrade`.`order` o on og.order_id = o.id
  13 + left join `zr_etrade`.`order_payment` op on o.id = op.order_id AND op.state = 2
14 14 where
15 15 o.market_id = #{marketId}
16 16 and o.buyer_id = #{buyerId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderBuyerProductImageMapper.xml
  View file @e4b3607
... ... @@ -7,7 +7,7 @@
7 7 , SUM(IFNULL(sobp.count_goods, 0)) AS totalCountOrders
8 8 , SUM(IFNULL(sobp.orders, 0)) AS totalCountGoods
9 9 FROM
10   - `dili_etrade`.`statistics_order_buyer_product` sobp
  10 + `zr_etrade`.`statistics_order_buyer_product` sobp
11 11 WHERE
12 12 sobp.market_id = #{marketId}
13 13 AND sobp.buyer_id = #{buyerId}
... ... @@ -38,7 +38,7 @@
38 38 , sobp.id AS id
39 39 , sobp.count_goods AS countGoods
40 40 FROM
41   - `dili_etrade`.`statistics_order_buyer_product` sobp
  41 + `zr_etrade`.`statistics_order_buyer_product` sobp
42 42 WHERE
43 43 sobp.id = #{id}
44 44 </select>
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerCurrentImageMapper.xml
  View file @e4b3607
... ... @@ -30,8 +30,8 @@
30 30 , IFNULL(op.pay_amount, 0) AS payAmount
31 31 , IFNULL(op.pay_channel, 0) AS payChannel
32 32 FROM
33   - `dili_etrade`.`order` o
34   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  33 + `zr_etrade`.`order` o
  34 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
35 35 WHERE 1=1
36 36 AND o.shop_id = #{shopId}
37 37 AND o.market_id = #{marketId}
... ... @@ -63,7 +63,7 @@
63 63 , IFNULL(sos.total_count_goods, 0) AS goods
64 64 , IFNULL(sos.total_order_amount, 0) AS amount
65 65 FROM
66   - `dili_etrade`.`statistics_order_seller` sos
  66 + `zr_etrade`.`statistics_order_seller` sos
67 67 WHERE 1=1
68 68 AND sos.market_id = #{marketId}
69 69 AND sos.shop_id = #{shopId}
... ... @@ -91,8 +91,8 @@
91 91 , IFNULL(op.pay_amount, 0) AS payAmount
92 92 , IFNULL(op.pay_channel, 0) AS payChannel
93 93 FROM
94   - `dili_etrade`.`order` o
95   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  94 + `zr_etrade`.`order` o
  95 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
96 96 WHERE 1=1
97 97 AND o.shop_id = #{shopId}
98 98 AND o.market_id = #{marketId}
... ... @@ -118,7 +118,7 @@
118 118 sos.pay_channel AS payChannel
119 119 , SUM(IFNULL(sos.total_order_amount, 0)) AS payChannelOrders
120 120 FROM
121   - `dili_etrade`.`statistics_order_seller` sos
  121 + `zr_etrade`.`statistics_order_seller` sos
122 122 WHERE 1=1
123 123 AND sos.market_id = #{marketId}
124 124 AND sos.shop_id = #{shopId}
... ... @@ -132,8 +132,8 @@
132 132 op.pay_channel AS payChannel
133 133 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
134 134 FROM
135   - `dili_etrade`.`order` o
136   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  135 + `zr_etrade`.`order` o
  136 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
137 137 WHERE 1=1
138 138 AND o.shop_id = #{shopId}
139 139 AND o.market_id = #{marketId}
... ... @@ -149,8 +149,8 @@
149 149 op.pay_channel AS payChannel
150 150 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
151 151 FROM
152   - `dili_etrade`.`order` o
153   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  152 + `zr_etrade`.`order` o
  153 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
154 154 WHERE 1=1
155 155 AND o.shop_id = #{shopId}
156 156 AND o.market_id = #{marketId}
... ... @@ -177,7 +177,7 @@
177 177 sos.shop_id AS shopId
178 178 , sos.shop_name AS shopName
179 179 FROM
180   - `dili_etrade`.`statistics_order_seller` sos
  180 + `zr_etrade`.`statistics_order_seller` sos
181 181 WHERE 1=1
182 182 AND sos.market_id = #{marketId}
183 183 AND sos.shop_custom_id = #{shopCustomId}
... ... @@ -191,7 +191,7 @@
191 191 o.shop_id AS shopId
192 192 , o.shop_name AS shopName
193 193 FROM
194   - `dili_etrade`.`order` o LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  194 + `zr_etrade`.`order` o LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
195 195 WHERE 1=1
196 196 AND o.shop_customer_id = #{shopCustomId}
197 197 AND o.market_id = #{marketId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerCurrentMapper.xml
  View file @e4b3607
... ... @@ -29,8 +29,8 @@
29 29 , op.pay_amount AS payAmount
30 30 , op.pay_channel AS payChannel
31 31 FROM
32   - `dili_etrade`.`order` o
33   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  32 + `zr_etrade`.`order` o
  33 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
34 34 WHERE 1=1
35 35 AND o.shop_id = #{shopId}
36 36 AND o.market_id = #{marketId}
... ... @@ -60,8 +60,8 @@
60 60 , op.pay_amount AS payAmount
61 61 , op.pay_channel AS payChannel
62 62 FROM
63   - `dili_etrade`.`order` o
64   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  63 + `zr_etrade`.`order` o
  64 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
65 65 WHERE 1=1
66 66 AND o.shop_id = #{shopId}
67 67 AND o.market_id = #{marketId}
... ... @@ -85,8 +85,8 @@
85 85 op.pay_channel AS payChannel
86 86 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
87 87 FROM
88   - `dili_etrade`.`order_payment` op
89   - LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
  88 + `zr_etrade`.`order_payment` op
  89 + LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
90 90 WHERE 1=1
91 91 AND op.state = 2
92 92 AND o.shop_id = #{shopId}
... ... @@ -104,8 +104,8 @@
104 104 op.pay_channel AS payChannel
105 105 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
106 106 FROM
107   - `dili_etrade`.`order_payment` op
108   - LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
  107 + `zr_etrade`.`order_payment` op
  108 + LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
109 109 WHERE 1=1
110 110 AND op.state = 2
111 111 AND o.shop_id = #{shopId}
... ... @@ -173,8 +173,8 @@
173 173 , o.order_status AS orderStatus
174 174 , o.relation_id AS relationId
175 175 FROM
176   - `dili_etrade`.`order` o
177   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  176 + `zr_etrade`.`order` o
  177 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
178 178 WHERE 1=1
179 179 AND o.state = 3
180 180 AND o.order_status IS NULL
... ... @@ -235,9 +235,9 @@
235 235 , o.order_status AS orderStatus
236 236 , o.relation_id AS relationId
237 237 FROM
238   - `dili_etrade`.`order` reto
239   - LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
240   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  238 + `zr_etrade`.`order` reto
  239 + LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
  240 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
241 241 WHERE 1=1
242 242 AND reto.state = 3
243 243 AND reto.order_status = 2
... ... @@ -254,7 +254,7 @@
254 254 o.shop_id AS shopId
255 255 , o.shop_name AS shopName
256 256 FROM
257   - `dili_etrade`.`order` o LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  257 + `zr_etrade`.`order` o LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
258 258 WHERE 1=1
259 259 AND o.shop_customer_id = #{shopCustomId}
260 260 AND o.market_id = #{marketId}
... ... @@ -282,7 +282,7 @@
282 282 , og.product_piece_weight AS productPieceWeight
283 283 , og.product_price AS productPrice
284 284 FROM
285   - `dili_etrade`.`order_goods` og
  285 + `zr_etrade`.`order_goods` og
286 286 WHERE 1=1
287 287 AND og.state = 1
288 288 AND og.order_id = #{orderId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerImageMapper.xml
  View file @e4b3607
... ... @@ -17,7 +17,7 @@
17 17 , created_time AS createdTime
18 18 , modified_time AS modifiedTime
19 19 FROM
20   - `dili_etrade`.`statistics_order_seller`
  20 + `zr_etrade`.`statistics_order_seller`
21 21 WHERE
22 22 id = #{id,jdbcType=BIGINT}
23 23 </select>
... ... @@ -51,7 +51,7 @@
51 51 , IFNULL(sos.total_count_goods, 0) AS goods
52 52 , IFNULL(sos.total_order_amount, 0) AS amount
53 53 FROM
54   - `dili_etrade`.`statistics_order_seller` sos
  54 + `zr_etrade`.`statistics_order_seller` sos
55 55 WHERE
56 56 sos.market_id = #{marketId}
57 57 AND sos.shop_id = #{shopId}
... ... @@ -79,8 +79,8 @@
79 79 , op.pay_amount AS payAmount
80 80 , op.pay_channel AS payChannel
81 81 FROM
82   - `dili_etrade`.`order` o
83   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  82 + `zr_etrade`.`order` o
  83 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
84 84 WHERE 1=1
85 85 AND o.shop_id = #{shopId}
86 86 AND o.market_id = #{marketId}
... ... @@ -104,7 +104,7 @@
104 104 sos.pay_channel AS payChannel
105 105 , SUM(IFNULL(sos.total_order_amount, 0)) AS payChannelOrders
106 106 FROM
107   - `dili_etrade`.`statistics_order_seller` sos
  107 + `zr_etrade`.`statistics_order_seller` sos
108 108 WHERE 1=1
109 109 AND sos.market_id = #{marketId}
110 110 AND sos.shop_id = #{shopId}
... ... @@ -119,8 +119,8 @@
119 119 op.pay_channel AS payChannel
120 120 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
121 121 FROM
122   - `dili_etrade`.`order_payment` op
123   - LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
  122 + `zr_etrade`.`order_payment` op
  123 + LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
124 124 WHERE 1=1
125 125 AND op.state = 2
126 126 AND o.shop_id = #{shopId}
... ... @@ -142,7 +142,7 @@
142 142 sos.shop_id AS shopId
143 143 , sos.shop_name AS shopName
144 144 FROM
145   - `dili_etrade`.`statistics_order_seller` sos
  145 + `zr_etrade`.`statistics_order_seller` sos
146 146 WHERE 1=1
147 147 AND sos.market_id = #{marketId}
148 148 AND sos.shop_custom_id = #{shopCustomId}
... ... @@ -167,8 +167,8 @@
167 167 , SUM(sos.total_count_goods) AS totalGoods
168 168 , SUM(sos.total_order_amount) AS totalAmount
169 169 FROM
170   - `dili_etrade`.`statistics_order_seller` sos
171   - LEFT JOIN `dili_etrade`.`shop` s ON sos.shop_id = s.id
  170 + `zr_etrade`.`statistics_order_seller` sos
  171 + LEFT JOIN `zr_etrade`.`shop` s ON sos.shop_id = s.id
172 172 WHERE 1=1
173 173 AND sos.market_id = #{marketId}
174 174 AND s.state = 1
... ... @@ -180,8 +180,8 @@
180 180 , o.market_id AS marketId
181 181 , SUM(o.totle_weight) AS totalGoods
182 182 , SUM(o.totle_amount) AS totalAmount
183   - FROM `dili_etrade`.`order` o
184   - LEFT JOIN `dili_etrade`.`shop` s ON o.shop_id = s.id
  183 + FROM `zr_etrade`.`order` o
  184 + LEFT JOIN `zr_etrade`.`shop` s ON o.shop_id = s.id
185 185 WHERE 1=1
186 186 AND o.market_id = #{marketId}
187 187 AND o.state = 3
... ... @@ -212,7 +212,7 @@
212 212 smp.shop_id
213 213 , smp.top_category_id
214 214 FROM
215   - `dili_etrade`.`shop_main_product` smp
  215 + `zr_etrade`.`shop_main_product` smp
216 216 WHERE
217 217 1 = 1
218 218 AND smp.top_category_id = #{topCategoryId}
... ... @@ -225,8 +225,8 @@
225 225 , SUM(sos.total_count_goods) AS totalGoods
226 226 , SUM(sos.total_order_amount) AS totalAmount
227 227 FROM
228   - `dili_etrade`.`statistics_order_seller` sos
229   - LEFT JOIN `dili_etrade`.`shop` s ON sos.shop_id = s.id
  228 + `zr_etrade`.`statistics_order_seller` sos
  229 + LEFT JOIN `zr_etrade`.`shop` s ON sos.shop_id = s.id
230 230 WHERE
231 231 1 = 1
232 232 AND sos.market_id = #{marketId}
... ... @@ -240,8 +240,8 @@
240 240 , SUM(o.totle_weight) AS totalGoods
241 241 , SUM(o.totle_amount) AS totalAmount
242 242 FROM
243   - `dili_etrade`.`order` o
244   - LEFT JOIN `dili_etrade`.`shop` s ON o.shop_id = s.id
  243 + `zr_etrade`.`order` o
  244 + LEFT JOIN `zr_etrade`.`shop` s ON o.shop_id = s.id
245 245 WHERE
246 246 1 = 1
247 247 AND o.market_id = #{marketId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerProductCurrentImageMapper.xml
  View file @e4b3607
... ... @@ -16,9 +16,9 @@
16 16 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
17 17 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
18 18 FROM
19   - `dili_etrade`.`order_goods` og
20   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
21   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  19 + `zr_etrade`.`order_goods` og
  20 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  21 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
22 22 WHERE 1=1
23 23 AND o.market_id = #{marketId}
24 24 AND o.shop_id = #{shopId}
... ... @@ -37,7 +37,7 @@
37 37 , SUM(IFNULL(sosp.order_amount, 0)) AS orderAmount
38 38 , SUM(IFNULL(sosp.count_goods, 0)) AS countGoods
39 39 FROM
40   - `dili_etrade`.`statistics_order_seller_product` sosp
  40 + `zr_etrade`.`statistics_order_seller_product` sosp
41 41 WHERE 1=1
42 42 AND sosp.market_id = #{marketId}
43 43 AND sosp.shop_id = #{shopId}
... ... @@ -53,9 +53,9 @@
53 53 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
54 54 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
55 55 FROM
56   - `dili_etrade`.`order_goods` og
57   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
58   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  56 + `zr_etrade`.`order_goods` og
  57 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  58 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
59 59 WHERE 1=1
60 60 AND o.market_id = #{marketId}
61 61 AND o.shop_id = #{shopId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerProductCurrentMapper.xml
  View file @e4b3607
... ... @@ -15,9 +15,9 @@
15 15 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
16 16 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
17 17 FROM
18   - `dili_etrade`.`order_goods` og
19   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
20   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  18 + `zr_etrade`.`order_goods` og
  19 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  20 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
21 21 WHERE 1=1
22 22 AND o.market_id = #{marketId}
23 23 AND o.shop_id = #{shopId}
... ... @@ -37,9 +37,9 @@
37 37 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
38 38 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
39 39 FROM
40   - `dili_etrade`.`order_goods` og
41   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
42   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  40 + `zr_etrade`.`order_goods` og
  41 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  42 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
43 43 WHERE 1=1
44 44 AND o.market_id = #{marketId}
45 45 AND o.shop_id = #{shopId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatOrderSellerProductImageMapper.xml
  View file @e4b3607
... ... @@ -19,7 +19,7 @@
19 19 , created_time AS createdTime
20 20 , modified_time AS modifiedTime
21 21 FROM
22   - `dili_etrade`.`statistics_order_seller_product`
  22 + `zr_etrade`.`statistics_order_seller_product`
23 23 WHERE
24 24 id = #{id,jdbcType=BIGINT}
25 25 </select>
... ... @@ -36,7 +36,7 @@
36 36 , SUM(IFNULL(sop.count_goods, 0)) AS countGoods
37 37 , SUM(IFNULL(sop.order_amount, 0)) AS orderAmount
38 38 FROM
39   - `dili_etrade`.`statistics_order_seller_product` sop
  39 + `zr_etrade`.`statistics_order_seller_product` sop
40 40 WHERE 1=1
41 41 AND sop.market_id = #{marketId}
42 42 AND sop.shop_id = #{shopId}
... ... @@ -53,9 +53,9 @@
53 53 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
54 54 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
55 55 FROM
56   - `dili_etrade`.`order_goods` og
57   - LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
58   - LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
  56 + `zr_etrade`.`order_goods` og
  57 + LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
  58 + LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
59 59 WHERE 1=1
60 60 AND o.market_id = #{marketId}
61 61 AND o.shop_id = #{shopId}
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatProductImageMapper.xml
  View file @e4b3607
... ... @@ -18,7 +18,7 @@
18 18 , created_time AS createdTime
19 19 , modified_time AS modifiedTime
20 20 FROM
21   - `dili_etrade`.`statistics_product`
  21 + `zr_etrade`.`statistics_product`
22 22 WHERE
23 23 id = #{id,jdbcType=BIGINT}
24 24 </select>
... ... @@ -49,20 +49,20 @@
49 49 , IFNULL(sp.product_sales_amount, 0) AS productSalesAmount
50 50 , IFNULL(sp.product_low_price, 0) AS productLowPrice
51 51 , IFNULL(sp.product_high_price, 0) AS productHighPrice
52   - , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2)) AS productKiloPrice
  52 + , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2)) AS productKiloPrice
53 53 , t.yesterDayproductKiloPrice AS yesterDayproductKiloPrice
54 54 FROM
55   - `dili_etrade`.`statistics_product` sp
  55 + `zr_etrade`.`statistics_product` sp
56 56 LEFT JOIN (
57 57 SELECT
58 58 spy.product_id AS productId,
59   - ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 5,2)) AS yesterDayproductKiloPrice
  59 + ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 100,2)) AS yesterDayproductKiloPrice
60 60 FROM (
61 61 SELECT
62 62 ret.product_id,
63 63 MAX(ret.settle_date) AS settle_date
64 64 FROM
65   - `dili_etrade`.`statistics_product` ret
  65 + `zr_etrade`.`statistics_product` ret
66 66 WHERE
67 67 1 = 1
68 68 AND ret.settle_date <![CDATA[ < #{settleDate}]]>
... ... @@ -70,7 +70,7 @@
70 70 AND ret.product_sales_amount >0
71 71 AND ret.product_sales >0
72 72 GROUP BY
73   - ret.product_id ) rt LEFT JOIN `dili_etrade`.`statistics_product` spy
  73 + ret.product_id ) rt LEFT JOIN `zr_etrade`.`statistics_product` spy
74 74 ON rt.settle_date = spy.settle_date AND rt.product_id = spy.product_id
75 75 GROUP BY rt.product_id
76 76 ) t ON t.productId = sp.product_id
... ... @@ -125,16 +125,16 @@
125 125 , IFNULL(sp.product_sales_amount, 0) AS productSalesAmount
126 126 , IFNULL(sp.product_low_price, 0) AS productLowPrice
127 127 , IFNULL(sp.product_high_price, 0) AS productHighPrice
128   - , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2)) AS productKiloPrice
  128 + , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2)) AS productKiloPrice
129 129 , t.yesterDayproductKiloPrice AS yesterDayproductKiloPrice
130 130 FROM
131   - `dili_etrade`.`statistics_product` sp
  131 + `zr_etrade`.`statistics_product` sp
132 132 LEFT JOIN (
133 133 SELECT
134 134 spy.product_id AS productId
135   - , ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 5,2)) AS yesterDayproductKiloPrice
  135 + , ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 100,2)) AS yesterDayproductKiloPrice
136 136 FROM
137   - `dili_etrade`.`statistics_product` spy
  137 + `zr_etrade`.`statistics_product` spy
138 138 WHERE
139 139 spy.market_id = #{marketId}
140 140 AND spy.settle_date = #{lastSettleDate}
... ... @@ -167,7 +167,7 @@
167 167 , IFNULL(sp.product_avg_price, 0) AS productAvgPrice
168 168 , IFNULL(sp.product_high_price, 0) AS productHighPrice
169 169 FROM
170   - `dili_etrade`.`statistics_product` sp
  170 + `zr_etrade`.`statistics_product` sp
171 171 WHERE
172 172 sp.market_id = #{marketId}
173 173 AND sp.settle_date = #{lastSettleDate}
... ... @@ -185,7 +185,7 @@
185 185 , IFNULL(sp.product_high_price, 0) AS productHighPrice
186 186 , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2)) AS productKiloPrice
187 187 FROM
188   - `dili_etrade`.`statistics_product` sp
  188 + `zr_etrade`.`statistics_product` sp
189 189 WHERE
190 190 sp.market_id = #{marketId}
191 191 AND sp.settle_date = #{settleDate}
... ... @@ -202,9 +202,9 @@
202 202 , IFNULL(sp.product_high_price, 0) AS productHighPrice
203 203 , IFNULL(sp.product_avg_price, 0) AS productAvgPrice
204 204 , sp.settle_date AS settleDate
205   - , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2)) AS productKiloPrice
  205 + , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2)) AS productKiloPrice
206 206 FROM
207   - `dili_etrade`.`statistics_product` sp
  207 + `zr_etrade`.`statistics_product` sp
208 208 WHERE
209 209 sp.market_id = #{marketId}
210 210 AND sp.settle_date BETWEEN #{startSettleDate} AND #{endSettleDate}
... ...
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/deserializer/MoneyY2FDeserializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.deserializer;
2   -
3   -import com.diligrp.etrade.core.exception.PlatformServiceException;
4   -import com.fasterxml.jackson.core.JacksonException;
5   -import com.fasterxml.jackson.core.JsonParser;
6   -import com.fasterxml.jackson.databind.DeserializationContext;
7   -import com.fasterxml.jackson.databind.JsonDeserializer;
8   -import org.apache.commons.lang3.StringUtils;
9   -import org.apache.commons.lang3.math.NumberUtils;
10   -import org.slf4j.Logger;
11   -import org.slf4j.LoggerFactory;
12   -
13   -import java.io.IOException;
14   -import java.math.BigDecimal;
15   -import java.math.MathContext;
16   -import java.math.RoundingMode;
17   -
18   -/**
19   - * 元转分
20   - */
21   -public class MoneyY2FDeserializer extends JsonDeserializer<Long> {
22   -
23   - private final Logger LOG = LoggerFactory.getLogger(this.getClass());
24   -
25   - @Override
26   - public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
27   - String value = p.getText();
28   - if(StringUtils.isBlank(value)){
29   - return null;
30   - }
31   - if(!NumberUtils.isParsable(value)){
32   - LOG.warn("非数字参数:{}",value);
33   - throw new PlatformServiceException("非数字参数");
34   - }
35   - BigDecimal ans = new BigDecimal(value).multiply(new BigDecimal(100),new MathContext(0,RoundingMode.HALF_UP));
36   - return ans.longValue();
37   - }
38   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/deserializer/WeightJ2KDeserializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.deserializer;
2   -
3   -import com.diligrp.etrade.core.exception.PlatformServiceException;
4   -import com.fasterxml.jackson.core.JacksonException;
5   -import com.fasterxml.jackson.core.JsonParser;
6   -import com.fasterxml.jackson.databind.DeserializationContext;
7   -import com.fasterxml.jackson.databind.JsonDeserializer;
8   -import org.apache.commons.lang3.StringUtils;
9   -import org.apache.commons.lang3.math.NumberUtils;
10   -import org.slf4j.Logger;
11   -import org.slf4j.LoggerFactory;
12   -
13   -import java.io.IOException;
14   -import java.math.BigDecimal;
15   -import java.math.MathContext;
16   -import java.math.RoundingMode;
17   -
18   -/**
19   - * 斤转克
20   - */
21   -public class WeightJ2KDeserializer extends JsonDeserializer<Long> {
22   -
23   - private final Logger LOG = LoggerFactory.getLogger(this.getClass());
24   -
25   - @Override
26   - public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
27   - String value = p.getText();
28   - if(StringUtils.isBlank(value)){
29   - return null;
30   - }
31   - if(!NumberUtils.isParsable(value)){
32   - LOG.warn("非数字参数:{}",value);
33   - throw new PlatformServiceException("非数字参数");
34   - }
35   - BigDecimal ans = new BigDecimal(value).multiply(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP));
36   - return ans.longValue();
37   - }
38   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/Cent2KiloJsonSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -import com.fasterxml.jackson.core.JsonGenerator;
4   -import com.fasterxml.jackson.databind.JsonSerializer;
5   -import com.fasterxml.jackson.databind.SerializerProvider;
6   -
7   -import java.io.IOException;
8   -import java.math.BigDecimal;
9   -import java.math.MathContext;
10   -import java.math.RoundingMode;
11   -import java.text.DecimalFormat;
12   -
13   -/**
14   - * 克/分 - 斤/元
15   - */
16   -public class Cent2KiloJsonSerializer extends JsonSerializer<Long> {
17   -
18   - @Override
19   - public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if(null == value){
21   - return;
22   - }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(200),new MathContext(20,RoundingMode.HALF_UP));
24   -
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(ans.doubleValue()));
27   - }
28   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/CentKiloJsonSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -import com.fasterxml.jackson.core.JsonGenerator;
4   -import com.fasterxml.jackson.databind.JsonSerializer;
5   -import com.fasterxml.jackson.databind.SerializerProvider;
6   -
7   -import java.io.IOException;
8   -import java.math.BigDecimal;
9   -import java.math.MathContext;
10   -import java.math.RoundingMode;
11   -import java.text.DecimalFormat;
12   -
13   -/**
14   - * 克/分 - 公斤/元
15   - */
16   -public class CentKiloJsonSerializer extends JsonSerializer<Long> {
17   -
18   - @Override
19   - public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if(null == value){
21   - return;
22   - }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
24   - var res = ans.setScale(2,RoundingMode.HALF_UP);
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(res.doubleValue()));
27   - }
28   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/CentToKiloJsonSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -import com.fasterxml.jackson.core.JsonGenerator;
4   -import com.fasterxml.jackson.databind.JsonSerializer;
5   -import com.fasterxml.jackson.databind.SerializerProvider;
6   -
7   -import java.io.IOException;
8   -import java.math.BigDecimal;
9   -import java.math.MathContext;
10   -import java.math.RoundingMode;
11   -import java.text.DecimalFormat;
12   -
13   -/**
14   - * 分/克 - 元/公斤
15   - */
16   -public class CentToKiloJsonSerializer extends JsonSerializer<Long> {
17   -
18   - @Override
19   - public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if(null == value){
21   - return;
22   - }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
24   - var res = ans.setScale(2,RoundingMode.HALF_UP);
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(res.doubleValue()));
27   - }
28   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/KiloBigDecimalSerializer.java renamed to etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/J2KiloBigDecimalSerializer.java
  View file @e4b3607
... ... @@ -10,7 +10,7 @@ import java.math.MathContext;
10 10 import java.math.RoundingMode;
11 11 import java.text.DecimalFormat;
12 12  
13   -public class KiloBigDecimalSerializer extends JsonSerializer<BigDecimal> {
  13 +public class J2KiloBigDecimalSerializer extends JsonSerializer<BigDecimal> {
14 14  
15 15 @Override
16 16 public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
... ...
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/PieceSerializer.java
  View file @e4b3607
... ... @@ -11,7 +11,7 @@ import java.math.RoundingMode;
11 11 import java.text.DecimalFormat;
12 12  
13 13 /**
14   - * 件数缩小10倍
  14 + * 件数缩小100倍
15 15 */
16 16 public class PieceSerializer extends JsonSerializer<Long> {
17 17  
... ... @@ -20,7 +20,7 @@ public class PieceSerializer extends JsonSerializer&lt;Long&gt; {
20 20 if(null == value){
21 21 return;
22 22 }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(10),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-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/PoundsToKiloStringSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -
4   -import com.fasterxml.jackson.core.JsonGenerator;
5   -import com.fasterxml.jackson.databind.JsonSerializer;
6   -import com.fasterxml.jackson.databind.SerializerProvider;
7   -
8   -import java.io.IOException;
9   -import java.math.BigDecimal;
10   -import java.math.MathContext;
11   -import java.math.RoundingMode;
12   -import java.text.DecimalFormat;
13   -
14   -/**
15   - * 元/斤->元/公斤
16   - */
17   -public class PoundsToKiloStringSerializer extends JsonSerializer<String> {
18   - @Override
19   - public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if (null ==value){
21   - return;
22   - }
23   - var kilo = new BigDecimal(value).multiply(new BigDecimal(2),new MathContext(20, RoundingMode.HALF_UP));
24   - var res = kilo.setScale(2,RoundingMode.HALF_UP);
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(res.doubleValue()));
27   - }
28   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/WeightK2JJsonSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -import com.fasterxml.jackson.core.JsonGenerator;
4   -import com.fasterxml.jackson.databind.JsonSerializer;
5   -import com.fasterxml.jackson.databind.SerializerProvider;
6   -
7   -import java.io.IOException;
8   -import java.math.BigDecimal;
9   -import java.math.MathContext;
10   -import java.math.RoundingMode;
11   -import java.text.DecimalFormat;
12   -
13   -/**
14   - * 克转斤
15   - */
16   -public class WeightK2JJsonSerializer extends JsonSerializer<Long> {
17   -
18   - @Override
19   - public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if(null == value){
21   - return;
22   - }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP));
24   - var res = ans.setScale(2,RoundingMode.HALF_UP);
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(res.doubleValue()));
27   - }
28   -}
etrade-core/src/main/java/com/diligrp/etrade/core/jackson/serializer/WeightKiloJsonSerializer.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.core.jackson.serializer;
2   -
3   -import com.fasterxml.jackson.core.JsonGenerator;
4   -import com.fasterxml.jackson.databind.JsonSerializer;
5   -import com.fasterxml.jackson.databind.SerializerProvider;
6   -
7   -import java.io.IOException;
8   -import java.math.BigDecimal;
9   -import java.math.MathContext;
10   -import java.math.RoundingMode;
11   -import java.text.DecimalFormat;
12   -
13   -/**
14   - * 克转公斤
15   - */
16   -public class WeightKiloJsonSerializer extends JsonSerializer<Long> {
17   -
18   - @Override
19   - public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
20   - if(null == value){
21   - return;
22   - }
23   - BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(1000),new MathContext(20,RoundingMode.HALF_UP));
24   - var res = ans.setScale(2,RoundingMode.HALF_UP);
25   - DecimalFormat df = new DecimalFormat("#0.00");
26   - gen.writeString(df.format(res.doubleValue()));
27   - }
28   -}
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/co/EntranceDivideStatStat.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.rpc.co;
2   -
3   -import com.fasterxml.jackson.annotation.JsonAlias;
4   -
5   -import java.io.Serializable;
6   -import java.time.LocalDateTime;
7   -import java.util.Set;
8   -
9   -public class EntranceDivideStatStat implements Serializable {
10   - /**
11   - * 开始时间
12   - */
13   - @JsonAlias("startSettleDateTime")
14   - private LocalDateTime startTime;
15   - /**
16   - * 结束时间
17   - */
18   - @JsonAlias("endSettleDateTime")
19   - private LocalDateTime endTime;
20   - /**
21   - * 市场 ID
22   - */
23   - private Long marketId;
24   - /**
25   - * 分组
26   - * /statKeyCustomer
27   - * /statKeyShipper
28   - * /statKeyRegion
29   - * /statKeyDep
30   - * /statKeyCategory
31   - * /statKeyCategoryTwo
32   - * /statKeyCategoryThree
33   - * /statKeyProduct
34   - */
35   - private Set<String> statKeys;
36   - /**
37   - * 排序
38   - */
39   - @JsonAlias("sort")
40   - private String sort;
41   - /**
42   - * 次序
43   - */
44   - @JsonAlias("sortOrder")
45   - private String order;
46   - /**
47   - * 页
48   - */
49   - @JsonAlias("pageNo")
50   - private Integer page;
51   - /**
52   - * 行
53   - */
54   - @JsonAlias("pageSize")
55   - private Integer rows;
56   - /**
57   - * 客户 ID
58   - */
59   - private String customerId;
60   - /**
61   - * 货主 ID
62   - */
63   - private String shipperId;
64   - /**
65   - * 货区 ID
66   - */
67   - private String regionId;
68   - /**
69   - * 部门 ID
70   - */
71   - private String depId;
72   - /**
73   - * 一级品类 ID
74   - */
75   - private String categoryId;
76   - /**
77   - * 二级品类 ID
78   - */
79   - private String categoryTwoId;
80   - /**
81   - * 三级品类 ID
82   - */
83   - private String categoryThreeId;
84   - /**
85   - * 商品 ID
86   - */
87   - private String productId;
88   -
89   - /**
90   - * 付款时间开始
91   - */
92   - private LocalDateTime paymentTimeStart;
93   -
94   - /**
95   - * 付款时间结束
96   - */
97   - private LocalDateTime paymentTimeEnd;
98   -
99   - public LocalDateTime getStartTime() {
100   - return startTime;
101   - }
102   -
103   - public void setStartTime(LocalDateTime startTime) {
104   - this.startTime = startTime;
105   - }
106   -
107   - public LocalDateTime getEndTime() {
108   - return endTime;
109   - }
110   -
111   - public void setEndTime(LocalDateTime endTime) {
112   - this.endTime = endTime;
113   - }
114   -
115   - public Long getMarketId() {
116   - return marketId;
117   - }
118   -
119   - public void setMarketId(Long marketId) {
120   - this.marketId = marketId;
121   - }
122   -
123   - public Set<String> getStatKeys() {
124   - return statKeys;
125   - }
126   -
127   - public void setStatKeys(Set<String> statKeys) {
128   - this.statKeys = statKeys;
129   - }
130   -
131   - public String getSort() {
132   - return sort;
133   - }
134   -
135   - public void setSort(String sort) {
136   - this.sort = sort;
137   - }
138   -
139   - public String getOrder() {
140   - return order;
141   - }
142   -
143   - public void setOrder(String order) {
144   - this.order = order;
145   - }
146   -
147   - public Integer getPage() {
148   - return page;
149   - }
150   -
151   - public void setPage(Integer page) {
152   - this.page = page;
153   - }
154   -
155   - public Integer getRows() {
156   - return rows;
157   - }
158   -
159   - public void setRows(Integer rows) {
160   - this.rows = rows;
161   - }
162   -
163   - public String getCustomerId() {
164   - return customerId;
165   - }
166   -
167   - public void setCustomerId(String customerId) {
168   - this.customerId = customerId;
169   - }
170   -
171   - public String getShipperId() {
172   - return shipperId;
173   - }
174   -
175   - public void setShipperId(String shipperId) {
176   - this.shipperId = shipperId;
177   - }
178   -
179   - public String getRegionId() {
180   - return regionId;
181   - }
182   -
183   - public void setRegionId(String regionId) {
184   - this.regionId = regionId;
185   - }
186   -
187   - public String getDepId() {
188   - return depId;
189   - }
190   -
191   - public void setDepId(String depId) {
192   - this.depId = depId;
193   - }
194   -
195   - public String getCategoryId() {
196   - return categoryId;
197   - }
198   -
199   - public void setCategoryId(String categoryId) {
200   - this.categoryId = categoryId;
201   - }
202   -
203   - public String getCategoryTwoId() {
204   - return categoryTwoId;
205   - }
206   -
207   - public void setCategoryTwoId(String categoryTwoId) {
208   - this.categoryTwoId = categoryTwoId;
209   - }
210   -
211   - public String getCategoryThreeId() {
212   - return categoryThreeId;
213   - }
214   -
215   - public void setCategoryThreeId(String categoryThreeId) {
216   - this.categoryThreeId = categoryThreeId;
217   - }
218   -
219   - public String getProductId() {
220   - return productId;
221   - }
222   -
223   - public void setProductId(String productId) {
224   - this.productId = productId;
225   - }
226   -
227   - public LocalDateTime getPaymentTimeStart() {
228   - return paymentTimeStart;
229   - }
230   -
231   - public void setPaymentTimeStart(LocalDateTime paymentTimeStart) {
232   - this.paymentTimeStart = paymentTimeStart;
233   - }
234   -
235   - public LocalDateTime getPaymentTimeEnd() {
236   - return paymentTimeEnd;
237   - }
238   -
239   - public void setPaymentTimeEnd(LocalDateTime paymentTimeEnd) {
240   - this.paymentTimeEnd = paymentTimeEnd;
241   - }
242   -}
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/co/SteveTeamOrderStat.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.rpc.co;
2   -
3   -import java.time.LocalDateTime;
4   -import java.util.Set;
5   -
6   -public class SteveTeamOrderStat {
7   - private Long marketId;
8   - private Long goodsId;
9   - private Long customerId;
10   - private LocalDateTime startTime;
11   - private LocalDateTime endTime;
12   -
13   - private Set<String> statKeys;
14   -
15   - public Long getMarketId() {
16   - return marketId;
17   - }
18   -
19   - public void setMarketId(Long marketId) {
20   - this.marketId = marketId;
21   - }
22   -
23   - public Long getGoodsId() {
24   - return goodsId;
25   - }
26   -
27   - public void setGoodsId(Long goodsId) {
28   - this.goodsId = goodsId;
29   - }
30   -
31   - public Long getCustomerId() {
32   - return customerId;
33   - }
34   -
35   - public void setCustomerId(Long customerId) {
36   - this.customerId = customerId;
37   - }
38   -
39   - public LocalDateTime getStartTime() {
40   - return startTime;
41   - }
42   -
43   - public void setStartTime(LocalDateTime startTime) {
44   - this.startTime = startTime;
45   - }
46   -
47   - public LocalDateTime getEndTime() {
48   - return endTime;
49   - }
50   -
51   - public void setEndTime(LocalDateTime endTime) {
52   - this.endTime = endTime;
53   - }
54   -
55   - public Set<String> getStatKeys() {
56   - return statKeys;
57   - }
58   -
59   - public void setStatKeys(Set<String> statKeys) {
60   - this.statKeys = statKeys;
61   - }
62   -}
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/EntranceDivideStatStatDTO.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.rpc.dto;
2   -
3   -import com.diligrp.etrade.core.jackson.serializer.PoundsToKiloSerializer;
4   -import com.fasterxml.jackson.databind.annotation.JsonSerialize;
5   -
6   -import java.io.Serializable;
7   -import java.math.BigDecimal;
8   -
9   -public class EntranceDivideStatStatDTO implements Serializable {
10   - /**
11   - * 客户 ID
12   - */
13   - private String customerId;
14   - /**
15   - * 客户名称
16   - */
17   - private String customerName;
18   - /**
19   - * 货主id
20   - */
21   - private String shipperId;
22   - /**
23   - * 货主名称
24   - */
25   - private String shipperName;
26   - /**
27   - * 托运人代码
28   - */
29   - private String shipperCode;
30   - /**
31   - * 区域 ID ID
32   - */
33   - private String regionId;
34   - /**
35   - * 区域名称
36   - */
37   - private String regionName;
38   - /**
39   - * 部门 ID
40   - */
41   - private String depId;
42   - /**
43   - * 部门 名称
44   - */
45   - private String depName;
46   - /**
47   - * 类别 ID
48   - */
49   - private String categoryId;
50   - /**
51   - * 类别名称
52   - */
53   - private String categoryName;
54   - /**
55   - * 品类第二级 ID
56   - */
57   - private String categoryTwoId;
58   - /**
59   - * 品类第二级名称
60   - */
61   - private String categoryTwoName;
62   - /**
63   - * 品类第三级 ID
64   - */
65   - private String categoryThreeId;
66   - /**
67   - * 品类第三级名称
68   - */
69   - private String categoryThreeName;
70   - /**
71   - * 产品 ID
72   - */
73   - private String productId;
74   - /**
75   - * 产品名称
76   - */
77   - private String productName;
78   - /**
79   - * 进门单数
80   - */
81   - private String countEntrance;
82   - /**
83   - * 分货单数
84   - */
85   - private String countPick;
86   - /**
87   - * 报告计数
88   - */
89   - private String countReported;
90   - /**
91   - * 进门净重
92   - */
93   - @JsonSerialize(using = PoundsToKiloSerializer.class)
94   - private BigDecimal sumWeightEntrance;
95   - /**
96   - * 分货重量
97   - */
98   - @JsonSerialize(using = PoundsToKiloSerializer.class)
99   - private BigDecimal sumWeightPick;
100   - /**
101   - * 绑定预报备单数比
102   - */
103   - private String ratioCountReported;
104   - /**
105   - * 分货与进门单数比
106   - */
107   - private String ratioCountPick;
108   - /**
109   - * 分货与进门净重比
110   - */
111   - private String ratioWeightPick;
112   - /**
113   - * 客户代码
114   - */
115   - private String customerCode;
116   - /**
117   - * 产品别名
118   - */
119   - private String productAlias;
120   -
121   -
122   - public String getCustomerId() {
123   - return customerId;
124   - }
125   -
126   - public void setCustomerId(String customerId) {
127   - this.customerId = customerId;
128   - }
129   -
130   - public String getCustomerName() {
131   - return customerName;
132   - }
133   -
134   - public void setCustomerName(String customerName) {
135   - this.customerName = customerName;
136   - }
137   -
138   - public String getShipperId() {
139   - return shipperId;
140   - }
141   -
142   - public void setShipperId(String shipperId) {
143   - this.shipperId = shipperId;
144   - }
145   -
146   - public String getShipperName() {
147   - return shipperName;
148   - }
149   -
150   - public void setShipperName(String shipperName) {
151   - this.shipperName = shipperName;
152   - }
153   -
154   - public String getShipperCode() {
155   - return shipperCode;
156   - }
157   -
158   - public void setShipperCode(String shipperCode) {
159   - this.shipperCode = shipperCode;
160   - }
161   -
162   - public String getRegionId() {
163   - return regionId;
164   - }
165   -
166   - public void setRegionId(String regionId) {
167   - this.regionId = regionId;
168   - }
169   -
170   - public String getRegionName() {
171   - return regionName;
172   - }
173   -
174   - public void setRegionName(String regionName) {
175   - this.regionName = regionName;
176   - }
177   -
178   - public String getDepId() {
179   - return depId;
180   - }
181   -
182   - public void setDepId(String depId) {
183   - this.depId = depId;
184   - }
185   -
186   - public String getDepName() {
187   - return depName;
188   - }
189   -
190   - public void setDepName(String depName) {
191   - this.depName = depName;
192   - }
193   -
194   - public String getCategoryId() {
195   - return categoryId;
196   - }
197   -
198   - public void setCategoryId(String categoryId) {
199   - this.categoryId = categoryId;
200   - }
201   -
202   - public String getCategoryName() {
203   - return categoryName;
204   - }
205   -
206   - public void setCategoryName(String categoryName) {
207   - this.categoryName = categoryName;
208   - }
209   -
210   - public String getCategoryTwoId() {
211   - return categoryTwoId;
212   - }
213   -
214   - public void setCategoryTwoId(String categoryTwoId) {
215   - this.categoryTwoId = categoryTwoId;
216   - }
217   -
218   - public String getCategoryTwoName() {
219   - return categoryTwoName;
220   - }
221   -
222   - public void setCategoryTwoName(String categoryTwoName) {
223   - this.categoryTwoName = categoryTwoName;
224   - }
225   -
226   - public String getCategoryThreeId() {
227   - return categoryThreeId;
228   - }
229   -
230   - public void setCategoryThreeId(String categoryThreeId) {
231   - this.categoryThreeId = categoryThreeId;
232   - }
233   -
234   - public String getCategoryThreeName() {
235   - return categoryThreeName;
236   - }
237   -
238   - public void setCategoryThreeName(String categoryThreeName) {
239   - this.categoryThreeName = categoryThreeName;
240   - }
241   -
242   - public String getProductId() {
243   - return productId;
244   - }
245   -
246   - public void setProductId(String productId) {
247   - this.productId = productId;
248   - }
249   -
250   - public String getProductName() {
251   - return productName;
252   - }
253   -
254   - public void setProductName(String productName) {
255   - this.productName = productName;
256   - }
257   -
258   - public String getCountEntrance() {
259   - return countEntrance;
260   - }
261   -
262   - public void setCountEntrance(String countEntrance) {
263   - this.countEntrance = countEntrance;
264   - }
265   -
266   - public String getCountPick() {
267   - return countPick;
268   - }
269   -
270   - public void setCountPick(String countPick) {
271   - this.countPick = countPick;
272   - }
273   -
274   - public String getCountReported() {
275   - return countReported;
276   - }
277   -
278   - public void setCountReported(String countReported) {
279   - this.countReported = countReported;
280   - }
281   -
282   - public BigDecimal getSumWeightEntrance() {
283   - return sumWeightEntrance;
284   - }
285   -
286   - public void setSumWeightEntrance(BigDecimal sumWeightEntrance) {
287   - this.sumWeightEntrance = sumWeightEntrance;
288   - }
289   -
290   - public BigDecimal getSumWeightPick() {
291   - return sumWeightPick;
292   - }
293   -
294   - public void setSumWeightPick(BigDecimal sumWeightPick) {
295   - this.sumWeightPick = sumWeightPick;
296   - }
297   -
298   - public String getRatioCountReported() {
299   - return ratioCountReported;
300   - }
301   -
302   - public void setRatioCountReported(String ratioCountReported) {
303   - this.ratioCountReported = ratioCountReported;
304   - }
305   -
306   - public String getRatioCountPick() {
307   - return ratioCountPick;
308   - }
309   -
310   - public void setRatioCountPick(String ratioCountPick) {
311   - this.ratioCountPick = ratioCountPick;
312   - }
313   -
314   - public String getRatioWeightPick() {
315   - return ratioWeightPick;
316   - }
317   -
318   - public void setRatioWeightPick(String ratioWeightPick) {
319   - this.ratioWeightPick = ratioWeightPick;
320   - }
321   -
322   - public String getCustomerCode() {
323   - return customerCode;
324   - }
325   -
326   - public void setCustomerCode(String customerCode) {
327   - this.customerCode = customerCode;
328   - }
329   -
330   - public String getProductAlias() {
331   - return productAlias;
332   - }
333   -
334   - public void setProductAlias(String productAlias) {
335   - this.productAlias = productAlias;
336   - }
337   -}
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/SteveTeamOrderStatDto.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.rpc.dto;
2   -
3   -import java.math.BigDecimal;
4   -
5   -public class SteveTeamOrderStatDto {
6   - private Long customerId;
7   - private Long goodsId;
8   - private BigDecimal efWeight;
9   - private BigDecimal poWeight;
10   -
11   - public Long getCustomerId() {
12   - return customerId;
13   - }
14   -
15   - public void setCustomerId(Long customerId) {
16   - this.customerId = customerId;
17   - }
18   -
19   - public Long getGoodsId() {
20   - return goodsId;
21   - }
22   -
23   - public void setGoodsId(Long goodsId) {
24   - this.goodsId = goodsId;
25   - }
26   -
27   - public BigDecimal getEfWeight() {
28   - return efWeight;
29   - }
30   -
31   - public void setEfWeight(BigDecimal efWeight) {
32   - this.efWeight = efWeight;
33   - }
34   -
35   - public BigDecimal getPoWeight() {
36   - return poWeight;
37   - }
38   -
39   - public void setPoWeight(BigDecimal poWeight) {
40   - this.poWeight = poWeight;
41   - }
42   -}
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/executor/RpcExecutor.java
  View file @e4b3607
1 1 package com.diligrp.etrade.rpc.executor;
2 2  
3 3 import cn.hutool.json.JSONObject;
4   -import com.diligrp.etrade.core.authority.SessionContext;
5 4 import com.diligrp.etrade.core.domain.Message;
6   -import com.diligrp.etrade.core.domain.PageMessage;
7   -import com.diligrp.etrade.core.util.AssertUtils;
8   -import com.diligrp.etrade.core.util.JsonUtils;
9 5 import com.diligrp.etrade.rpc.co.CusCategoryQuery;
10   -import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
11   -import com.diligrp.etrade.rpc.co.SteveTeamOrderStat;
12 6 import com.diligrp.etrade.rpc.dto.*;
13 7 import com.diligrp.etrade.rpc.service.CategoryRpc;
14 8 import com.diligrp.etrade.rpc.service.CustomerRpc;
15   -import com.diligrp.etrade.rpc.service.ReportRpc;
16 9 import com.diligrp.etrade.rpc.service.UapRpc;
17 10 import jakarta.annotation.Resource;
18 11 import org.springframework.stereotype.Component;
19 12 import org.springframework.util.CollectionUtils;
20 13 import org.springframework.util.ObjectUtils;
21 14  
22   -import java.math.BigDecimal;
23   -import java.time.LocalDateTime;
24 15 import java.util.Collections;
25 16 import java.util.List;
26   -import java.util.Set;
27   -import java.util.stream.Collectors;
28 17  
29 18 @Component
30 19 public class RpcExecutor {
... ... @@ -33,9 +22,6 @@ public class RpcExecutor {
33 22 @Resource
34 23 private CategoryRpc categoryRpc;
35 24 @Resource
36   - private ReportRpc reportRpc;
37   -
38   - @Resource
39 25 private UapRpc uapRpc;
40 26  
41 27 public CustomerDto getByCustomerId(Long id) {
... ... @@ -49,7 +35,6 @@ public class RpcExecutor {
49 35 }
50 36 return customerDto;
51 37 }
52   -
53 38 public CusCategoryDTO getCusCategory(Long marketId, Long categoryId) {
54 39 CusCategoryQuery query = new CusCategoryQuery();
55 40 query.setId(categoryId);
... ... @@ -63,36 +48,6 @@ public class RpcExecutor {
63 48 }
64 49 return parent.getData();
65 50 }
66   -
67   - public SteveTeamOrderStatDto steveTeamOrderStat(Long marketId, Long categoryId, Long customerId, LocalDateTime start, LocalDateTime end, Set<String> statKeys) {
68   - SteveTeamOrderStat stat = new SteveTeamOrderStat();
69   - stat.setMarketId(marketId);
70   - if (statKeys.contains("statKeyGoods")){
71   - stat.setGoodsId(categoryId);
72   - }
73   - stat.setCustomerId(customerId);
74   - stat.setStatKeys(statKeys);
75   - stat.setStartTime(start);
76   - stat.setEndTime(end);
77   - System.out.println(JsonUtils.toJsonString(stat));
78   - Message<List<SteveTeamOrderStatDto>> steveTeamOrderStatDtoMessage = reportRpc.steveTeamOrderStat(stat);
79   - List<SteveTeamOrderStatDto> data = steveTeamOrderStatDtoMessage.getData();
80   - if (CollectionUtils.isEmpty(data)){
81   - SteveTeamOrderStatDto statDto = new SteveTeamOrderStatDto();
82   - statDto.setCustomerId(customerId);
83   - statDto.setGoodsId(categoryId);
84   - statDto.setEfWeight(new BigDecimal("0.00"));
85   - statDto.setPoWeight(new BigDecimal("0.00"));
86   - return statDto;
87   - }else{
88   - return data.get(0);
89   - }
90   - }
91   -
92   - public PageMessage<EntranceDivideStatStatDTO> divideGoods(EntranceDivideStatStat co) {
93   - return reportRpc.entranceDivideStatStat(co);
94   - }
95   -
96 51 public List<Long> getUserDep(Long userId){
97 52 Message<List<DepartmentDto>> response = uapRpc.listUserDepartmentDataAuth(userId);
98 53 List<DepartmentDto> res = response.getData();
... ...
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/service/ReportRpc.java deleted 100644 → 0
  View file @c510beb
1   -package com.diligrp.etrade.rpc.service;
2   -
3   -import com.diligrp.etrade.core.domain.Message;
4   -import com.diligrp.etrade.core.domain.PageMessage;
5   -import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
6   -import com.diligrp.etrade.rpc.co.SteveTeamOrderStat;
7   -import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
8   -import com.diligrp.etrade.rpc.dto.SteveTeamOrderStatDto;
9   -import org.springframework.cloud.openfeign.FeignClient;
10   -import org.springframework.web.bind.annotation.PostMapping;
11   -import org.springframework.web.bind.annotation.RequestBody;
12   -
13   -import java.util.List;
14   -
15   -@FeignClient(name = "report", contextId = "report", url = "${ReportRpc.url:}")
16   -public interface ReportRpc {
17   -
18   - @PostMapping("api/pickOrderReport/customerDivideStatStat/loadData.action")
19   - Message<List<SteveTeamOrderStatDto>> steveTeamOrderStat(@RequestBody SteveTeamOrderStat stat);
20   -
21   -
22   - @PostMapping("/api/pickOrderReport/entranceDivideStatStat/loadData.action")
23   - PageMessage<EntranceDivideStatStatDTO> entranceDivideStatStat(@RequestBody EntranceDivideStatStat stat);
24   -
25   -}