update:交易流水后端接口迁移

fengliang
1 parent 48c1b921
Showing 12 changed files with 851 additions and 5 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderQueryController.java
etrade-order/src/main/java/com/diligrp/etrade/order/configuration/Cent2KiloJsonSerializer.java
etrade-order/src/main/java/com/diligrp/etrade/order/dao/OrderQueryMapper.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowCO.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowPageMessage.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowSumVO.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/BusinessFlowVO.java
etrade-order/src/main/java/com/diligrp/etrade/order/domain/xreport/ClientPageQueryCO.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderQueryService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderQueryServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/util/NumberTransform.java
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryMapper.xml
@@ -4,11 +4,13 @@ import cn.hutool.core.util.StrUtil;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.order.domain.*;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowCO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowPageMessage;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowVO;
 import com.diligrp.etrade.order.exception.OrderErrorCode;
 import com.diligrp.etrade.order.exception.OrderException;
 import com.diligrp.etrade.order.service.OrderQueryService;
 import com.diligrp.etrade.order.type.OrderState;
-import com.diligrp.etrade.order.type.OrderVerifyState;
 import com.diligrp.etrade.order.util.ParameterDetection;
 import com.github.pagehelper.Page;
 import jakarta.annotation.Resource;
@@ -16,10 +18,8 @@ import jakarta.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -204,5 +204,14 @@ public class OrderQueryController {
         LOGGER.info("查询支付时间段，{}：{}",orderQueryDto.getPayStartTime(),orderQueryDto.getPayEndTime());
         LOGGER.info("查询创建时间段，{}：{}",orderQueryDto.getStartTime(),orderQueryDto.getEndTime());
     }
+    /**
+     * 交易流水
+     *
+     * @param co
+     */
+    @PostMapping("businessFlow")
+    public BusinessFlowPageMessage<BusinessFlowVO> businessFlow(@Validated @RequestBody BusinessFlowCO co) {
+        return orderQueryService.businessFlow(co);
+    }
 }
+package com.diligrp.etrade.order.configuration;
+
+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()));
+    }
+}
@@ -2,6 +2,9 @@ package com.diligrp.etrade.order.dao;
 import com.diligrp.etrade.core.mybatis.MybatisMapperSupport;
 import com.diligrp.etrade.order.domain.*;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowCO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowSumVO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowVO;
 import com.diligrp.etrade.order.model.Order;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
@@ -47,4 +50,18 @@ public interface OrderQueryMapper extends MybatisMapperSupport {
      * @return
      */
     Integer queryOrderVerifyNumber(OrderQueryDto orderQueryDto);
+
+    /**
+     * 查询流水
+     * @param co
+     * @return
+     */
+    List<BusinessFlowVO> queryBusinessFlow(BusinessFlowCO co);
+
+    /**
+     * 查询流水总计
+     * @param co
+     * @return
+     */
+    BusinessFlowSumVO querySumBusinessFlow(BusinessFlowCO co);
 }
