feature商品修改

zhangmeiyang
1 parent c510bebc
Showing 58 changed files with 374 additions and 1440 deletions
ereport-core/src/main/java/com/diligrp/etrade/report/controller/StatController.java
ereport-core/src/main/java/com/diligrp/etrade/report/controller/ToolController.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/BusinessFlowPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/CategoriesBusinessPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/DistributionAndSalesPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/InventoryPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/SellerBusinessPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/message/SellerDistributionPageMessage.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/BusinessFlowVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/CategoriesBusinessVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/DistributionAndSalesVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/InventoryStatVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderExportVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderProductNewVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderProductVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/OrderVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/ProductRecordVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/ProductVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/SellerBusinessVO.java
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/SellerDistributionVO.java
@@ -5,7 +5,6 @@ import com.diligrp.etrade.report.domain.co.*;
 import com.diligrp.etrade.report.domain.message.*;
 import com.diligrp.etrade.report.domain.vo.*;
 import com.diligrp.etrade.report.service.StatService;
-import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 package com.diligrp.etrade.report.controller;
-import com.diligrp.etrade.core.domain.Message;
-import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.util.DateUtils;
-import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.report.constant.NumberConstant;
-import com.diligrp.etrade.report.domain.co.DistributionAndSalesCO;
-import com.diligrp.etrade.report.domain.co.ImageCreateCO;
-import com.diligrp.etrade.report.domain.vo.DistributionAndSalesVO;
 import com.diligrp.etrade.report.service.ImageCreateService;
-import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
 import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 /**
  * 工具控制器
@@ -2,20 +2,14 @@ package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.BusinessFlowVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
 public class BusinessFlowPageMessage extends PageMessage<BusinessFlowVO> {
     /**
      *订单商品总重量 单位斤
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
     private Long totalProductWeight;
     /**
@@ -2,14 +2,9 @@ package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.CategoriesBusinessVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
 public class CategoriesBusinessPageMessage extends PageMessage<CategoriesBusinessVO> {
     /**
@@ -19,7 +14,6 @@ public class CategoriesBusinessPageMessage extends PageMessage&lt;CategoriesBusines
     /**
      * 业务总重量
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
     private Long totalBusinessWeight;
     /**
      * 业务总金额
 package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.DistributionAndSalesVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -17,18 +17,18 @@ public class DistributionAndSalesPageMessage extends PageMessage&lt;DistributionAnd
     /**
      * 进门净重
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalSumWeightEntrance;
     /**
      * 分货重量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalSumWeightPick;
     /**
      * 交易量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalTrading;
     /**
 package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.InventoryStatVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -18,38 +18,38 @@ public class InventoryPageMessage extends PageMessage&lt;InventoryStatVO&gt; {
     /**
      * 起始库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalStartStock;
     /**
      * 运营库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalOperateStock;
     /**
      * 期末库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalEndStock;
     /**
      * 进门分货
      *
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalDoorStock;
     /**
      * 管理员调整库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalAdminAdjustStock;
     /**
      * 商户调整库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalMerchantAdjustmentStock;
     /**
      * 交易库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalTradingStock;
     public InventoryPageMessage() {
@@ -2,14 +2,10 @@ package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.SellerBusinessVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
 public class SellerBusinessPageMessage extends PageMessage<SellerBusinessVO> {
     /**
@@ -17,9 +13,9 @@ public class SellerBusinessPageMessage extends PageMessage&lt;SellerBusinessVO&gt; {
      */
     private Long totalBusinessCount;
     /**
-     *交易量 输出单位 公斤
+     *交易量 输出单位
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long totalBusinessWeight;
     /**
      *交易额
 package com.diligrp.etrade.report.domain.message;
 import com.diligrp.etrade.core.domain.PageMessage;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.domain.vo.SellerDistributionVO;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -17,31 +17,31 @@ public class SellerDistributionPageMessage extends PageMessage&lt;SellerDistributio
     /**
      * 到货量 合计
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalArrival;
     /**
      * 分货量 合计
      *
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalDivide;
     /**
      * 交易量 合计
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalTrading;
     /**
      * 商户调整量 合计
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalMerchantAdjustment;
     /**
      * 管理员调整 合计
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal totalAdminAdjust;
     /**
@@ -50,25 +50,25 @@ public class BusinessFlowVO implements Serializable {
     /**
      *订单商品总重量 输出单位 公斤
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productWeight;
     /**
      *订单商品件数 单位件
      */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPieces;
     /**
      *订单商品件重单位 输出单位 公斤
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPieceWeight;
     /**
      * 产品单件价格
      */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPiecePrice;
     /**
@@ -81,7 +81,7 @@ public class BusinessFlowVO implements Serializable {
      * 商品重量单价 输出单位 元/公斤
      *
      */
-    @JsonSerialize(using =  CentToKiloJsonSerializer.class)
+    @JsonSerialize(using =  PieceSerializer.class)
     private Long productPrice;
     /**
@@ -35,7 +35,7 @@ public class CategoriesBusinessVO implements Serializable {
     /**
      *交易量 输出单位 公斤
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long businessWeight;
     /**
      *交易额
@@ -45,18 +45,18 @@ public class CategoriesBusinessVO implements Serializable {
     /**
      *最高单价 输出单位 元/公斤
      */
