总业绩统计

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/ReturnOrderAmount.java

 package com.xxfc.platform.order.pojo;
 
+import com.alibaba.fastjson.JSON;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.util.StringUtils;
 
 import javax.persistence.Column;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Data
-public class ReturnOrderAmount {
+public class ReturnOrderAmount implements Serializable {
+    private static final long serialVersionUID = -8445943548965154778L;
     @ApiModelProperty(value = "时间")
     private String time;
     @ApiModelProperty(value = "订单号")
@@ -25,9 +30,11 @@ public class ReturnOrderAmount {
     private String refundInstruction;
     @ApiModelProperty(value = "退款明细")
     private BigDecimal refundAmount=BigDecimal.ZERO;
+    @ApiModelProperty("退还类型")
+    @Column(name = "account_type")
+    private Integer accountType;
+    public OrderAccountDetail getAccountDetailStr() {
 
-    public String getAccountDetailStr() {
-
-        return accountDetailStr;
+        return StringUtils.hasText(accountDetailStr)? JSON.parseObject(accountDetailStr,OrderAccountDetail.class):new OrderAccountDetail();
     }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -924,7 +924,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     public PageInfo<Achievement> getAchievementPageInfo(QueryCriteria queryCriteria) {
         PageHelper.startPage(queryCriteria.getPage(),queryCriteria.getLimit());
         List<Achievement> achievements = mapper.selectTotalStatistical(queryCriteria);
-        return new PageInfo<>(achievements);
+        return  PageInfo.of(achievements);
     }
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/TotalPerformanceBiz.java

@@ -3,16 +3,19 @@ package com.xxfc.platform.order.biz;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.pojo.Achievement;
 import com.xxfc.platform.order.pojo.QueryCriteria;
 import com.xxfc.platform.order.pojo.ReturnOrderAmount;
 import com.xxfc.platform.order.pojo.TotalOrderRevenue;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -91,9 +94,21 @@ public class TotalPerformanceBiz {
         if (CollectionUtils.isEmpty(returnOrderAmounts)) {
             return Lists.newArrayList();
         }
-
+        //拆分明细
+        splitReturnOrderAmountList(returnOrderAmounts,queryCriteria);
     }
 
+    //拆分明细
+    private List<ReturnOrderAmount> splitReturnOrderAmountList(List<ReturnOrderAmount> returnOrderAmounts, QueryCriteria queryCriteria) {
+        ArrayList<ReturnOrderAmount> arrayList = Lists.newArrayList();
+        for (ReturnOrderAmount returnOrderAmount : returnOrderAmounts) {
+
+            OrderAccountDetail accountDetailStr = returnOrderAmount.getAccountDetailStr();
+            if (AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode().equals(returnOrderAmount.getAccountType())) {
+
+            }
+        }
+    }
 
 
 }

xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxfc.platform.order.mapper.OrderAccountMapper">
-    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"  resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
+    <select id="getOrderAccountByOrderType" parameterType="com.xxfc.platform.order.pojo.Term"
+            resultType="com.xxfc.platform.order.pojo.account.OrderAccountDTO">
         SELECT
         <if test="subdivide !=null and subdivide ==1">
             date( FROM_UNIXTIME( a.crt_time / 1000 ) ) as oneDay,
@@ -51,7 +52,7 @@
         </if>
     </select>
     <select id="outStatisticalData" resultType="com.xxfc.platform.order.pojo.ReturnOrderAmount">
-          select  oa.crt_time as time ,oupc.no,oupc.type,oa.account_detail  ,oupc.realname,oupc.username
+        select oa.crt_time as time ,oupc.no,oupc.type,oa.account_detail,oupc.realname,oupc.username,oa.account_type
         from order_account oa
         left join order_user_position_company oupc ON oa.order_id=oupc.id
         WHERE oa.account_type!=101