+package com.diligrp.etrade.order.domain.xreport;
+
+import jakarta.validation.constraints.NotNull;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+public class BusinessFlowCO extends ClientPageQueryCO implements Serializable {
+    /**
+     *商品
+     */
+    private List<Long> products;
+
+    /**
+     *订单号
+     */
+    private String code;
+
+    /**
+     *买方id
+     */
+    private Long buyerId;
+
+    /**
+     *卖方id
+     */
+    private Long sellerId;
+
+    /**
+     *货款区间起始
+     */
+    private Long lowLevel;
+
+    /**
+     *货款区间结束
+     */
+    private Long highLevel;
+
+    /**
+     *来源
+     */
+    private Long source;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime endSettleDateTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime startSettleDateTime;
+
+    /**
+     *市场id
+     */
+    @NotNull
+    private Long marketId;
+
+    public List<Long> getProducts() {
+        return products;
+    }
+
+    public void setProducts(List<Long> products) {
+        this.products = products;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Long getBuyerId() {
+        return buyerId;
+    }
+
+    public void setBuyerId(Long buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    public Long getSellerId() {
+        return sellerId;
+    }
+
+    public void setSellerId(Long sellerId) {
+        this.sellerId = sellerId;
+    }
+
+    public Long getLowLevel() {
+        return lowLevel;
+    }
+
+    public void setLowLevel(Long lowLevel) {
+        this.lowLevel = lowLevel;
+    }
+
+    public Long getHighLevel() {
+        return highLevel;
+    }
+
+    public void setHighLevel(Long highLevel) {
+        this.highLevel = highLevel;
+    }
+
+    public Long getSource() {
+        return source;
+    }
+
+    public void setSource(Long source) {
+        this.source = source;
+    }
+
+    public LocalDateTime getEndSettleDateTime() {
+        return endSettleDateTime;
+    }
+
+    public void setEndSettleDateTime(LocalDateTime endSettleDateTime) {
+        this.endSettleDateTime = endSettleDateTime;
+    }
+
+    public LocalDateTime getStartSettleDateTime() {
+        return startSettleDateTime;
+    }
+
+    public void setStartSettleDateTime(LocalDateTime startSettleDateTime) {
+        this.startSettleDateTime = startSettleDateTime;
+    }
+
+    public Long getMarketId() {
+        return marketId;
+    }
+
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
+    }
+}
+package com.diligrp.etrade.order.domain.xreport;
+
+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.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+public class BusinessFlowPageMessage<T> extends PageMessage<T> {
+    /**
+     *订单商品总重量 单位斤
+     */
+    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    private Long totalProductWeight;
+
+    /**
+     *订单商品件数 单位件
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long totalProductPieces;
+
+    /**
+     * 产品总价
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long totalProductTotalPrice;
+
+    /**
+     * 产品卖家总费用
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long totalProductSellerFee;
+
+    public Long getTotalProductWeight() {
+        return totalProductWeight;
+    }
+
+    public void setTotalProductWeight(Long totalProductWeight) {
+        this.totalProductWeight = totalProductWeight;
+    }
+
+    public Long getTotalProductPieces() {
+        return totalProductPieces;
+    }
+
+    public void setTotalProductPieces(Long totalProductPieces) {
+        this.totalProductPieces = totalProductPieces;
+    }
+
+    public Long getTotalProductTotalPrice() {
+        return totalProductTotalPrice;
+    }
+
+    public void setTotalProductTotalPrice(Long totalProductTotalPrice) {
+        this.totalProductTotalPrice = totalProductTotalPrice;
+    }
+
+    public Long getTotalProductSellerFee() {
+        return totalProductSellerFee;
+    }
+
+    public void setTotalProductSellerFee(Long totalProductSellerFee) {
+        this.totalProductSellerFee = totalProductSellerFee;
+    }
+
+    public static <T> BusinessFlowPageMessage<T> success(PageInfo<?> pageInfo, List<T> data) {
+        BusinessFlowPageMessage<T> page = new BusinessFlowPageMessage<>();
+        page.setCode(CODE_SUCCESS);
+        page.setTotal(pageInfo.getTotal());
+        page.setData(data);
+        page.setMessage(MSG_SUCCESS);
+        return page;
+    }
+}
+package com.diligrp.etrade.order.domain.xreport;
+
+import java.io.Serializable;
+
+public class BusinessFlowSumVO implements Serializable {
+    /**
+     *订单商品总重量 单位斤
+     */
+    private Long totalProductWeight;
+
+    /**
+     *订单商品件数 单位件
+     */
+    private Long totalProductPieces;
+
+    /**
+     * 产品总价
+     */
+    private Long totalProductTotalPrice;
+    /**
+     * 产品卖家总费用
+     */
+    private Long totalProductSellerFee;
+
+    public Long getTotalProductWeight() {
+        return totalProductWeight;
+    }
+
+    public void setTotalProductWeight(Long totalProductWeight) {
+        this.totalProductWeight = totalProductWeight;
+    }
+
+    public Long getTotalProductPieces() {
+        return totalProductPieces;
+    }
+
+    public void setTotalProductPieces(Long totalProductPieces) {
+        this.totalProductPieces = totalProductPieces;
+    }
+
+    public Long getTotalProductTotalPrice() {
+        return totalProductTotalPrice;
+    }
+
+    public void setTotalProductTotalPrice(Long totalProductTotalPrice) {
+        this.totalProductTotalPrice = totalProductTotalPrice;
+    }
+
+    public Long getTotalProductSellerFee() {
+        return totalProductSellerFee;
+    }
+
+    public void setTotalProductSellerFee(Long totalProductSellerFee) {
+        this.totalProductSellerFee = totalProductSellerFee;
+    }
+}
+package com.diligrp.etrade.order.domain.xreport;
+
+import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
+import com.diligrp.etrade.core.jackson.serializer.WeightK2JJsonSerializer;
+import com.diligrp.etrade.order.configuration.Cent2KiloJsonSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+public class BusinessFlowVO implements Serializable {
+    /**
+     * 自增主键
+     */
+    private Long id;
+
+    /**
+     * 订单编码（全局唯一）
+     */
+    private String code;
+    /**
+     * 买家客户编码
+     */
+    private String buyerCode;
+    /**
+     * 买家编号
+     */
+    private Long buyerId;
+
+    /**
+     * 买方名称
+     */
+    private String buyerName;
+
+    /**
+     * 买方卡号
+     */
+    private String buyerCardNo;
+
+    /**
+     * 店铺收益卡号
+     */
+    private String shopCardNo;
+    /**
+     * 商店客户id
+     */
+    private Long shopCustomerId;
+
+    /** 商品名称 */
+    private String productName;
+
+    /**
+     *订单商品总重量 单位斤
+     */
+    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    private Long productWeight;
+
+    /**
+     *订单商品件数 单位件
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long productPieces;
+
+    /**
+     *订单商品件重单位 斤
+     */
+    @JsonSerialize(using = WeightK2JJsonSerializer.class)
+    private Long productPieceWeight;
+
+    /**
+     * 产品单件价格
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long productPiecePrice;
+
+    /**
+     *  订单商品交易类型（1、按重方式，2、按件方式）
+     *
+     */
+    private Integer productTradeType;
+
+    /**
+     * 商品重量单价 元/斤
+     *
+     */
+    @JsonSerialize(using =  Cent2KiloJsonSerializer.class)
+    private Long productPrice;
+
+    /**
+     * 支付完成时间
+     */
+    private LocalDateTime payTime;
+
+    /**
+     * 产品总价
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long productTotalPrice;
+
+    /**
+     * 产品销售商费用
+     */
+    @JsonSerialize(using = MoneyF2YJsonSerializer.class)
+    private Long productSellerFee;
+
+    /**
+     * 卖家代码
+     */
+    private String sellerCode;
+    /**
+     * 卖家卡号
+     */
+    private String sellerCardNo;
+
+    /**
+     * 卖方店员名称
+     */
+    private String sellerName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getBuyerCode() {
+        return buyerCode;
+    }
+
+    public void setBuyerCode(String buyerCode) {
+        this.buyerCode = buyerCode;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getBuyerCardNo() {
+        return buyerCardNo;
+    }
+
+    public void setBuyerCardNo(String buyerCardNo) {
+        this.buyerCardNo = buyerCardNo;
+    }
+
+    public String getSellerName() {
+        return sellerName;
+    }
+
+    public void setSellerName(String sellerName) {
+        this.sellerName = sellerName;
+    }
+
+    public String getShopCardNo() {
+        return shopCardNo;
+    }
+
+    public void setShopCardNo(String shopCardNo) {
+        this.shopCardNo = shopCardNo;
+    }
+
+    public Long getShopCustomerId() {
+        return shopCustomerId;
+    }
+
+    public void setShopCustomerId(Long shopCustomerId) {
+        this.shopCustomerId = shopCustomerId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Long getProductWeight() {
+        return productWeight;
+    }
+
+    public void setProductWeight(Long productWeight) {
+        this.productWeight = productWeight;
+    }
+
+    public Long getProductPieces() {
+        return productPieces;
+    }
+
+    public void setProductPieces(Long productPieces) {
+        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;
+    }
+
+    public void setProductTradeType(Integer productTradeType) {
+        this.productTradeType = productTradeType;
+    }
+
+    public Long getProductPrice() {
+        return productPrice;
+    }
+
+    public void setProductPrice(Long productPrice) {
+        this.productPrice = productPrice;
+    }
+
+    public LocalDateTime getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(LocalDateTime payTime) {
+        this.payTime = payTime;
+    }
+
+    public Long getProductTotalPrice() {
+        return productTotalPrice;
+    }
+
+    public void setProductTotalPrice(Long productTotalPrice) {
+        this.productTotalPrice = productTotalPrice;
+    }
+
+    public String getSellerCode() {
+        return sellerCode;
+    }
+
+    public void setSellerCode(String sellerCode) {
+        this.sellerCode = sellerCode;
+    }
+
+    public String getSellerCardNo() {
+        return sellerCardNo;
+    }
+
+    public void setSellerCardNo(String sellerCardNo) {
+        this.sellerCardNo = sellerCardNo;
+    }
+
+    public Long getBuyerId() {
+        return buyerId;
+    }
+
+    public void setBuyerId(Long buyerId) {
+        this.buyerId = buyerId;
+    }
+
+    public Long getProductSellerFee() {
+        return productSellerFee;
+    }
+
+    public void setProductSellerFee(Long productSellerFee) {
+        this.productSellerFee = productSellerFee;
+    }
+}
+package com.diligrp.etrade.order.domain.xreport;
+
+import com.diligrp.etrade.core.domain.BasePageQuery;
+
+import java.io.Serializable;
+
+public abstract class ClientPageQueryCO extends BasePageQuery implements Serializable {
+
+    /**
+     * 排序
+     */
+    private String sort;
+    /**
+     * 排序顺序
+     */
+    private String sortOrder;
+
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public String getSortOrder() {
+        return sortOrder;
+    }
+
+    public void setSortOrder(String sortOrder) {
+        this.sortOrder = sortOrder;
+    }
+}
 package com.diligrp.etrade.order.service;
 import com.diligrp.etrade.order.domain.*;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowCO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowPageMessage;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowVO;
 import com.github.pagehelper.Page;
 import java.util.List;
@@ -57,4 +60,11 @@ public interface OrderQueryService {
      * @return
      */
     Integer queryOrderVerifyNumber(OrderQueryDto orderQueryDto);
+
+    /**
+     * 订单流水查询
+     * @param co
+     * @return
+     */
+    BusinessFlowPageMessage<BusinessFlowVO> businessFlow(BusinessFlowCO co);
 }
@@ -3,12 +3,18 @@ package com.diligrp.etrade.order.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.diligrp.etrade.order.dao.OrderQueryMapper;
 import com.diligrp.etrade.order.domain.*;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowCO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowPageMessage;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowSumVO;
+import com.diligrp.etrade.order.domain.xreport.BusinessFlowVO;
 import com.diligrp.etrade.order.exception.OrderErrorCode;
 import com.diligrp.etrade.order.exception.OrderException;
 import com.diligrp.etrade.order.service.*;
 import com.diligrp.etrade.order.type.*;
+import com.diligrp.etrade.order.util.NumberTransform;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
@@ -114,4 +120,37 @@ public class OrderQueryServiceImpl implements OrderQueryService {
         }
         return orderQueryMapper.queryOrderVerifyNumber(orderQueryDto);
     }
+
+    @Override
+    public BusinessFlowPageMessage<BusinessFlowVO> businessFlow(BusinessFlowCO co) {
+        PageHelper.startPage(co.getPageNo(), co.getPageSize());
+        List<BusinessFlowVO> list = orderQueryMapper.queryBusinessFlow(co);
+        BusinessFlowSumVO sumFlowVO = orderQueryMapper.querySumBusinessFlow(co);
+//        list.forEach(e->{
+//            CustomerDto customerDto = rpcExecutor.getByCustomerId(e.getShopCustomerId());
+//            e.setSellerName(customerDto.getName());
+//            e.setSellerCode(customerDto.getCode());
+//            e.setSellerCardNo(e.getShopCardNo());
+//            if (!org.springframework.util.ObjectUtils.isEmpty(e.getBuyerId())){
+//                CustomerDto buyer = rpcExecutor.getByCustomerId(e.getBuyerId());
+//                e.setBuyerName(buyer.getName());
+//                e.setBuyerCode(buyer.getCode());
+//            }
+//        });
+        PageInfo<BusinessFlowVO> pageInfo = new PageInfo<>(list);
+        BusinessFlowPageMessage<BusinessFlowVO> success = BusinessFlowPageMessage.success(pageInfo, list);
+        if (!org.springframework.util.ObjectUtils.isEmpty(sumFlowVO)) {
+            success.setTotalProductPieces(org.springframework.util.ObjectUtils.isEmpty(sumFlowVO.getTotalProductPieces()) ? NumberTransform.NUMBER_ZERO_LONG : sumFlowVO.getTotalProductPieces());
+            success.setTotalProductWeight(org.springframework.util.ObjectUtils.isEmpty(sumFlowVO.getTotalProductWeight()) ? NumberTransform.NUMBER_ZERO_LONG : sumFlowVO.getTotalProductWeight());
+            success.setTotalProductTotalPrice(org.springframework.util.ObjectUtils.isEmpty(sumFlowVO.getTotalProductTotalPrice()) ? NumberTransform.NUMBER_ZERO_LONG : sumFlowVO.getTotalProductTotalPrice());
+            success.setTotalProductSellerFee(org.springframework.util.ObjectUtils.isEmpty(sumFlowVO.getTotalProductSellerFee()) ? NumberTransform.NUMBER_ZERO_LONG : sumFlowVO.getTotalProductSellerFee());
+        } else {
+            success.setTotalProductPieces(NumberTransform.NUMBER_ZERO_LONG);
+            success.setTotalProductWeight(NumberTransform.NUMBER_ZERO_LONG);
+            success.setTotalProductTotalPrice(NumberTransform.NUMBER_ZERO_LONG);
+            success.setTotalProductSellerFee(NumberTransform.NUMBER_ZERO_LONG);
+        }
+
+        return success;
+    }
 }
@@ -27,4 +27,12 @@ public class NumberTransform {
     /** 版本号步长 */
     public static Integer DEFAULT_VERSION_STEP = 1;
+
+    public static final int NUMBER_ZERO = 0;
+    public static final long NUMBER_ZERO_LONG = 0;
+    public static final int NUMBER_ONE = 1;
+    public static final int NUMBER_TWO = 2;
+
+    public static final int NUMBER_ONE_HUNDRED = 100;
+    public static final int NUMBER_ONE_THOUSAND = 1000;
 }
@@ -340,4 +340,146 @@
             </if>
         </where>
     </select>
+    <select id="queryBusinessFlow" resultType="com.diligrp.etrade.order.domain.xreport.BusinessFlowVO"
+            parameterType="com.diligrp.etrade.order.domain.xreport.BusinessFlowCO">
+        SELECT
+        `code`
+        ,productPieces
+        ,payTime
+        ,productWeight
+        ,buyerName
+        ,buyerCode
+        ,sellerName
+        ,sellerCode
+        ,buyerId
+        ,productName
+        ,shopCardNo
+        ,shopCustomerId
+        ,productTradeType
+        ,buyerCardNo
+        ,id
+        ,productPieceWeight
+        ,productPiecePrice
+        ,productPrice
+        ,productTotalPrice
+        ,productSellerFee
+        FROM (
+        SELECT
+        o.code                  AS code
+        , og.product_pieces       AS productPieces
+        , o.pay_time              AS payTime
+        , og.product_weight       AS productWeight
+        , o.buyer_name            AS buyerName
+        , o.buyer_code            AS buyerCode
+        , o.seller_name           AS sellerName
+        , s.customer_code         AS sellerCode
+        , o.buyer_id              AS buyerId
+        , p.`alias`               AS productName
+        , o.shop_card_no          AS shopCardNo
+        , o.shop_customer_id      AS shopCustomerId
+        , og.product_trade_type   AS productTradeType
+        , o.buyer_card_no         AS buyerCardNo
+        , og.id                   AS id
+        , og.product_piece_weight AS productPieceWeight
+        , og.product_piece_price  AS productPiecePrice
+        , og.product_price        AS productPrice
+        , og.product_total_price  AS productTotalPrice
+        , og.product_seller_fee   AS productSellerFee
+        FROM
+        `order_goods` og
+        LEFT JOIN `order` o ON o.id = og.order_id
+        LEFT JOIN `product` p ON og.product_id = p.id
+        LEFT JOIN `shop` s ON s.id = o.shop_id
+        WHERE
+        o.state = 3
+        AND og.state = 1
+        AND o.market_id = #{marketId}
+        <if test="products !=null and products.size() > 0 ">
+            and p.category_id in
+            <foreach item="item" index="index" collection="products" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="code !=null and code != ''">
+            and o.code = #{code}
+        </if>
+        <if test="buyerId !=null">
+            and o.buyer_id = #{buyerId}
+        </if>
+        <if test="sellerId !=null">
+            and o.shop_customer_id = #{sellerId}
+        </if>
+        <if test="source !=null">
+            and o.source = #{source}
+        </if>
+        <if test="lowLevel !=null">
+            and og.product_total_price <![CDATA[>= #{lowLevel}]]>
+        </if>
+        <if test="highLevel !=null">
+            and og.product_total_price <![CDATA[<= #{highLevel}]]>
+        </if>
+        <if test="startSettleDateTime !=null">
+            and o.pay_time <![CDATA[>= #{startSettleDateTime}]]>
+        </if>
+        <if test="endSettleDateTime !=null">
+            and o.pay_time <![CDATA[<= #{endSettleDateTime}]]>
+        </if>
+        ) t
+        <if test="sort != null and sort != '' and sortOrder != null and sortOrder != ''">
+            ORDER BY ${sort} ${sortOrder}
+        </if>
+    </select>
+    <select id="querySumBusinessFlow" resultType="com.diligrp.etrade.order.domain.xreport.BusinessFlowSumVO"
+            parameterType="com.diligrp.etrade.order.domain.xreport.BusinessFlowCO">
+        SELECT
+        SUM(IFNULL(productWeight,0)) AS totalProductWeight
+        ,SUM(IFNULL(productPieces,0)) AS totalProductPieces
+        ,SUM(IFNULL(productTotalPrice,0)) AS totalProductTotalPrice
+        ,SUM(IFNULL(productSellerFee,0)) AS totalProductSellerFee
+        FROM (
+        SELECT
+        og.product_weight       AS productWeight
+        , og.product_pieces       AS productPieces
+        , og.product_total_price  AS productTotalPrice
+        , og.product_seller_fee   AS productSellerFee
+        FROM
+        `order_goods` og
+        LEFT JOIN `order` o ON o.id = og.order_id
+        LEFT JOIN `product` p ON og.product_id = p.id
+        WHERE
+        o.state = 3
+        AND og.state = 1
+        AND o.market_id = #{marketId}
+        <if test="products !=null and products.size() > 0 ">
+            and p.category_id in
+            <foreach item="item" index="index" collection="products" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="code !=null and code != ''">
+            and o.code = #{code}
+        </if>
+        <if test="buyerId !=null">
+            and o.buyer_id = #{buyerId}
+        </if>
+        <if test="sellerId !=null">
+            and o.shop_customer_id = #{sellerId}
+        </if>
+        <if test="source !=null">
+            and o.source = #{source}
+        </if>
+        <if test="lowLevel !=null">
+            and og.product_total_price <![CDATA[>= #{lowLevel}]]>
+        </if>
+        <if test="highLevel !=null">
+            and og.product_total_price <![CDATA[<= #{highLevel}]]>
+        </if>
+        <if test="startSettleDateTime !=null">
+            and o.pay_time <![CDATA[>= #{startSettleDateTime}]]>
+        </if>
+        <if test="endSettleDateTime !=null">
+            and o.pay_time <![CDATA[<= #{endSettleDateTime}]]>
+        </if>
+        ) t
+    </select>
 </mapper>
 \ No newline at end of file