Merge remote-tracking branch 'origin/dev' into dev

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

@@ -14,11 +14,7 @@ import java.math.BigDecimal;
 @Data
 @ApiModel(value = "月订单统计实体")
 public class OrderStatistics {
-    /**
-     * 公司id
-     */
-    @ApiModelProperty(value = "公司id")
-    private Integer branchCompanyId;
+
     /**
      * 月成交总金额
      */

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

@@ -11,6 +11,7 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -43,6 +44,7 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
             }
             return true;
         } catch (Exception e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             e.printStackTrace();
             return false;
         }

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

@@ -3,10 +3,51 @@ package com.xxfc.platform.order.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.OrderStatisticsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+
+import static io.lettuce.core.ZStoreArgs.Builder.sum;
+import static java.util.stream.Collectors.groupingBy;
+
 /**
  * @author Administrator
  */
 @Service
 public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper,OrderStatistics>  {
+    @Autowired
+    private DailyVehicleOrderStatisticsBiz vehicleBiz;
+
+
+    @Autowired
+    private DailyTravelOrderStatisticsBiz TravelBiz;
+
+    @Autowired
+    private DailyMembersOrderStatisticsBiz membersBiz;
+
+    public OrderStatistics getToalOrder(Integer companyId) {
+        OrderStatistics result = new OrderStatistics();
+        ArrayList<OrderStatistics> orderStatistics = new ArrayList<>();
+
+        OrderStatistics vehicle = vehicleBiz.findAll(companyId);
+        if (vehicle!=null) {orderStatistics.add(vehicle);}
+        OrderStatistics tour = TravelBiz.findAll(companyId);
+
+        if (vehicle!=null) {orderStatistics.add(tour);}
+        OrderStatistics member = membersBiz.findAll(companyId);
+        if (vehicle!=null) {orderStatistics.add(member);}
+
+        result.setTotalGmv(orderStatistics.stream().map(OrderStatistics::getTotalGmv).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalForfeit(orderStatistics.stream().map(OrderStatistics::getTotalForfeit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalCompensation(orderStatistics.stream().map(OrderStatistics::getTotalCompensation).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalRefundSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalRefundSecurityDeposit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalSecurityDeposit(orderStatistics.stream().map(OrderStatistics::getTotalSecurityDeposit).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalPenalSum(orderStatistics.stream().map(OrderStatistics::getTotalPenalSum).reduce(BigDecimal.ZERO,BigDecimal::add));
+        result.setTotalPostpone(orderStatistics.stream().map(OrderStatistics::getTotalPostpone).reduce(BigDecimal.ZERO,BigDecimal::add));
+
+        return result;
+    }
+
 }

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

@@ -286,7 +286,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
-            baseOrderBiz.updateSelectiveById(baseOrder);
+            baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
                 //添加非定损记录
@@ -298,7 +298,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                //修改订单状态为已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveById(baseOrder);
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 //修改订单详情是否押金全部退还
                 orderRentVehicleDetail.setFixedLossStatus(0);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
@@ -312,7 +312,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
                 orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-                baseOrderBiz.updateSelectiveById(baseOrder);
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             }
@@ -334,7 +334,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 throw new BaseException("定损记录不存在！请联系客服");
             }
             baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-            baseOrderBiz.updateSelectiveById(baseOrder);
+            baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
             baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
         }
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

 package com.xxfc.platform.order.jobhandler;
 
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.entity.OrderViolation;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -17,6 +17,7 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;
 import com.xxl.job.core.log.XxlJobLogger;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -24,10 +25,12 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -78,7 +81,7 @@ public class RentDepositJobHandler extends IJobHandler {
                             .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE)
                                     .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH) //已完成的订单
                                     .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL) //已归还了部分押金
-                                    .andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000))
+                                    .andLessThanOrEqualTo(BaseOrder::getCrtTime, DateUtil.date(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)))
 //                                    .andLike(BaseOrder::getId, "%"+ i)
                             ).build());
 
@@ -88,17 +91,41 @@ public class RentDepositJobHandler extends IJobHandler {
                             setOrderId(baseOrder.getId());
                         }});
 
-                        OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
-                            setDetailId(orvd.getId());
-                            setIsDel(SYS_FALSE);
+                        Integer crosstownTypeEnum;
+                        //判断是否定损过
+                        if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
+                            crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+                        }else {
+                            crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+                        }
+                        OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+                            setOrderId(baseOrder.getId());
+                            setType(crosstownTypeEnum);
                         }});
 
-                        //还车扣除款 剩余的 钱，再减去违章预备金
-                        BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
-                        String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
-                        refundDesc += ")";
-                        orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
-                        orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+                        if(crosstown.getCrtTime().compareTo(System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000)) < 0) {
+                            OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
+                                setDetailId(orvd.getId());
+                                setIsDel(SYS_FALSE);
+                            }});
+
+                            if(null != orderViolation) {
+                                //还车扣除款 剩余的 钱，再减去违章预备金
+                                BigDecimal refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
+                                String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
+                                refundDesc += ")";
+                                orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                                orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+                            }
+                        }
+
+                        //获取交车时间
+//                        List<OrderVehicleCrosstown> crosstowns = crosstownBiz.selectByExample(
+//                                new Example.Builder(BaseOrder.class)
+//                                        .where(WeekendSqls.<OrderVehicleCrosstown>custom()
+//                                                .andIn(OrderVehicleCrosstown::getType, Lists.newArrayList(CrosstownTypeEnum.ARRIVE.getCode(), CrosstownTypeEnum.FIXED_LOSS.getCode()))
+//                                                .andEqualTo(OrderVehicleCrosstown::getOrderId, baseOrder.getId())).build());
+
                     }
 
 //                }

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

@@ -70,6 +70,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
              throw new BaseException("请登录!");
         }
         UserDTO user = userDTOObjectRestResponse.getData();
+
         Integer companyId = user.getCompanyId();
         if (TYEP_VEHICLE.equals(type)) {
             OrderStatistics vehicle = vehicleBiz.findAll(companyId);
@@ -84,7 +85,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             return ObjectRestResponse.succ(member);
         }
 
-
+         if (TYEP_TOTAL.equals(type)){
+             baseBiz.getToalOrder(companyId);
+         }
         return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"参数为空!");
     }
 }

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

@@ -17,7 +17,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv
         FROM
         daily_travel_order_statistics

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

@@ -51,7 +51,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv,
         IFNULL(sum(penal_sum) ,0) as totalPenalSum
         FROM

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

@@ -139,7 +139,7 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-        branch_company_id as branchCompanyId,
+
         IFNULL(sum(gmv),0) as totalGmv,
         IFNULL(sum(security_deposit),0) as totalSecurityDeposit,
         IFNULL(sum(refund_security_deposit) ,0) as totalRefundSecurityDeposit,