修改统计

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderStatistics.java

 package com.xxfc.platform.order.entity;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -9,39 +12,52 @@ import java.math.BigDecimal;
  */
 
 @Data
+@ApiModel(value = "月订单统计实体")
 public class OrderStatistics {
+    /**
+     * 公司id
+     */
+    @ApiModelProperty(value = "公司id")
+    private Integer branchCompanyId;
     /**
      * 月成交总金额
      */
+    @ApiModelProperty(value = "月成交总金额")
     private BigDecimal totalGmv;
 
     /**
      * 月押金总额
      */
+    @ApiModelProperty(value = "月押金总额")
     private BigDecimal totalSecurityDeposit;
 
     /**
      * 月退还押金总额
      */
+    @ApiModelProperty(value = "月退还押金总额")
     private BigDecimal totalRefundSecurityDeposit;
 
     /**
      * 月赔偿总额
      */
+    @ApiModelProperty(value = "月赔偿总额")
     private BigDecimal totalCompensation;
 
     /**
      * 月违章总额
      */
+    @ApiModelProperty(value = "月违章总额")
     private BigDecimal totalForfeit;
 
     /**
      * 月取消订单扣款总额
      */
+    @ApiModelProperty(value = "月取消订单扣款总额")
     private BigDecimal totalPenalSum;
 
     /**
      * 月延期扣款总额
      */
+    @ApiModelProperty(value = "月延期扣款总额")
     private BigDecimal totalPostpone;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -12,12 +12,11 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "vehicle")
+@FeignClient(name = "xx-order")
 public interface OrderFeign {
     @GetMapping("/baseOrder/entityList")
     public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);

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