-    @JsonSerialize(using = CentToKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long maxAmount;
     /**
      *最低单价 输出单位 元/公斤
      */
-    @JsonSerialize(using = CentToKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long minAmount;
     /**
      *平均价
      */
-    @JsonSerialize(using = PoundsToKiloStringSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private String avgAmount;
     public Long getCategoryId() {
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -46,12 +46,12 @@ public class DistributionAndSalesVO implements Serializable {
     /**
      * 进门净重
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal sumWeightEntrance;
     /**
      * 分货重量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal sumWeightPick;
     /**
@@ -63,7 +63,7 @@ public class DistributionAndSalesVO implements Serializable {
     /**
      * 交易量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal trading;
     /**
 package com.diligrp.etrade.report.domain.vo;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -49,38 +49,38 @@ public class InventoryStatVO implements Serializable {
     /**
      * 起始库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal startStock;
     /**
      * 运营库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal operateStock;
     /**
      * 期末库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal endStock;
     /**
      * 进门分货
      *
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal doorStock;
     /**
      * 管理员调整库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal adminAdjustStock;
     /**
      * 商户调整库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal merchantAdjustmentStock;
     /**
      * 交易库存
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal tradingStock;
     public String getCustomerCode() {
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -16,19 +16,19 @@ public class OrderExportVO implements Serializable {
     /**
      *订单净重合计
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long weightTotal;
     /**
      *订单件重合计
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long pieceWeightTotal;
     /**
      *订单件数合计
      */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long pieceTotal;
     /**
 package com.diligrp.etrade.report.domain.vo;
-import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.diligrp.etrade.report.enums.PayChannel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -41,8 +40,8 @@ public class OrderProductNewVO implements Serializable {
     /** 商品名称 */
     private String productName;
-    /** 商品重量单价 元/斤 */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    /** 商品重量单价 元/单位 */
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPrice;
     /** 订单商品总价 元 */
@@ -50,21 +49,13 @@ public class OrderProductNewVO implements Serializable {
     private Long productTotalPrice;
     /** 订单商品总重量 单位斤*/
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productWeight;
     /** 订单商品件数 单位件 */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPieces;
-    /** 订单商品件重单位 斤 */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
-    private Long productPieceWeight;
-
-    /** 订单商品件价单位 元 */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
-    private Long productPiecePrice;
-
     /** 订单商品交易类型（1、按重方式，2、按件方式） */
     private Integer productTradeType;
@@ -206,22 +197,6 @@ public class OrderProductNewVO implements Serializable {
         this.productPieces = productPieces;
     }
-    public Long getProductPieceWeight() {
-        return productPieceWeight;
-    }
-
-    public void setProductPieceWeight(Long productPieceWeight) {
-        this.productPieceWeight = productPieceWeight;
-    }
-
-    public Long getProductPiecePrice() {
-        return productPiecePrice;
-    }
-
-    public void setProductPiecePrice(Long productPiecePrice) {
-        this.productPiecePrice = productPiecePrice;
-    }
-
     public Integer getProductTradeType() {
         return productTradeType;
     }
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
 import com.diligrp.etrade.report.enums.PayChannel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 /**
@@ -2,13 +2,11 @@ package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.diligrp.etrade.report.enums.PayChannel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -143,7 +141,7 @@ public class OrderVO implements Serializable {
     /**
      * 订单总重量
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long totleWeight;
     /**
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -22,7 +22,7 @@ public class ProductRecordVO implements Serializable {
     /**
      * 交易重量
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long countGoods;
     /**
 package com.diligrp.etrade.report.domain.vo;
-import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 public class ProductVO {
@@ -20,7 +19,7 @@ public class ProductVO {
     private String productName;
     /** 商品重量单价 元/斤 */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPrice;
     /** 订单商品总价 元 */
@@ -28,19 +27,19 @@ public class ProductVO {
     private Long productTotalPrice;
     /** 订单商品总重量 单位斤*/
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productWeight;
     /** 订单商品件数 单位件 */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPieces;
     /** 订单商品件重单位 斤 */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPieceWeight;
     /** 订单商品件价单位 元 */
-    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productPiecePrice;
     /** 订单商品交易类型（1、按重方式，2、按件方式） */
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightKiloJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -62,7 +61,7 @@ public class SellerBusinessVO implements Serializable {
     /**
      *交易量
      */
-    @JsonSerialize(using = WeightKiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long businessWeight;
     /**
      *交易额
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
-import com.diligrp.etrade.core.jackson.serializer.KiloBigDecimalSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.diligrp.etrade.core.jackson.serializer.J2KiloBigDecimalSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -43,19 +41,19 @@ public class SellerDistributionVO implements Serializable {
     /**
      * 到货量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal arrival;
     /**
      * 分货量
      *
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal divide;
     /**
      * 交易量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal trading;
     /**
@@ -66,7 +64,7 @@ public class SellerDistributionVO implements Serializable {
     /**
      * 分货交易量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal split;
     /**
      * 拆分到达率
@@ -76,7 +74,7 @@ public class SellerDistributionVO implements Serializable {
     /**
      * 商户调整量
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal merchantAdjustment;
     /**
      * 商户调整到达率
@@ -86,7 +84,7 @@ public class SellerDistributionVO implements Serializable {
     /**
      * 管理员调整金额
      */
-    @JsonSerialize(using = KiloBigDecimalSerializer.class)
+    @JsonSerialize(using = J2KiloBigDecimalSerializer.class)
     private BigDecimal adminAdjust;
     /**
      * 管理员调整到达率
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -42,7 +42,7 @@ public class StatOrderBuyerVO implements Serializable {
     /**
      * 总计交易重量
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long totalCountGoods;
     /**
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -38,7 +38,7 @@ public class StatOrderSellerVO implements Serializable {
     /**
      * 总计交易重量
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long totalCountGoods;
     /**
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
-import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -37,7 +36,7 @@ public class StatProductSettleDateVO implements Serializable {
     /**
      * 产品销售
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productSales;
@@ -50,7 +49,7 @@ public class StatProductSettleDateVO implements Serializable {
     /**
      * 商品最高单价
      */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productHighPrice;
     /**
@@ -65,7 +64,7 @@ public class StatProductSettleDateVO implements Serializable {
     /**
      * 商品最低单价
      */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productLowPrice;
     /**
 package com.diligrp.etrade.report.domain.vo;
 import com.diligrp.etrade.core.jackson.serializer.BigDecimalSerializer;
-import com.diligrp.etrade.core.jackson.serializer.Cent2KiloJsonSerializer;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
-import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -40,7 +39,7 @@ public class StatProductVO implements Serializable {
     /**
      * 产品销售
      */
-    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productSales;
     /**
@@ -52,7 +51,7 @@ public class StatProductVO implements Serializable {
     /**
      * 商品最高单价
      */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productHighPrice;
     /**
@@ -63,7 +62,7 @@ public class StatProductVO implements Serializable {
     /**
      * 商品最低单价
      */
-    @JsonSerialize(using = Cent2KiloJsonSerializer.class)
+    @JsonSerialize(using = PieceSerializer.class)
     private Long productLowPrice;
     /**
@@ -4,8 +4,6 @@ import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.report.domain.co.*;
 import com.diligrp.etrade.report.domain.message.*;
 import com.diligrp.etrade.report.domain.vo.*;
-import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
-import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
 public interface StatService {
     /**
 package com.diligrp.etrade.report.service.impl;
-import com.diligrp.etrade.core.util.DateUtils;
 import com.diligrp.etrade.report.anno.DataSource;
 import com.diligrp.etrade.report.anno.LogArgsInfo;
 import com.diligrp.etrade.report.constant.DataSourceConstants;
 import com.diligrp.etrade.report.constant.NumberConstant;
 import com.diligrp.etrade.report.dao.ImageCreateMapper;
-import com.diligrp.etrade.report.domain.co.*;
-import com.diligrp.etrade.report.domain.vo.StatProductVO;
+import com.diligrp.etrade.report.domain.co.ImageCreateCO;
+import com.diligrp.etrade.report.domain.co.StatProductCO;
 import com.diligrp.etrade.report.service.*;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
 import java.util.List;
 @Service
@@ -5,14 +5,14 @@
     <delete id="deleteByPrimaryKeyStatOrderBuyer" parameterType="java.lang.Long">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_buyer`
+            `zr_etrade`.`statistics_order_buyer`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </delete>
     <delete id="deleteBatchStatOrderBuyer">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_buyer`
+            `zr_etrade`.`statistics_order_buyer`
         WHERE
               1 = 1
           AND settle_date <![CDATA[>= #{startSettleDate}]]>
@@ -23,7 +23,7 @@
             parameterType="com.diligrp.etrade.report.model.StatOrderBuyer"
             useGeneratedKeys="true">
         INSERT INTO
-            `dili_etrade`.`statistics_order_buyer` ( id
+            `zr_etrade`.`statistics_order_buyer` ( id
                                                    , market_id
                                                    , buyer_code
                                                    , buyer_id
@@ -50,7 +50,7 @@
             , #{version,jdbcType=INTEGER})
     </insert>
     <update id="updateByPrimaryKeyStatOrderBuyer" parameterType="com.diligrp.etrade.report.model.StatOrderBuyer">
-        UPDATE `dili_etrade`.`statistics_order_buyer`
+        UPDATE `zr_etrade`.`statistics_order_buyer`
         SET
             market_id           = #{marketId,jdbcType=BIGINT}
           , buyer_code          = #{buyerCode,jdbcType=VARCHAR}
@@ -70,14 +70,14 @@
     <delete id="deleteByPrimaryKeyStatOrderBuyerProduct" parameterType="java.lang.Long">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_buyer_product`
+            `zr_etrade`.`statistics_order_buyer_product`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </delete>
     <delete id="deleteBatchStatOrderBuyerProduct">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_buyer_product`
+            `zr_etrade`.`statistics_order_buyer_product`
         WHERE
               1 = 1
           AND settle_date <![CDATA[>= #{startSettleDate}]]>
@@ -87,7 +87,7 @@
     <insert id="insertStatOrderBuyerProduct" keyColumn="id" keyProperty="id"
             parameterType="com.diligrp.etrade.report.model.StatOrderBuyerProduct" useGeneratedKeys="true">
         INSERT INTO
-            `dili_etrade`.`statistics_order_buyer_product`
+            `zr_etrade`.`statistics_order_buyer_product`
         ( id
         , market_id
         , buyer_code
@@ -120,7 +120,7 @@
     </insert>
     <update id="updateByPrimaryKeyStatOrderBuyerProduct"
             parameterType="com.diligrp.etrade.report.model.StatOrderBuyerProduct">
-        UPDATE `dili_etrade`.`statistics_order_buyer_product`
+        UPDATE `zr_etrade`.`statistics_order_buyer_product`
         SET
             market_id    = #{marketId,jdbcType=BIGINT}
           , buyer_code   = #{buyerCode,jdbcType=VARCHAR}
@@ -142,14 +142,14 @@
     <delete id="deleteByPrimaryKeyStatOrderSeller" parameterType="java.lang.Long">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_seller`
+            `zr_etrade`.`statistics_order_seller`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </delete>
     <delete id="deleteBatchStatOrderSeller">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_seller`
+            `zr_etrade`.`statistics_order_seller`
         WHERE
               1 = 1
           AND settle_date <![CDATA[>= #{startSettleDate}]]>
@@ -160,7 +160,7 @@
             parameterType="com.diligrp.etrade.report.model.StatOrderSeller"
             useGeneratedKeys="true">
         INSERT INTO
-            `dili_etrade`.`statistics_order_seller` ( id
+            `zr_etrade`.`statistics_order_seller` ( id
                                                     , market_id
                                                     , shop_id
                                                     , shop_name
@@ -189,7 +189,7 @@
             , #{version,jdbcType=INTEGER})
     </insert>
     <update id="updateByPrimaryKeyStatOrderSeller" parameterType="com.diligrp.etrade.report.model.StatOrderSeller">
-        UPDATE `dili_etrade`.`statistics_order_seller`
+        UPDATE `zr_etrade`.`statistics_order_seller`
         SET
             market_id           = #{marketId,jdbcType=BIGINT}
           , shop_id             = #{shopId,jdbcType=BIGINT}
@@ -210,14 +210,14 @@
     <delete id="deleteByPrimaryKeyStatOrderSellerProduct" parameterType="java.lang.Long">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_seller_product`
+            `zr_etrade`.`statistics_order_seller_product`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </delete>
     <delete id="deleteBatchStatOrderSellerProduct">
         DELETE
         FROM
-            `dili_etrade`.`statistics_order_seller_product`
+            `zr_etrade`.`statistics_order_seller_product`
         WHERE
               1 = 1
           AND settle_date <![CDATA[>= #{startSettleDate}]]>
@@ -227,7 +227,7 @@
     <insert id="insertStatOrderSellerProduct" keyColumn="id" keyProperty="id"
             parameterType="com.diligrp.etrade.report.model.StatOrderSellerProduct" useGeneratedKeys="true">
         INSERT INTO
-            `dili_etrade`.`statistics_order_seller_product` ( id
+            `zr_etrade`.`statistics_order_seller_product` ( id
                                                             , market_id
                                                             , shop_id
                                                             , shop_name
@@ -257,7 +257,7 @@
     </insert>
     <update id="updateByPrimaryKeyStatOrderSellerProduct"
             parameterType="com.diligrp.etrade.report.model.StatOrderSellerProduct">
-        UPDATE `dili_etrade`.`statistics_order_seller_product`
+        UPDATE `zr_etrade`.`statistics_order_seller_product`
         SET
             market_id      = #{marketId,jdbcType=BIGINT}
           , shop_id        = #{shopId,jdbcType=BIGINT}
@@ -278,14 +278,14 @@
     <delete id="deleteByPrimaryKeyStatProduct" parameterType="java.lang.Long">
         DELETE
         FROM
-            `dili_etrade`.`statistics_product`
+            `zr_etrade`.`statistics_product`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </delete>
     <delete id="deleteBatchStatProduct">
         DELETE
         FROM
-            `dili_etrade`.`statistics_product`
+            `zr_etrade`.`statistics_product`
         WHERE
               1 = 1
           AND settle_date <![CDATA[>= #{startSettleDate}]]>
@@ -295,7 +295,7 @@
     <insert id="insertStatProduct" keyColumn="id" keyProperty="id"
             parameterType="com.diligrp.etrade.report.model.StatProduct" useGeneratedKeys="true">
         INSERT INTO
-            `dili_etrade`.`statistics_product` ( id
+            `zr_etrade`.`statistics_product` ( id
                                                , market_id
                                                , product_id
                                                , product_code
@@ -322,7 +322,7 @@
             , #{version,jdbcType=INTEGER})
     </insert>
     <update id="updateByPrimaryKeyStatProduct" parameterType="com.diligrp.etrade.report.model.StatProduct">
-        UPDATE `dili_etrade`.`statistics_product`
+        UPDATE `zr_etrade`.`statistics_product`
         SET
             market_id            = #{marketId,jdbcType=BIGINT}
           , product_id           = #{productId,jdbcType=BIGINT}
@@ -16,8 +16,8 @@
           , CONVERT(o.pay_time, date)      AS settleDate
           , op.payee_seller_id             AS employeeId
         FROM
-            `dili_etrade`.`order` o
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            `zr_etrade`.`order` o
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE
               o.state IN (3,5)
           AND o.order_status IS NULL
@@ -40,9 +40,9 @@
           , CONVERT(o.pay_time, date)              AS settleDate
           , op.payee_seller_id                     AS employeeId
         FROM
-            `dili_etrade`.`order_goods` og
-                LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            `zr_etrade`.`order_goods` og
+                LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE
               o.state IN (3,5)
           AND o.order_status IS NULL
@@ -64,8 +64,8 @@
           , op.pay_channel                 AS payChannel
           , CONVERT(o.pay_time, date)      AS settleDate
         FROM
-            `dili_etrade`.`order` o
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            `zr_etrade`.`order` o
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE
               o.state IN (3,5)
           AND o.order_status IS NULL
@@ -89,9 +89,9 @@
           , op.pay_channel                         AS payChannel
           , CONVERT(o.pay_time, date)              AS settleDate
         FROM
-            `dili_etrade`.`order_goods` og
-                LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            `zr_etrade`.`order_goods` og
+                LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE
               o.state IN (3,5)
           AND o.order_status IS NULL
@@ -124,9 +124,9 @@
                   , MIN(og.product_price)                  AS productLowPrice
                   , CONVERT(o.pay_time, date)              AS settleDate
                 FROM
-                    `dili_etrade`.`order_goods` og
-                        LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+                    `zr_etrade`.`order_goods` og
+                        LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
                 WHERE 1=1
                   AND o.state IN (3,5)
                   AND o.order_status IS NULL
@@ -145,9 +145,9 @@
                   , NULL                                    AS productLowPrice
                   , CONVERT(o.created_time, date)           AS settleDate
                 FROM
-                    `dili_etrade`.`order_goods` og
-                        LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+                    `zr_etrade`.`order_goods` og
+                        LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
                 WHERE 1=1
                   AND o.state = 3
                   AND o.order_status = 2
@@ -174,9 +174,9 @@
           , SUM(IFNULL(og.product_total_price, 0)) AS productSalesAmount
           , CONVERT(o.pay_time, date)              AS settleDate
         FROM
-            `dili_etrade`.`order_goods` og
-                LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+            `zr_etrade`.`order_goods` og
+                LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
           AND o.state = 3
           AND o.order_status = 2
@@ -185,7 +185,7 @@
         GROUP BY marketId, productId, settleDate
     </select>
     <select id="queryProduct" resultType="com.diligrp.etrade.report.domain.co.StatProductCO">
-        SELECT * FROM `dili_etrade`.`statistics_product` sp
+        SELECT * FROM `zr_etrade`.`statistics_product` sp
         WHERE 1=1
         AND sp.market_id = #{marketId}
         AND sp.product_id = #{productId}
@@ -196,9 +196,9 @@
             MAX(og.product_price)                  AS productHighPrice
           , MIN(og.product_price)                  AS productLowPrice
         FROM
-            `dili_etrade`.`order_goods` og
-                LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+            `zr_etrade`.`order_goods` og
+                LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
           AND o.market_id = #{marketId}
           AND p.category_id = #{productId}
@@ -50,11 +50,11 @@
               , se.card_no              AS payeeCardNo
               , se.name                 AS creater
             FROM
-                `dili_etrade`.`order_goods` og
-                    LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-                    LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
-                    LEFT JOIN `dili_etrade`.`shop` s ON s.id = o.shop_id
-                    LEFT JOIN `dili_etrade`.`store_employee` se ON se.id = o.seller_id
+                `zr_etrade`.`order_goods` og
+                    LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+                    LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
+                    LEFT JOIN `zr_etrade`.`shop` s ON s.id = o.shop_id
+                    LEFT JOIN `zr_etrade`.`store_employee` se ON se.id = o.seller_id
             WHERE 1=1
               AND o.state IN (3,5)
               AND o.order_status IS NULL
@@ -115,11 +115,11 @@
             , se.card_no              AS payeeCardNo
             , se.name                 AS creater
             FROM
-            `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-            LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
-            LEFT JOIN `dili_etrade`.`shop` s ON s.id = o.shop_id
-            LEFT JOIN `dili_etrade`.`store_employee` se ON se.id = o.seller_id
+            `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+            LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
+            LEFT JOIN `zr_etrade`.`shop` s ON s.id = o.shop_id
+            LEFT JOIN `zr_etrade`.`store_employee` se ON se.id = o.seller_id
             WHERE 1=1
             AND o.state =3
             AND o.order_status = 2
@@ -173,9 +173,9 @@
         , og.product_total_price  AS productTotalPrice
         , og.product_seller_fee   AS productSellerFee
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-        LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+        LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
         WHERE 1=1
         AND o.state IN (3,5)
         AND o.order_status IS NULL
@@ -218,9 +218,9 @@
         , og.product_total_price  AS productTotalPrice
         , og.product_seller_fee   AS productSellerFee
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON o.id = og.order_id
-        LEFT JOIN `dili_etrade`.`product` p ON og.product_id = p.id
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
+        LEFT JOIN `zr_etrade`.`product` p ON og.product_id = p.id
         WHERE 1=1
         AND o.state = 3
         AND o.order_status = 2
@@ -290,9 +290,9 @@
               , p.`alias`                   AS productName
               , COUNT(1)                    AS businessCount
             FROM
-                `dili_etrade`.`order_goods` og
-                    LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-                    LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+                `zr_etrade`.`order_goods` og
+                    LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+                    LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
                     LEFT JOIN (
                                   SELECT
                                       ss.id
@@ -305,7 +305,7 @@
                                     , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
                                     , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
                                   FROM
-                                    `dili_etrade`.`shop` ss
+                                    `zr_etrade`.`shop` ss
                                   ) s ON s.id = o.shop_id
             WHERE 1=1
               AND og.state = 1
@@ -365,9 +365,9 @@
             , p.`alias`                   AS productName
             , -COUNT(1)                   AS businessCount
             FROM
-            `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-            LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+            `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+            LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
             LEFT JOIN (
             SELECT
             ss.id
@@ -380,7 +380,7 @@
             , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
             , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
             FROM
-            `dili_etrade`.`shop` ss
+            `zr_etrade`.`shop` ss
             ) s ON s.id = o.shop_id
             WHERE 1=1
             AND og.state = 1
@@ -454,9 +454,9 @@
         , s.id AS shopId
         , o.shop_customer_id AS customId
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN (
         SELECT
         ss.id
@@ -468,7 +468,7 @@
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
         FROM
-        `dili_etrade`.`shop` ss
+        `zr_etrade`.`shop` ss
         ) s ON s.id = o.shop_id
         WHERE
         og.state = 1
@@ -522,9 +522,9 @@
         , s.id AS shopId
         , o.shop_customer_id AS customId
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN (
         SELECT
         ss.id
@@ -536,7 +536,7 @@
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
         FROM
-        `dili_etrade`.`shop` ss
+        `zr_etrade`.`shop` ss
         ) s ON s.id = o.shop_id
         WHERE
         og.state = 1
@@ -622,14 +622,14 @@
         ,s.xname AS districtName
         ,p.category_id AS categoryId
         ,p.category_id_path_json -> '$[2]' AS categoryThreeId
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN ( SELECT
         ss.id
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
-        FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
+        FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -698,14 +698,14 @@
         ,s.xname AS districtName
         ,p.category_id AS categoryId
         ,p.category_id_path_json -> '$[2]' AS categoryThreeId
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN ( SELECT
         ss.id
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
-        FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
+        FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 5
@@ -774,14 +774,14 @@
         ,s.xname AS districtName
         ,p.category_id AS categoryId
         ,p.category_id_path_json -> '$[2]' AS categoryThreeId
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN ( SELECT
         ss.id
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
-        FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
+        FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -870,14 +870,14 @@
         ,s.xname AS districtName
         ,p.category_id AS categoryId
         ,p.category_id_path_json -> '$[2]' AS categoryThreeId
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN ( SELECT
         ss.id
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
-        FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
+        FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -946,14 +946,14 @@
         ,s.xname AS districtName
         ,p.category_id AS categoryId
         ,p.category_id_path_json -> '$[2]' AS categoryThreeId
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         LEFT JOIN ( SELECT
         ss.id
         , CONCAT(ss.district_id,IF(ss.sub_district_id IS NULL, '', CONCAT('-', ss.sub_district_id))) AS xtype
         , CONCAT(ss.district_name,IF(ss.sub_district_id IS NULL,'', CONCAT( '-', ss.sub_district_name))) AS xname
-        FROM `dili_etrade`.`shop` ss ) s ON s.id = o.shop_id
+        FROM `zr_etrade`.`shop` ss ) s ON s.id = o.shop_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -1038,8 +1038,8 @@
         , sd.source_type
         , sd.operate_stock
         FROM
-        `dili_etrade`.`stock_details` sd
-        LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
+        `zr_etrade`.`stock_details` sd
+        LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
         WHERE 1 = 1
         AND sd.parent = 0
         AND sd.market_id = #{marketId}
@@ -1090,9 +1090,9 @@
         , sdc.operate_stock AS sdc_operate_stock
         , sdc.source_type AS sdc_source_type
         FROM
-        `dili_etrade`.`stock_details` sd
-        LEFT JOIN `dili_etrade`.`stock_details` sdc ON sdc.parent = sd.id
-        LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
+        `zr_etrade`.`stock_details` sd
+        LEFT JOIN `zr_etrade`.`stock_details` sdc ON sdc.parent = sd.id
+        LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
         WHERE 1 = 1
         AND sd.source_type = 4
         AND sd.market_id = #{marketId}
@@ -1238,9 +1238,9 @@
             , p.category_id_path_json -> '$[2]' AS three_category_id
             , og.product_weight AS weight
             , o.order_status AS order_status
-            FROM `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-            LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+            FROM `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+            LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
             WHERE 1=1
             AND og.state = 1
             AND o.state IN (3,5)
@@ -1274,9 +1274,9 @@
             , p.category_id_path_json -> '$[2]' AS three_category_id
             , og.product_weight AS weight
             , o.order_status AS order_status
-            FROM `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-            LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+            FROM `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+            LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
             WHERE 1=1
             AND og.state = 1
             AND o.state = 3
@@ -1362,8 +1362,8 @@
         , sd.source_type
         , sd.operate_stock
         FROM
-        `dili_etrade`.`stock_details` sd
-        LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
+        `zr_etrade`.`stock_details` sd
+        LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
         WHERE 1 = 1
         AND sd.parent = 0
         AND sd.market_id = #{marketId}
@@ -1414,9 +1414,9 @@
         , sdc.operate_stock AS sdc_operate_stock
         , sdc.source_type AS sdc_source_type
         FROM
-        `dili_etrade`.`stock_details` sd
-        LEFT JOIN `dili_etrade`.`stock_details` sdc ON sdc.parent = sd.id
-        LEFT JOIN `dili_etrade`.`product` p ON sd.product_id = p.id
+        `zr_etrade`.`stock_details` sd
+        LEFT JOIN `zr_etrade`.`stock_details` sdc ON sdc.parent = sd.id
+        LEFT JOIN `zr_etrade`.`product` p ON sd.product_id = p.id
         WHERE 1 = 1
         AND sd.source_type = 4
         AND sd.market_id = #{marketId}
@@ -1556,9 +1556,9 @@
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
         , o.order_status as order_status
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -1592,9 +1592,9 @@
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
         , o.order_status as order_status
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -2096,9 +2096,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -2116,9 +2116,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -2270,9 +2270,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -2290,9 +2290,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -2452,9 +2452,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -2472,9 +2472,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -2633,9 +2633,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state IN (3,5)
@@ -2653,9 +2653,9 @@
         , p.category_id AS category_id
         , p.category_id_path_json -> '$[2]' AS three_category_id
         , og.product_weight AS weight
-        FROM `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`product` p ON p.id = og.product_id
+        FROM `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`product` p ON p.id = og.product_id
         WHERE 1=1
         AND og.state = 1
         AND o.state = 3
@@ -2739,7 +2739,7 @@
                           , SUM(IF(sd.source_type = 3, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock)   AS merchantAdjustmentStock
                           , SUM(IF(sd.source_type = 4, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock)   AS tradingStock
                         FROM
-                            `dili_etrade`.`stock_details` sd
+                            `zr_etrade`.`stock_details` sd
                         WHERE
                               1 = 1
                           AND sd.market_id = #{marketId}
@@ -2753,21 +2753,21 @@
                                 sd.product_id
                               , MAX(sd.id) AS 'max_id'
                             FROM
-                                `dili_etrade`.`stock_details` sd
+                                `zr_etrade`.`stock_details` sd
                             WHERE
                                   1 = 1
                               AND sd.created_time BETWEEN #{startSettleDateTime} AND #{endSettleDateTime}
                               AND sd.parent = 0
                             GROUP BY sd.product_id
                             ) t2 ON t2.product_id = t1.product_id
-                        LEFT JOIN `dili_etrade`.`stock_details` t3 ON t3.id = t2.max_id
+                        LEFT JOIN `zr_etrade`.`stock_details` t3 ON t3.id = t2.max_id
                         LEFT JOIN
                         (
                             SELECT
                                 sd.product_id
                               , MAX(sd.id) AS 'min_id'
                             FROM
-                                `dili_etrade`.`stock_details` sd
+                                `zr_etrade`.`stock_details` sd
                             WHERE
                                   1 = 1
                               AND sd.created_time <![CDATA[< #{startSettleDateTime}]]>
@@ -2776,9 +2776,9 @@
                             ) t4 ON t4.product_id = t1.product_id
                         LEFT JOIN dili_etrade.stock_details t5 ON t5.id = t4.min_id
                 ) t
-                LEFT JOIN `dili_etrade`.`product` p ON t.product_id = p.id
+                LEFT JOIN `zr_etrade`.`product` p ON t.product_id = p.id
                 LEFT JOIN `dili-customer`.customer c ON t.customer_id = c.id
-                LEFT JOIN `dili_etrade`.`shop` s ON s.id = t.shop_id
+                LEFT JOIN `zr_etrade`.`shop` s ON s.id = t.shop_id
         WHERE 1=1
         <if test="categoryIds !=null and categoryIds.size() > 0 ">
             and p.category_id in
@@ -2858,7 +2858,7 @@
         , SUM(IF(sd.source_type = 3, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock)   AS merchantAdjustmentStock
         , SUM(IF(sd.source_type = 4, 1, 0) * IF(sd.operate_type = 1, 1, -1) * sd.operate_stock)   AS tradingStock
         FROM
-        `dili_etrade`.`stock_details` sd
+        `zr_etrade`.`stock_details` sd
         WHERE
         1 = 1
         AND sd.market_id = #{marketId}
@@ -2872,21 +2872,21 @@
         sd.product_id
         , MAX(sd.id) AS 'max_id'
         FROM
-        `dili_etrade`.`stock_details` sd
+        `zr_etrade`.`stock_details` sd
         WHERE
         1 = 1
         AND sd.created_time BETWEEN #{startSettleDateTime} AND #{endSettleDateTime}
         AND sd.parent = 0
         GROUP BY sd.product_id
         ) t2 ON t2.product_id = t1.product_id
-        LEFT JOIN `dili_etrade`.`stock_details` t3 ON t3.id = t2.max_id
+        LEFT JOIN `zr_etrade`.`stock_details` t3 ON t3.id = t2.max_id
         LEFT JOIN
         (
         SELECT
         sd.product_id
         , MAX(sd.id) AS 'min_id'
         FROM
-        `dili_etrade`.`stock_details` sd
+        `zr_etrade`.`stock_details` sd
         WHERE
         1 = 1
         AND sd.created_time <![CDATA[< #{startSettleDateTime}]]>
@@ -2895,9 +2895,9 @@
         ) t4 ON t4.product_id = t1.product_id
         LEFT JOIN dili_etrade.stock_details t5 ON t5.id = t4.min_id
         ) t
-        LEFT JOIN `dili_etrade`.`product` p ON t.product_id = p.id
+        LEFT JOIN `zr_etrade`.`product` p ON t.product_id = p.id
         LEFT JOIN `dili-customer`.customer c ON t.customer_id = c.id
-        LEFT JOIN `dili_etrade`.`shop` s ON s.id = t.shop_id
+        LEFT JOIN `zr_etrade`.`shop` s ON s.id = t.shop_id
         WHERE 1=1
         <if test="categoryIds !=null and categoryIds.size() > 0 ">
             and p.category_id in
@@ -31,8 +31,8 @@
         , IFNULL(o.totle_weight, 0) AS totleWeight
         , IFNULL(op.pay_amount, 0) AS payAmount
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.buyer_id = #{buyerId}
         AND o.market_id = #{marketId}
@@ -64,7 +64,7 @@
         , IFNULL(sob.total_count_goods, 0) AS goods
         , IFNULL(sob.total_count_amount, 0) AS amount
         FROM
-        `dili_etrade`.`statistics_order_buyer` sob
+        `zr_etrade`.`statistics_order_buyer` sob
         WHERE 1=1
         AND sob.market_id = #{marketId}
         AND sob.buyer_id = #{buyerId}
@@ -91,8 +91,8 @@
         , IFNULL(o.totle_weight, 0) AS totleWeight
         , IFNULL(op.pay_amount, 0) AS payAmount
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.buyer_id = #{buyerId}
         AND o.market_id = #{marketId}
@@ -121,7 +121,7 @@
                   , SUM(IFNULL(sob.total_count_goods, 0))                                       AS totalCountGoods
                   , sob.settle_date                                                             AS settleDate
                 FROM
-                    `dili_etrade`.`statistics_order_buyer` sob
+                    `zr_etrade`.`statistics_order_buyer` sob
                 WHERE
                       sob.market_id = #{marketId}
                   AND sob.buyer_id = #{buyerId}
@@ -141,8 +141,8 @@
                           , IFNULL(op.pay_amount, 0)  AS payAmount
                           , CONVERT(o.pay_time, date) AS settleDate
                         FROM
-                            `dili_etrade`.`order` o
-                                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                            `zr_etrade`.`order` o
+                                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                         WHERE
                               o.buyer_id = #{buyerId}
                           AND o.market_id = #{marketId}
@@ -164,8 +164,8 @@
                           , IFNULL(op.pay_amount, 0)      AS payAmount
                           , CONVERT(o.created_time, date) AS settleDate
                         FROM
-                            `dili_etrade`.`order` o
-                                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                            `zr_etrade`.`order` o
+                                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                         WHERE
                               o.buyer_id = #{buyerId}
                           AND o.market_id = #{marketId}
@@ -30,8 +30,8 @@
                           , IFNULL(o.totle_weight, 0) AS totleWeight
                           , IFNULL(op.pay_amount, 0)  AS payAmount
                         FROM
-                            `dili_etrade`.`order` o
-                                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                            `zr_etrade`.`order` o
+                                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                         WHERE
                               1 = 1
                           AND o.buyer_id = #{buyerId}
@@ -62,8 +62,8 @@
                           , IFNULL(o.totle_weight, 0) AS totleWeight
                           , IFNULL(op.pay_amount, 0)  AS payAmount
                         FROM
-                            `dili_etrade`.`order` o
-                                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                            `zr_etrade`.`order` o
+                                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                         WHERE
                               1 = 1
                           AND o.buyer_id = #{buyerId}
@@ -20,7 +20,7 @@
           , sob.id                  AS id
           , sob.total_count_amount  AS totalCountAmount
         FROM
-            `dili_etrade`.`statistics_order_buyer` sob
+            `zr_etrade`.`statistics_order_buyer` sob
         WHERE
             id = #{id,jdbcType=BIGINT}
     </select>
@@ -45,7 +45,7 @@
             , IFNULL(sob.total_count_goods, 0) AS totalCountGoods
             , IFNULL(sob.total_count_amount, 0) AS totalCountAmount
             FROM
-            `dili_etrade`.`statistics_order_buyer` sob
+            `zr_etrade`.`statistics_order_buyer` sob
             WHERE 1=1
             AND sob.market_id = #{marketId}
             AND sob.buyer_id = #{buyerId}
@@ -63,8 +63,8 @@
             , 0 AS totalRefundAmount
             , SUM(IFNULL(o.totle_weight, 0)) AS totalCountGoods
             , SUM(IFNULL(op.pay_amount, 0)) AS totalCountAmount
-            FROM `dili_etrade`.`order` o
-            LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            FROM `zr_etrade`.`order` o
+            LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
             WHERE 1=1
             AND o.state = 3
             AND o.order_status = 2
@@ -90,7 +90,7 @@
                   , SUM(IFNULL(sob.total_count_goods, 0))                                       AS totalCountGoods
                   , sob.settle_date                                                             AS settleDate
                 FROM
-                    `dili_etrade`.`statistics_order_buyer` sob
+                    `zr_etrade`.`statistics_order_buyer` sob
                 WHERE
                       sob.market_id = #{marketId}
                   AND sob.buyer_id = #{buyerId}
@@ -103,8 +103,8 @@
                   , -SUM(IFNULL(op.pay_amount, 0))  AS totalCountAmount
                   , CONVERT(o.pay_time, date)       AS settleDate
                 FROM
-                    `dili_etrade`.`order` o
-                        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                    `zr_etrade`.`order` o
+                        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                 WHERE
                       o.state = 4
                   AND o.buyer_id = #{buyerId}
@@ -219,8 +219,8 @@
         , o.order_status AS orderStatus
         , o.relation_id AS relationId
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state = 3
         AND o.order_status IS NULL
@@ -230,8 +230,8 @@
         <if test="productId !=null">
             AND o.id IN (
             SELECT DISTINCT o2.id
-            FROM  `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
+            FROM  `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND og.state = 1
             AND o2.state = 3
@@ -302,9 +302,9 @@
         , o.order_status AS orderStatus
         , o.relation_id AS relationId
         FROM
-        `dili_etrade`.`order` reto
-        LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` reto
+        LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND reto.state = 3
         AND reto.order_status = 2
@@ -314,7 +314,7 @@
         <if test="productId !=null">
             AND reto.id IN (
             SELECT DISTINCT o2.id
-            FROM `dili_etrade`.`order_goods` og LEFT JOIN `order` o2 ON o2.id = og.order_id
+            FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND o2.state = 3
             AND o2.order_status = 2
@@ -354,7 +354,7 @@
           , og.product_piece_weight AS productPieceWeight
           , og.product_price        AS productPrice
         FROM
-            `dili_etrade`.`order_goods` og
+            `zr_etrade`.`order_goods` og
         WHERE 1=1
           AND og.state = 1
           AND og.order_id = #{orderId}
@@ -410,8 +410,8 @@
           , o.order_status            AS orderStatus
           , o.relation_id             AS relationId
         FROM
-            `dili_etrade`.`order` o
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            `zr_etrade`.`order` o
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
           AND o.state IN (3,5)
           AND o.id = #{orderId}
@@ -517,8 +517,8 @@
         , o.order_status AS orderStatus
         , o.relation_id AS relationId
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state IN (3,5)
         AND o.order_status IS NULL
@@ -579,8 +579,8 @@
         , o.order_status AS orderStatus
         , o.relation_id AS relationId
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state = 3
         AND o.order_status = 2
@@ -612,8 +612,8 @@
         , op.pay_channel AS payChannel
         , o.id AS id
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state = 3
         AND o.order_status IS NULL
@@ -626,7 +626,7 @@
         <if test="productId !=  null">
             AND o.id IN (
             SELECT DISTINCT o2.id
-            FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
+            FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND o2.state IN (3,5)
             AND o2.order_status IS NULL
@@ -653,9 +653,9 @@
         , op.pay_channel AS payChannel
         , o.id AS id
         FROM
-        `dili_etrade`.`order` reto
-        LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` reto
+        LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND reto.state = 3
         AND reto.order_status = 2
@@ -668,7 +668,7 @@
         <if test="productId !=  null">
             AND reto.id IN (
             SELECT DISTINCT o2.id
-            FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
+            FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND o2.state = 3
             AND o2.order_status = 2
@@ -715,8 +715,8 @@
         , IFNULL(o.totle_weight, 0) AS totleWeight
         , IFNULL(op.pay_amount, 0) AS payAmount
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state IN (3,5)
         AND o.order_status IS NULL
@@ -726,7 +726,7 @@
         <if test="productId !=null">
             AND o.id IN (
             SELECT DISTINCT o2.id
-            FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
+            FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND og.state = 1
             AND o2.state IN (3,5)
@@ -763,8 +763,8 @@
         , IFNULL(o.totle_weight, 0) AS totleWeight
         , IFNULL(op.pay_amount, 0) AS payAmount
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.state = 3
         AND o.order_status = 2
@@ -774,7 +774,7 @@
         <if test="productId !=null">
             AND o.id IN (
             SELECT DISTINCT o2.id
-            FROM `dili_etrade`.`order_goods` og LEFT JOIN `dili_etrade`.`order` o2 ON o2.id = og.order_id
+            FROM `zr_etrade`.`order_goods` og LEFT JOIN `zr_etrade`.`order` o2 ON o2.id = og.order_id
             WHERE 1=1
             AND o2.state = 3
             AND o2.order_status = 2
@@ -11,9 +11,9 @@
             SUM(IFNULL(og.product_total_price,0)) AS totalCountAmount,
             SUM(IFNULL(og.product_weight,0)) AS totalCountGoods,
             COUNT(1) AS totalCountOrders
-            FROM `dili_etrade`.`order_goods` og
-            LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-            LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+            FROM `zr_etrade`.`order_goods` og
+            LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+            LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
             WHERE 1=1
             AND o.market_id = #{marketId}
             AND o.buyer_id = #{buyerId}
@@ -31,7 +31,7 @@
             SUM(IFNULL(sobp.order_amount,0)) AS totalCountAmount,
             SUM(IFNULL(sobp.count_goods,0)) AS totalCountOrders,
             SUM(IFNULL(sobp.orders,0)) AS totalCountGoods
-            FROM `dili_etrade`.`statistics_order_buyer_product` sobp
+            FROM `zr_etrade`.`statistics_order_buyer_product` sobp
             WHERE sobp.market_id = #{marketId}
             AND sobp.buyer_id = #{buyerId}
             <if test="productId !=null">
@@ -8,9 +8,9 @@
           , sum(IFNULL(og.product_weight, 0))      as totalCountGoods
           , count(1)                               as totalCountOrders
         from
-                `dili_etrade`.`order_goods` og
-                left join `dili_etrade`.`order` o on og.order_id = o.id
-                left join `dili_etrade`.`order_payment` op on o.id = op.order_id AND op.state = 2
+                `zr_etrade`.`order_goods` og
+                left join `zr_etrade`.`order` o on og.order_id = o.id
+                left join `zr_etrade`.`order_payment` op on o.id = op.order_id AND op.state = 2
         where
               o.market_id = #{marketId}
           and o.buyer_id = #{buyerId}
@@ -7,7 +7,7 @@
         , SUM(IFNULL(sobp.count_goods, 0)) AS totalCountOrders
         , SUM(IFNULL(sobp.orders, 0)) AS totalCountGoods
         FROM
-        `dili_etrade`.`statistics_order_buyer_product` sobp
+        `zr_etrade`.`statistics_order_buyer_product` sobp
         WHERE
         sobp.market_id = #{marketId}
         AND sobp.buyer_id = #{buyerId}
@@ -38,7 +38,7 @@
           , sobp.id            AS id
           , sobp.count_goods   AS countGoods
         FROM
-            `dili_etrade`.`statistics_order_buyer_product` sobp
+            `zr_etrade`.`statistics_order_buyer_product` sobp
         WHERE
             sobp.id = #{id}
     </select>
@@ -30,8 +30,8 @@
         , IFNULL(op.pay_amount, 0) AS payAmount
         , IFNULL(op.pay_channel, 0) AS payChannel
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.shop_id = #{shopId}
         AND o.market_id = #{marketId}
@@ -63,7 +63,7 @@
         , IFNULL(sos.total_count_goods, 0) AS goods
         , IFNULL(sos.total_order_amount, 0) AS amount
         FROM
-        `dili_etrade`.`statistics_order_seller` sos
+        `zr_etrade`.`statistics_order_seller` sos
         WHERE 1=1
         AND sos.market_id = #{marketId}
         AND sos.shop_id = #{shopId}
@@ -91,8 +91,8 @@
         , IFNULL(op.pay_amount, 0) AS payAmount
         , IFNULL(op.pay_channel, 0) AS payChannel
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.shop_id = #{shopId}
         AND o.market_id = #{marketId}
@@ -118,7 +118,7 @@
                     sos.pay_channel                        AS payChannel
                   , SUM(IFNULL(sos.total_order_amount, 0)) AS payChannelOrders
                 FROM
-                    `dili_etrade`.`statistics_order_seller` sos
+                    `zr_etrade`.`statistics_order_seller` sos
                 WHERE 1=1
                   AND sos.market_id = #{marketId}
                   AND sos.shop_id = #{shopId}
@@ -132,8 +132,8 @@
                     op.pay_channel                AS payChannel
                   , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
                 FROM
-                    `dili_etrade`.`order` o
-                        LEFT JOIN `dili_etrade`.`order_payment` op  ON o.id = op.order_id AND op.state = 2
+                    `zr_etrade`.`order` o
+                        LEFT JOIN `zr_etrade`.`order_payment` op  ON o.id = op.order_id AND op.state = 2
                 WHERE 1=1
                   AND o.shop_id = #{shopId}
                   AND o.market_id = #{marketId}
@@ -149,8 +149,8 @@
                 op.pay_channel                AS payChannel
                 , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
                 FROM
-                 `dili_etrade`.`order` o
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                 `zr_etrade`.`order` o
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                 WHERE 1=1
                 AND o.shop_id = #{shopId}
                 AND o.market_id = #{marketId}
@@ -177,7 +177,7 @@
                     sos.shop_id   AS shopId
                   , sos.shop_name AS shopName
                 FROM
-                `dili_etrade`.`statistics_order_seller` sos
+                `zr_etrade`.`statistics_order_seller` sos
                 WHERE 1=1
                   AND sos.market_id = #{marketId}
                   AND sos.shop_custom_id = #{shopCustomId}
@@ -191,7 +191,7 @@
                     o.shop_id   AS shopId
                   , o.shop_name AS shopName
                 FROM
-                `dili_etrade`.`order` o LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                `zr_etrade`.`order` o LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                 WHERE 1=1
                   AND o.shop_customer_id = #{shopCustomId}
                   AND o.market_id = #{marketId}
@@ -29,8 +29,8 @@
         , op.pay_amount AS payAmount
         , op.pay_channel AS payChannel
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.shop_id = #{shopId}
         AND o.market_id = #{marketId}
@@ -60,8 +60,8 @@
         , op.pay_amount AS payAmount
         , op.pay_channel AS payChannel
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.shop_id = #{shopId}
         AND o.market_id = #{marketId}
@@ -85,8 +85,8 @@
           op.pay_channel                AS payChannel
         , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
         FROM
-        `dili_etrade`.`order_payment` op
-        LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
+        `zr_etrade`.`order_payment` op
+        LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
         WHERE 1=1
         AND op.state = 2
         AND o.shop_id = #{shopId}
@@ -104,8 +104,8 @@
           op.pay_channel                AS payChannel
         , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
         FROM
-        `dili_etrade`.`order_payment` op
-        LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
+        `zr_etrade`.`order_payment` op
+        LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
         WHERE 1=1
         AND op.state = 2
         AND o.shop_id = #{shopId}
@@ -173,8 +173,8 @@
           , o.order_status            AS orderStatus
           , o.relation_id             AS relationId
         FROM
-        `dili_etrade`.`order` o
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
           AND o.state = 3
           AND o.order_status IS NULL
@@ -235,9 +235,9 @@
         , o.order_status            AS orderStatus
         , o.relation_id             AS relationId
         FROM
-        `dili_etrade`.`order` reto
-        LEFT JOIN `dili_etrade`.`order` o ON reto.relation_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` reto
+        LEFT JOIN `zr_etrade`.`order` o ON reto.relation_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND reto.state = 3
         AND reto.order_status = 2
@@ -254,7 +254,7 @@
             o.shop_id   AS shopId
           , o.shop_name AS shopName
         FROM
-        `dili_etrade`.`order` o LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
           AND o.shop_customer_id = #{shopCustomId}
           AND o.market_id = #{marketId}
@@ -282,7 +282,7 @@
           , og.product_piece_weight AS productPieceWeight
           , og.product_price        AS productPrice
         FROM
-            `dili_etrade`.`order_goods` og
+            `zr_etrade`.`order_goods` og
         WHERE 1=1
           AND og.state = 1
           AND og.order_id = #{orderId}
@@ -17,7 +17,7 @@
           , created_time        AS createdTime
           , modified_time       AS modifiedTime
         FROM
-            `dili_etrade`.`statistics_order_seller`
+            `zr_etrade`.`statistics_order_seller`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </select>
@@ -51,7 +51,7 @@
         , IFNULL(sos.total_count_goods, 0)   AS goods
         , IFNULL(sos.total_order_amount, 0)  AS amount
         FROM
-        `dili_etrade`.`statistics_order_seller` sos
+        `zr_etrade`.`statistics_order_seller` sos
         WHERE
         sos.market_id = #{marketId}
         AND sos.shop_id = #{shopId}
@@ -79,8 +79,8 @@
         , op.pay_amount      AS payAmount
         , op.pay_channel     AS payChannel
         FROM
-        `dili_etrade`.`order` o
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order` o
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.shop_id = #{shopId}
         AND o.market_id = #{marketId}
@@ -104,7 +104,7 @@
         sos.pay_channel AS payChannel
         , SUM(IFNULL(sos.total_order_amount, 0)) AS payChannelOrders
         FROM
-        `dili_etrade`.`statistics_order_seller` sos
+        `zr_etrade`.`statistics_order_seller` sos
         WHERE 1=1
         AND sos.market_id = #{marketId}
         AND sos.shop_id = #{shopId}
@@ -119,8 +119,8 @@
           op.pay_channel                AS payChannel
         , SUM(IFNULL(op.pay_amount, 0)) AS payChannelOrders
         FROM
-        `dili_etrade`.`order_payment` op
-        LEFT JOIN `dili_etrade`.`order` o ON o.id = op.order_id
+        `zr_etrade`.`order_payment` op
+        LEFT JOIN `zr_etrade`.`order` o ON o.id = op.order_id
         WHERE 1=1
         AND op.state = 2
         AND o.shop_id = #{shopId}
@@ -142,7 +142,7 @@
             sos.shop_id   AS shopId
           , sos.shop_name AS shopName
         FROM
-            `dili_etrade`.`statistics_order_seller` sos
+            `zr_etrade`.`statistics_order_seller` sos
         WHERE 1=1
           AND sos.market_id = #{marketId}
           AND sos.shop_custom_id = #{shopCustomId}
@@ -167,8 +167,8 @@
                   , SUM(sos.total_count_goods)  AS totalGoods
                   , SUM(sos.total_order_amount) AS totalAmount
                 FROM
-                    `dili_etrade`.`statistics_order_seller` sos
-                        LEFT JOIN `dili_etrade`.`shop` s ON sos.shop_id = s.id
+                    `zr_etrade`.`statistics_order_seller` sos
+                        LEFT JOIN `zr_etrade`.`shop` s ON sos.shop_id = s.id
                 WHERE 1=1
                   AND sos.market_id = #{marketId}
                   AND s.state = 1
@@ -180,8 +180,8 @@
                   , o.market_id               AS marketId
                   , SUM(o.totle_weight)       AS totalGoods
                   , SUM(o.totle_amount)       AS totalAmount
-                FROM `dili_etrade`.`order` o
-                        LEFT JOIN `dili_etrade`.`shop` s ON o.shop_id = s.id
+                FROM `zr_etrade`.`order` o
+                        LEFT JOIN `zr_etrade`.`shop` s ON o.shop_id = s.id
                 WHERE 1=1
                   AND o.market_id = #{marketId}
                   AND o.state = 3
@@ -212,7 +212,7 @@
                             smp.shop_id
                           , smp.top_category_id
                         FROM
-                            `dili_etrade`.`shop_main_product` smp
+                            `zr_etrade`.`shop_main_product` smp
                         WHERE
                               1 = 1
                           AND smp.top_category_id = #{topCategoryId}
@@ -225,8 +225,8 @@
                                         , SUM(sos.total_count_goods)  AS totalGoods
                                         , SUM(sos.total_order_amount) AS totalAmount
                                       FROM
-                                          `dili_etrade`.`statistics_order_seller` sos
-                                              LEFT JOIN `dili_etrade`.`shop` s ON sos.shop_id = s.id
+                                          `zr_etrade`.`statistics_order_seller` sos
+                                              LEFT JOIN `zr_etrade`.`shop` s ON sos.shop_id = s.id
                                       WHERE
                                             1 = 1
                                         AND sos.market_id = #{marketId}
@@ -240,8 +240,8 @@
                                         , SUM(o.totle_weight) AS totalGoods
                                         , SUM(o.totle_amount) AS totalAmount
                                       FROM
-                                          `dili_etrade`.`order` o
-                                              LEFT JOIN `dili_etrade`.`shop` s ON o.shop_id = s.id
+                                          `zr_etrade`.`order` o
+                                              LEFT JOIN `zr_etrade`.`shop` s ON o.shop_id = s.id
                                       WHERE
                                             1 = 1
                                         AND o.market_id = #{marketId}
@@ -16,9 +16,9 @@
                   , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
                   , SUM(IFNULL(og.product_weight, 0))      AS countGoods
                 FROM
-                    `dili_etrade`.`order_goods` og
-                        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-                        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                    `zr_etrade`.`order_goods` og
+                        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+                        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                 WHERE 1=1
                   AND o.market_id = #{marketId}
                   AND o.shop_id = #{shopId}
@@ -37,7 +37,7 @@
                   , SUM(IFNULL(sosp.order_amount, 0)) AS orderAmount
                   , SUM(IFNULL(sosp.count_goods, 0))  AS countGoods
                 FROM
-                `dili_etrade`.`statistics_order_seller_product` sosp
+                `zr_etrade`.`statistics_order_seller_product` sosp
                 WHERE 1=1
                   AND sosp.market_id = #{marketId}
                   AND sosp.shop_id = #{shopId}
@@ -53,9 +53,9 @@
                 , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
                 , SUM(IFNULL(og.product_weight, 0)) AS countGoods
                 FROM
-                `dili_etrade`.`order_goods` og
-                LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-                LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+                `zr_etrade`.`order_goods` og
+                LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+                LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
                 WHERE 1=1
                 AND o.market_id = #{marketId}
                 AND o.shop_id = #{shopId}
@@ -15,9 +15,9 @@
         , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
         , SUM(IFNULL(og.product_weight, 0)) AS countGoods
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.market_id = #{marketId}
         AND o.shop_id = #{shopId}
@@ -37,9 +37,9 @@
         , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
         , SUM(IFNULL(og.product_weight, 0)) AS countGoods
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.market_id = #{marketId}
         AND o.shop_id = #{shopId}
@@ -19,7 +19,7 @@
           , created_time   AS createdTime
           , modified_time  AS modifiedTime
         FROM
-            `dili_etrade`.`statistics_order_seller_product`
+            `zr_etrade`.`statistics_order_seller_product`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </select>
@@ -36,7 +36,7 @@
         , SUM(IFNULL(sop.count_goods, 0)) AS countGoods
         , SUM(IFNULL(sop.order_amount, 0)) AS orderAmount
         FROM
-        `dili_etrade`.`statistics_order_seller_product` sop
+        `zr_etrade`.`statistics_order_seller_product` sop
         WHERE 1=1
         AND sop.market_id = #{marketId}
         AND sop.shop_id = #{shopId}
@@ -53,9 +53,9 @@
         , SUM(IFNULL(og.product_weight, 0))      AS countGoods
         , SUM(IFNULL(og.product_total_price, 0)) AS orderAmount
         FROM
-        `dili_etrade`.`order_goods` og
-        LEFT JOIN `dili_etrade`.`order` o ON og.order_id = o.id
-        LEFT JOIN `dili_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
+        `zr_etrade`.`order_goods` og
+        LEFT JOIN `zr_etrade`.`order` o ON og.order_id = o.id
+        LEFT JOIN `zr_etrade`.`order_payment` op ON o.id = op.order_id AND op.state = 2
         WHERE 1=1
         AND o.market_id = #{marketId}
         AND o.shop_id = #{shopId}
@@ -18,7 +18,7 @@
           , created_time         AS createdTime
           , modified_time        AS modifiedTime
         FROM
-            `dili_etrade`.`statistics_product`
+            `zr_etrade`.`statistics_product`
         WHERE
             id = #{id,jdbcType=BIGINT}
     </select>
@@ -49,20 +49,20 @@
                   , IFNULL(sp.product_sales_amount, 0) AS productSalesAmount
                   , IFNULL(sp.product_low_price, 0)    AS productLowPrice
                   , IFNULL(sp.product_high_price, 0)   AS productHighPrice
-                  , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2))     AS productKiloPrice
+                  , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2))     AS productKiloPrice
                   , t.yesterDayproductKiloPrice        AS yesterDayproductKiloPrice
                 FROM
-                `dili_etrade`.`statistics_product` sp
+                `zr_etrade`.`statistics_product` sp
                         LEFT JOIN (
                                 SELECT
                                 spy.product_id AS productId,
-                                ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 5,2))     AS yesterDayproductKiloPrice
+                                ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 100,2))     AS yesterDayproductKiloPrice
                                 FROM (
                                 SELECT
                                 ret.product_id,
                                 MAX(ret.settle_date) AS settle_date
                                 FROM
-                                `dili_etrade`.`statistics_product` ret
+                                `zr_etrade`.`statistics_product` ret
                                 WHERE
                                 1 = 1
                                 AND ret.settle_date <![CDATA[ < #{settleDate}]]>
@@ -70,7 +70,7 @@
                                 AND ret.product_sales_amount >0
                                 AND ret.product_sales >0
                                 GROUP BY
-                                ret.product_id  ) rt LEFT JOIN `dili_etrade`.`statistics_product` spy
+                                ret.product_id  ) rt LEFT JOIN `zr_etrade`.`statistics_product` spy
                                 ON rt.settle_date = spy.settle_date AND rt.product_id = spy.product_id
                                 GROUP BY  rt.product_id
                                                               ) t ON t.productId = sp.product_id
@@ -125,16 +125,16 @@
         , IFNULL(sp.product_sales_amount, 0) AS productSalesAmount
         , IFNULL(sp.product_low_price, 0)    AS productLowPrice
         , IFNULL(sp.product_high_price, 0)   AS productHighPrice
-        , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2))     AS productKiloPrice
+        , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2))     AS productKiloPrice
         , t.yesterDayproductKiloPrice        AS yesterDayproductKiloPrice
         FROM
-        `dili_etrade`.`statistics_product` sp
+        `zr_etrade`.`statistics_product` sp
         LEFT JOIN (
         SELECT
         spy.product_id AS productId
-        , ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 5,2))     AS yesterDayproductKiloPrice
+        , ABS(ROUND((IFNULL(spy.product_sales_amount, 0) / IFNULL(spy.product_sales, 0)) * 100,2))     AS yesterDayproductKiloPrice
         FROM
-        `dili_etrade`.`statistics_product` spy
+        `zr_etrade`.`statistics_product` spy
         WHERE
         spy.market_id = #{marketId}
         AND spy.settle_date = #{lastSettleDate}
@@ -167,7 +167,7 @@
           , IFNULL(sp.product_avg_price, 0)    AS productAvgPrice
           , IFNULL(sp.product_high_price, 0)   AS productHighPrice
         FROM
-            `dili_etrade`.`statistics_product` sp
+            `zr_etrade`.`statistics_product` sp
         WHERE
               sp.market_id = #{marketId}
           AND sp.settle_date = #{lastSettleDate}
@@ -185,7 +185,7 @@
           , IFNULL(sp.product_high_price, 0)   AS productHighPrice
           , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2))   AS productKiloPrice
         FROM
-            `dili_etrade`.`statistics_product` sp
+            `zr_etrade`.`statistics_product` sp
         WHERE
               sp.market_id = #{marketId}
           AND sp.settle_date = #{settleDate}
@@ -202,9 +202,9 @@
           , IFNULL(sp.product_high_price, 0)   AS productHighPrice
           , IFNULL(sp.product_avg_price, 0)    AS productAvgPrice
           , sp.settle_date                     AS settleDate
-          , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 5,2))   AS productKiloPrice
+          , ABS(ROUND((IFNULL(sp.product_sales_amount, 0) / IFNULL(sp.product_sales, 0)) * 100,2))   AS productKiloPrice
         FROM
-            `dili_etrade`.`statistics_product` sp
+            `zr_etrade`.`statistics_product` sp
         WHERE
               sp.market_id = #{marketId}
           AND sp.settle_date BETWEEN #{startSettleDate} AND #{endSettleDate}
-package com.diligrp.etrade.core.jackson.deserializer;
-
-import com.diligrp.etrade.core.exception.PlatformServiceException;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-
-/**
- * 元转分
- */
-public class MoneyY2FDeserializer extends JsonDeserializer<Long> {
-
-    private final Logger LOG = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
-        String value = p.getText();
-        if(StringUtils.isBlank(value)){
-            return null;
-        }
-        if(!NumberUtils.isParsable(value)){
-            LOG.warn("非数字参数:{}",value);
-            throw new PlatformServiceException("非数字参数");
-        }
-        BigDecimal ans = new BigDecimal(value).multiply(new BigDecimal(100),new MathContext(0,RoundingMode.HALF_UP));
-        return ans.longValue();
-    }
-}
-package com.diligrp.etrade.core.jackson.deserializer;
-
-import com.diligrp.etrade.core.exception.PlatformServiceException;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-
-/**
- * 斤转克
- */
-public class WeightJ2KDeserializer extends JsonDeserializer<Long> {
-
-    private final Logger LOG = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public Long deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JacksonException {
-        String value = p.getText();
-        if(StringUtils.isBlank(value)){
-            return null;
-        }
-        if(!NumberUtils.isParsable(value)){
-            LOG.warn("非数字参数:{}",value);
-            throw new PlatformServiceException("非数字参数");
-        }
-        BigDecimal ans = new BigDecimal(value).multiply(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP));
-        return ans.longValue();
-    }
-}
-package com.diligrp.etrade.core.jackson.serializer;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 克/分 - 斤/元
- */
-public class Cent2KiloJsonSerializer extends JsonSerializer<Long> {
-
-    @Override
-    public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if(null == value){
-            return;
-        }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(200),new MathContext(20,RoundingMode.HALF_UP));
-
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(ans.doubleValue()));
-    }
-}
-package com.diligrp.etrade.core.jackson.serializer;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 克/分 - 公斤/元
- */
-public class CentKiloJsonSerializer extends JsonSerializer<Long> {
-
-    @Override
-    public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if(null == value){
-            return;
-        }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
-        var res = ans.setScale(2,RoundingMode.HALF_UP);
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(res.doubleValue()));
-    }
-}
-package com.diligrp.etrade.core.jackson.serializer;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 分/克 - 元/公斤
- */
-public class CentToKiloJsonSerializer extends JsonSerializer<Long> {
-
-    @Override
-    public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if(null == value){
-            return;
-        }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
-        var res = ans.setScale(2,RoundingMode.HALF_UP);
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(res.doubleValue()));
-    }
-}
@@ -10,7 +10,7 @@ import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-public class KiloBigDecimalSerializer extends JsonSerializer<BigDecimal> {
+public class J2KiloBigDecimalSerializer extends JsonSerializer<BigDecimal> {
     @Override
     public void serialize(BigDecimal value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
@@ -11,7 +11,7 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 /**
- * 件数缩小10倍
+ * 件数缩小100倍
  */
 public class PieceSerializer extends JsonSerializer<Long> {
@@ -20,7 +20,7 @@ public class PieceSerializer extends JsonSerializer&lt;Long&gt; {
         if(null == value){
             return;
         }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(10),new MathContext(20,RoundingMode.HALF_UP));
+        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(100),new MathContext(20,RoundingMode.HALF_UP));
         DecimalFormat df = new DecimalFormat("#0.##");
         gen.writeString(df.format(ans.doubleValue()));
-package com.diligrp.etrade.core.jackson.serializer;
-
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 元/斤->元/公斤
- */
-public class PoundsToKiloStringSerializer extends JsonSerializer<String> {
-    @Override
-    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if (null ==value){
-            return;
-        }
-        var kilo  = new BigDecimal(value).multiply(new BigDecimal(2),new MathContext(20, RoundingMode.HALF_UP));
-        var res = kilo.setScale(2,RoundingMode.HALF_UP);
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(res.doubleValue()));
-    }
-}
-package com.diligrp.etrade.core.jackson.serializer;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 克转斤
- */
-public class WeightK2JJsonSerializer extends JsonSerializer<Long> {
-
-    @Override
-    public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if(null == value){
-            return;
-        }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(500),new MathContext(20,RoundingMode.HALF_UP));
-        var res = ans.setScale(2,RoundingMode.HALF_UP);
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(res.doubleValue()));
-    }
-}
-package com.diligrp.etrade.core.jackson.serializer;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * 克转公斤
- */
-public class WeightKiloJsonSerializer extends JsonSerializer<Long> {
-
-    @Override
-    public void serialize(Long value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        if(null == value){
-            return;
-        }
-        BigDecimal ans = new BigDecimal(value).divide(new BigDecimal(1000),new MathContext(20,RoundingMode.HALF_UP));
-        var res = ans.setScale(2,RoundingMode.HALF_UP);
-        DecimalFormat df = new DecimalFormat("#0.00");
-        gen.writeString(df.format(res.doubleValue()));
-    }
-}
-package com.diligrp.etrade.rpc.co;
-
-import com.fasterxml.jackson.annotation.JsonAlias;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Set;
-
-public class EntranceDivideStatStat implements Serializable {
-    /**
-     * 开始时间
-     */
-    @JsonAlias("startSettleDateTime")
-    private LocalDateTime startTime;
-    /**
-     * 结束时间
-     */
-    @JsonAlias("endSettleDateTime")
-    private LocalDateTime endTime;
-    /**
-     * 市场 ID
-     */
-    private Long marketId;
-    /**
-     * 分组
-     * /statKeyCustomer
-     * /statKeyShipper
-     * /statKeyRegion
-     * /statKeyDep
-     * /statKeyCategory
-     * /statKeyCategoryTwo
-     * /statKeyCategoryThree
-     * /statKeyProduct
-     */
-    private Set<String> statKeys;
-    /**
-     * 排序
-     */
-    @JsonAlias("sort")
-    private String sort;
-    /**
-     * 次序
-     */
-    @JsonAlias("sortOrder")
-    private String order;
-    /**
-     * 页
-     */
-    @JsonAlias("pageNo")
-    private Integer page;
-    /**
-     * 行
-     */
-    @JsonAlias("pageSize")
-    private Integer rows;
-    /**
-     * 客户 ID
-     */
-    private String customerId;
-    /**
-     * 货主 ID
-     */
-    private String shipperId;
-    /**
-     * 货区 ID
-     */
-    private String regionId;
-    /**
-     * 部门 ID
-     */
-    private String depId;
-    /**
-     *  一级品类 ID
-     */
-    private String categoryId;
-    /**
-     * 二级品类 ID
-     */
-    private String categoryTwoId;
-    /**
-     * 三级品类 ID
-     */
-    private String categoryThreeId;
-    /**
-     * 商品 ID
-     */
-    private String productId;
-
-    /**
-     * 付款时间开始
-     */
-    private LocalDateTime paymentTimeStart;
-
-    /**
-     * 付款时间结束
-     */
-    private LocalDateTime paymentTimeEnd;
-
-    public LocalDateTime getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(LocalDateTime startTime) {
-        this.startTime = startTime;
-    }
-
-    public LocalDateTime getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(LocalDateTime endTime) {
-        this.endTime = endTime;
-    }
-
-    public Long getMarketId() {
-        return marketId;
-    }
-
-    public void setMarketId(Long marketId) {
-        this.marketId = marketId;
-    }
-
-    public Set<String> getStatKeys() {
-        return statKeys;
-    }
-
-    public void setStatKeys(Set<String> statKeys) {
-        this.statKeys = statKeys;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public String getOrder() {
-        return order;
-    }
-
-    public void setOrder(String order) {
-        this.order = order;
-    }
-
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public Integer getRows() {
-        return rows;
-    }
-
-    public void setRows(Integer rows) {
-        this.rows = rows;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getShipperId() {
-        return shipperId;
-    }
-
-    public void setShipperId(String shipperId) {
-        this.shipperId = shipperId;
-    }
-
-    public String getRegionId() {
-        return regionId;
-    }
-
-    public void setRegionId(String regionId) {
-        this.regionId = regionId;
-    }
-
-    public String getDepId() {
-        return depId;
-    }
-
-    public void setDepId(String depId) {
-        this.depId = depId;
-    }
-
-    public String getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getCategoryTwoId() {
-        return categoryTwoId;
-    }
-
-    public void setCategoryTwoId(String categoryTwoId) {
-        this.categoryTwoId = categoryTwoId;
-    }
-
-    public String getCategoryThreeId() {
-        return categoryThreeId;
-    }
-
-    public void setCategoryThreeId(String categoryThreeId) {
-        this.categoryThreeId = categoryThreeId;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public LocalDateTime getPaymentTimeStart() {
-        return paymentTimeStart;
-    }
-
-    public void setPaymentTimeStart(LocalDateTime paymentTimeStart) {
-        this.paymentTimeStart = paymentTimeStart;
-    }
-
-    public LocalDateTime getPaymentTimeEnd() {
-        return paymentTimeEnd;
-    }
-
-    public void setPaymentTimeEnd(LocalDateTime paymentTimeEnd) {
-        this.paymentTimeEnd = paymentTimeEnd;
-    }
-}
-package com.diligrp.etrade.rpc.co;
-
-import java.time.LocalDateTime;
-import java.util.Set;
-
-public class SteveTeamOrderStat {
-    private Long marketId;
-    private Long goodsId;
-    private Long customerId;
-    private LocalDateTime startTime;
-    private LocalDateTime endTime;
-
-    private Set<String> statKeys;
-
-    public Long getMarketId() {
-        return marketId;
-    }
-
-    public void setMarketId(Long marketId) {
-        this.marketId = marketId;
-    }
-
-    public Long getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Long goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public Long getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Long customerId) {
-        this.customerId = customerId;
-    }
-
-    public LocalDateTime getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(LocalDateTime startTime) {
-        this.startTime = startTime;
-    }
-
-    public LocalDateTime getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(LocalDateTime endTime) {
-        this.endTime = endTime;
-    }
-
-    public Set<String> getStatKeys() {
-        return statKeys;
-    }
-
-    public void setStatKeys(Set<String> statKeys) {
-        this.statKeys = statKeys;
-    }
-}
-package com.diligrp.etrade.rpc.dto;
-
-import com.diligrp.etrade.core.jackson.serializer.PoundsToKiloSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-public class EntranceDivideStatStatDTO implements Serializable {
-    /**
-     * 客户 ID
-     */
-    private String customerId;
-    /**
-     * 客户名称
-     */
-    private String customerName;
-    /**
-     * 货主id
-     */
-    private String shipperId;
-    /**
-     * 货主名称
-     */
-    private String shipperName;
-    /**
-     * 托运人代码
-     */
-    private String shipperCode;
-    /**
-     * 区域 ID ID
-     */
-    private String regionId;
-    /**
-     * 区域名称
-     */
-    private String regionName;
-    /**
-     * 部门 ID
-     */
-    private String depId;
-    /**
-     * 部门 名称
-     */
-    private String depName;
-    /**
-     * 类别 ID
-     */
-    private String categoryId;
-    /**
-     * 类别名称
-     */
-    private String categoryName;
-    /**
-     * 品类第二级 ID
-     */
-    private String categoryTwoId;
-    /**
-     * 品类第二级名称
-     */
-    private String categoryTwoName;
-    /**
-     * 品类第三级 ID
-     */
-    private String categoryThreeId;
-    /**
-     * 品类第三级名称
-     */
-    private String categoryThreeName;
-    /**
-     * 产品 ID
-     */
-    private String productId;
-    /**
-     * 产品名称
-     */
-    private String productName;
-    /**
-     * 进门单数
-     */
-    private String countEntrance;
-    /**
-     * 分货单数
-     */
-    private String countPick;
-    /**
-     * 报告计数
-     */
-    private String countReported;
-    /**
-     * 进门净重
-     */
-    @JsonSerialize(using = PoundsToKiloSerializer.class)
-    private BigDecimal sumWeightEntrance;
-    /**
-     * 分货重量
-     */
-    @JsonSerialize(using = PoundsToKiloSerializer.class)
-    private BigDecimal sumWeightPick;
-    /**
-     * 绑定预报备单数比
-     */
-    private String ratioCountReported;
-    /**
-     * 分货与进门单数比
-     */
-    private String ratioCountPick;
-    /**
-     * 分货与进门净重比
-     */
-    private String ratioWeightPick;
-    /**
-     * 客户代码
-     */
-    private String customerCode;
-    /**
-     * 产品别名
-     */
-    private String productAlias;
-
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
-    }
-
-    public String getShipperId() {
-        return shipperId;
-    }
-
-    public void setShipperId(String shipperId) {
-        this.shipperId = shipperId;
-    }
-
-    public String getShipperName() {
-        return shipperName;
-    }
-
-    public void setShipperName(String shipperName) {
-        this.shipperName = shipperName;
-    }
-
-    public String getShipperCode() {
-        return shipperCode;
-    }
-
-    public void setShipperCode(String shipperCode) {
-        this.shipperCode = shipperCode;
-    }
-
-    public String getRegionId() {
-        return regionId;
-    }
-
-    public void setRegionId(String regionId) {
-        this.regionId = regionId;
-    }
-
-    public String getRegionName() {
-        return regionName;
-    }
-
-    public void setRegionName(String regionName) {
-        this.regionName = regionName;
-    }
-
-    public String getDepId() {
-        return depId;
-    }
-
-    public void setDepId(String depId) {
-        this.depId = depId;
-    }
-
-    public String getDepName() {
-        return depName;
-    }
-
-    public void setDepName(String depName) {
-        this.depName = depName;
-    }
-
-    public String getCategoryId() {
-        return categoryId;
-    }
-
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-
-    public String getCategoryName() {
-        return categoryName;
-    }
-
-    public void setCategoryName(String categoryName) {
-        this.categoryName = categoryName;
-    }
-
-    public String getCategoryTwoId() {
-        return categoryTwoId;
-    }
-
-    public void setCategoryTwoId(String categoryTwoId) {
-        this.categoryTwoId = categoryTwoId;
-    }
-
-    public String getCategoryTwoName() {
-        return categoryTwoName;
-    }
-
-    public void setCategoryTwoName(String categoryTwoName) {
-        this.categoryTwoName = categoryTwoName;
-    }
-
-    public String getCategoryThreeId() {
-        return categoryThreeId;
-    }
-
-    public void setCategoryThreeId(String categoryThreeId) {
-        this.categoryThreeId = categoryThreeId;
-    }
-
-    public String getCategoryThreeName() {
-        return categoryThreeName;
-    }
-
-    public void setCategoryThreeName(String categoryThreeName) {
-        this.categoryThreeName = categoryThreeName;
-    }
-
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
-    public String getCountEntrance() {
-        return countEntrance;
-    }
-
-    public void setCountEntrance(String countEntrance) {
-        this.countEntrance = countEntrance;
-    }
-
-    public String getCountPick() {
-        return countPick;
-    }
-
-    public void setCountPick(String countPick) {
-        this.countPick = countPick;
-    }
-
-    public String getCountReported() {
-        return countReported;
-    }
-
-    public void setCountReported(String countReported) {
-        this.countReported = countReported;
-    }
-
-    public BigDecimal getSumWeightEntrance() {
-        return sumWeightEntrance;
-    }
-
-    public void setSumWeightEntrance(BigDecimal sumWeightEntrance) {
-        this.sumWeightEntrance = sumWeightEntrance;
-    }
-
-    public BigDecimal getSumWeightPick() {
-        return sumWeightPick;
-    }
-
-    public void setSumWeightPick(BigDecimal sumWeightPick) {
-        this.sumWeightPick = sumWeightPick;
-    }
-
-    public String getRatioCountReported() {
-        return ratioCountReported;
-    }
-
-    public void setRatioCountReported(String ratioCountReported) {
-        this.ratioCountReported = ratioCountReported;
-    }
-
-    public String getRatioCountPick() {
-        return ratioCountPick;
-    }
-
-    public void setRatioCountPick(String ratioCountPick) {
-        this.ratioCountPick = ratioCountPick;
-    }
-
-    public String getRatioWeightPick() {
-        return ratioWeightPick;
-    }
-
-    public void setRatioWeightPick(String ratioWeightPick) {
-        this.ratioWeightPick = ratioWeightPick;
-    }
-
-    public String getCustomerCode() {
-        return customerCode;
-    }
-
-    public void setCustomerCode(String customerCode) {
-        this.customerCode = customerCode;
-    }
-
-    public String getProductAlias() {
-        return productAlias;
-    }
-
-    public void setProductAlias(String productAlias) {
-        this.productAlias = productAlias;
-    }
-}
-package com.diligrp.etrade.rpc.dto;
-
-import java.math.BigDecimal;
-
-public class SteveTeamOrderStatDto {
-    private Long customerId;
-    private Long goodsId;
-    private BigDecimal efWeight;
-    private BigDecimal poWeight;
-
-    public Long getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Long customerId) {
-        this.customerId = customerId;
-    }
-
-    public Long getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Long goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public BigDecimal getEfWeight() {
-        return efWeight;
-    }
-
-    public void setEfWeight(BigDecimal efWeight) {
-        this.efWeight = efWeight;
-    }
-
-    public BigDecimal getPoWeight() {
-        return poWeight;
-    }
-
-    public void setPoWeight(BigDecimal poWeight) {
-        this.poWeight = poWeight;
-    }
-}
 package com.diligrp.etrade.rpc.executor;
 import cn.hutool.json.JSONObject;
-import com.diligrp.etrade.core.authority.SessionContext;
 import com.diligrp.etrade.core.domain.Message;
-import com.diligrp.etrade.core.domain.PageMessage;
-import com.diligrp.etrade.core.util.AssertUtils;
-import com.diligrp.etrade.core.util.JsonUtils;
 import com.diligrp.etrade.rpc.co.CusCategoryQuery;
-import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
-import com.diligrp.etrade.rpc.co.SteveTeamOrderStat;
 import com.diligrp.etrade.rpc.dto.*;
 import com.diligrp.etrade.rpc.service.CategoryRpc;
 import com.diligrp.etrade.rpc.service.CustomerRpc;
-import com.diligrp.etrade.rpc.service.ReportRpc;
 import com.diligrp.etrade.rpc.service.UapRpc;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 @Component
 public class RpcExecutor {
@@ -33,9 +22,6 @@ public class RpcExecutor {
     @Resource
     private CategoryRpc categoryRpc;
     @Resource
-    private ReportRpc reportRpc;
-
-    @Resource
     private UapRpc uapRpc;
     public CustomerDto getByCustomerId(Long id) {
@@ -49,7 +35,6 @@ public class RpcExecutor {
         }
         return customerDto;
     }
-
     public CusCategoryDTO getCusCategory(Long marketId, Long categoryId) {
         CusCategoryQuery query = new CusCategoryQuery();
         query.setId(categoryId);
@@ -63,36 +48,6 @@ public class RpcExecutor {
         }
         return parent.getData();
     }
-
-    public SteveTeamOrderStatDto steveTeamOrderStat(Long marketId, Long categoryId, Long customerId, LocalDateTime start, LocalDateTime end, Set<String> statKeys) {
-        SteveTeamOrderStat stat = new SteveTeamOrderStat();
-        stat.setMarketId(marketId);
-        if (statKeys.contains("statKeyGoods")){
-            stat.setGoodsId(categoryId);
-        }
-        stat.setCustomerId(customerId);
-        stat.setStatKeys(statKeys);
-        stat.setStartTime(start);
-        stat.setEndTime(end);
-        System.out.println(JsonUtils.toJsonString(stat));
-        Message<List<SteveTeamOrderStatDto>> steveTeamOrderStatDtoMessage = reportRpc.steveTeamOrderStat(stat);
-        List<SteveTeamOrderStatDto> data = steveTeamOrderStatDtoMessage.getData();
-        if (CollectionUtils.isEmpty(data)){
-            SteveTeamOrderStatDto statDto = new SteveTeamOrderStatDto();
-            statDto.setCustomerId(customerId);
-            statDto.setGoodsId(categoryId);
-            statDto.setEfWeight(new BigDecimal("0.00"));
-            statDto.setPoWeight(new BigDecimal("0.00"));
-            return statDto;
-        }else{
-            return data.get(0);
-        }
-    }
-
-    public PageMessage<EntranceDivideStatStatDTO> divideGoods(EntranceDivideStatStat co) {
-        return reportRpc.entranceDivideStatStat(co);
-    }
-
     public List<Long> getUserDep(Long userId){
         Message<List<DepartmentDto>> response = uapRpc.listUserDepartmentDataAuth(userId);
         List<DepartmentDto> res = response.getData();
-package com.diligrp.etrade.rpc.service;
-
-import com.diligrp.etrade.core.domain.Message;
-import com.diligrp.etrade.core.domain.PageMessage;
-import com.diligrp.etrade.rpc.co.EntranceDivideStatStat;
-import com.diligrp.etrade.rpc.co.SteveTeamOrderStat;
-import com.diligrp.etrade.rpc.dto.EntranceDivideStatStatDTO;
-import com.diligrp.etrade.rpc.dto.SteveTeamOrderStatDto;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-@FeignClient(name = "report", contextId = "report", url = "${ReportRpc.url:}")
-public interface ReportRpc {
-
-    @PostMapping("api/pickOrderReport/customerDivideStatStat/loadData.action")
-    Message<List<SteveTeamOrderStatDto>> steveTeamOrderStat(@RequestBody SteveTeamOrderStat stat);
-
-
-    @PostMapping("/api/pickOrderReport/entranceDivideStatStat/loadData.action")
-    PageMessage<EntranceDivideStatStatDTO> entranceDivideStatStat(@RequestBody EntranceDivideStatStat stat);
-
-}