@@ -8,12 +8,14 @@ import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,12 +32,15 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     @Transactional(rollbackFor = Exception.class)
     public boolean memberOrderStatistics() {
         try {
-            HashMap<String, Object> resultMap = new HashMap<>();
-            Map<String, Object> travelGmv = mapper.getTravelGmv();
-            resultMap.putAll(travelGmv);
+            List<Map<String, Object>> travelGmv = mapper.getTravelGmv();
+            if (CollectionUtils.isEmpty(travelGmv)) {
+                return true;
+            }
+            for (Map<String, Object> stringObjectMap : travelGmv) {
                 DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
-            BeanUtils.copyProperties(MembersStatistics, resultMap);
+                BeanUtils.copyProperties(MembersStatistics, stringObjectMap);
                 insertSelective(MembersStatistics);
+            }
             return true;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -41,22 +42,23 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
 
     private void insertByList(ArrayList<DailyTravelOrderStatistics> objects) throws Exception {
 
+        if (CollectionUtils.isNotEmpty(objects)) {
             HashMap<Integer, DailyTravelOrderStatistics> map = new HashMap<>();
             for (DailyTravelOrderStatistics object : objects) {
                 DailyTravelOrderStatistics statistics = map.get(object.getBranchCompanyId());
-            if (statistics==null) {
-                statistics= new DailyTravelOrderStatistics();
-                map.put(object.getBranchCompanyId(),statistics);
+                if (statistics == null) {
+                    statistics = new DailyTravelOrderStatistics();
+                    map.put(object.getBranchCompanyId(), statistics);
                 }
 
-            BeanUtil.copyProperties(object,statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                BeanUtil.copyProperties(object, statistics, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 
             }
 
             for (Map.Entry<Integer, DailyTravelOrderStatistics> e : map.entrySet()) {
                 insertSelectiveRe(e.getValue());
             }
-
+        }
     }
 
 

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

@@ -70,8 +70,9 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
 
     }
 
-    private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result)throws Exception {
+    private void InsertByList(ArrayList<DailyVehicleOrderStatistics> result) throws Exception {
 
+        if(CollectionUtils.isNotEmpty(result)) {
             Map<Integer, DailyVehicleOrderStatistics> map = new HashMap<>();
 
             for (DailyVehicleOrderStatistics value : result) {
@@ -92,6 +93,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                 }
 
             }
+        }
 
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java

@@ -4,6 +4,7 @@ import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -12,7 +13,7 @@ import java.util.Map;
  */
 public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
 
-    Map<String, Object> getTravelGmv();
+    List<Map<String, Object>> getTravelGmv();
 
     OrderStatistics monthOrderTotal(Integer companyId);
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderStatisticsController.java

@@ -12,6 +12,7 @@ import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,7 +24,8 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Administrator
  */
 @RestController
-@RequestMapping("orderStatisticsA")
+@RequestMapping("orderStatistics")
+@Api(description = "每月总的订单统计")
 public class OrderStatisticsController extends BaseController<OrderStatisticsBiz, OrderStatistics> {
      @Autowired
      private UserFeign userFeign;
@@ -45,6 +47,11 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
      */
     private final Integer TYEP_MEMBER = 3;
 
+    /**
+     * 月总数据
+     */
+    private final Integer TYEP_TOTAL = 4;
+
     @Autowired
     private DailyVehicleOrderStatisticsBiz vehicleBiz;
 
@@ -58,7 +65,6 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @ApiOperation("获取订单统计数据")
     @GetMapping("/findAll/{type}")
     public ObjectRestResponse findAll(@PathVariable Integer type) {
-
         ObjectRestResponse<UserDTO> userDTOObjectRestResponse = userFeign.userinfoByToken(userAuthConfig.getToken(getRequest()));
         if (userDTOObjectRestResponse==null||userDTOObjectRestResponse.getData()==null) {
              throw new BaseException("请登录!");
@@ -66,14 +72,19 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
         UserDTO user = userDTOObjectRestResponse.getData();
         Integer companyId = user.getCompanyId();
         if (TYEP_VEHICLE.equals(type)) {
-           return ObjectRestResponse.succ(vehicleBiz.findAll(companyId));
+            OrderStatistics vehicle = vehicleBiz.findAll(companyId);
+            return ObjectRestResponse.succ(vehicle);
         }
         if (TYEP_TOUR.equals(type)) {
-            return ObjectRestResponse.succ(TravelBiz.findAll(companyId));
+            OrderStatistics tour = TravelBiz.findAll(companyId);
+            return ObjectRestResponse.succ(tour);
         }
         if (TYEP_MEMBER.equals(type)) {
-            return ObjectRestResponse.succ(membersBiz.findAll(companyId));
+            OrderStatistics member = membersBiz.findAll(companyId);
+            return ObjectRestResponse.succ(member);
         }
+
+
         return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"参数为空!");
     }
 }

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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper">
     <!--    获取旅游订单成交金-->
-    <select id="getTravelGmv" resultType="list">
+    <select id="getTravelGmv" resultType="com.xxfc.platform.order.entity.DailyTravelOrderStatistics">
         select
         t.start_company_id as branchCompanyId,
         COALESCE(date_format(FROM_UNIXTIME(o.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
@@ -23,7 +23,7 @@
     </select>
 
     <!--    取消订单扣除款项总和-->
-    <select id="getTravelPenalSum" resultType="list">
+    <select id="getTravelPenalSum" resultType="com.xxfc.platform.order.entity.DailyTravelOrderStatistics">
         SELECT
         t.start_company_id as branchCompanyId,
         IFNULL(SUM(r.deduct_amount),0) as penalSum

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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper">
     <!--    获取每日租车订单成交金和押金总额-->
-    <select id="getGmvAndMarginTotal" resultType="List">
+    <select id="getGmvAndMarginTotal" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
         SELECT
         v.start_company_id AS branchCompanyId,
         COALESCE(date_format(FROM_UNIXTIME(b.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
@@ -25,7 +25,7 @@
 
 
     <!--    退还押金总额-->
-    <select id="getRefundSecurityDeposit" resultType="List">
+    <select id="getRefundSecurityDeposit" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
         SELECT
         v.start_company_id AS branchCompanyId,
         IFNULL(SUM(r.refund_amount),0) AS refundSecurityDeposit
@@ -53,7 +53,7 @@
 
 
     <!--    取消订单扣除款项总和-->
-    <select id="getPenalSum" resultType="List">
+    <select id="getPenalSum" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
         SELECT
         v.start_company_id as branchCompanyId,
         IFNULL(SUM(r.deduct_amount),0) as penalSum
@@ -80,7 +80,7 @@
     </select>
 
     <!--    获取赔偿和延期JSON字符串-->
-    <select id="getCompensationAndPostpone" resultType="List">
+    <select id="getCompensationAndPostpone" resultType="HashMap">
         SELECT
         v.start_company_id AS branchCompanyId,
         c.ded_detail AS dedDetail
@@ -106,7 +106,7 @@
     </select>
 
     <!--违章-->
-    <select id="getViolationMoney" resultType="List">
+    <select id="getViolationMoney" resultType="com.xxfc.platform.order.entity.DailyVehicleOrderStatistics">
         SELECT
 		d.start_company_id AS branchCompanyId,
         v.price as violationMoney