Merge remote-tracking branch 'origin/base-modify' into base-modify

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.Table;
+
+/**
+ * @author Administrator
+ */
+@Data
+@Table(name = "daily_members_order_statistics")
+public class DailyMembersOrderStatistics extends DailyOrderStatistics {
+
+}

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

+package com.xxfc.platform.order.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 每日统计
+ * @author Administrator
+ */
+@Data
+public class DailyOrderStatistics {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+
+    /**
+     * 日期
+     */
+    @Column(name = "one_day")
+    private  String oneDay;
+
+    /**
+     * 成交总金额
+     */
+    @Column(name = "gmv")
+    private BigDecimal gmv;
+
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date crtTime;
+}

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+/**
+ * 旅游统计
+ * @author Administrator
+ */
+@Data
+@Table(name = "daily_travel_order_statistics")
+public class DailyTravelOrderStatistics extends DailyOrderStatistics  {
+    /**
+     * 取消订单总额
+     */
+    @Column(name = "penal_sum")
+    private BigDecimal penalSum;
+}

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

@@ -21,17 +21,7 @@ import java.util.Date;
  */
 @Data
 @Table(name = "daily_vehicle_order_statistics")
-public class DailyVehicleOrderStatistics {
-
-    @Id
-    @GeneratedValue(generator = "JDBC")
-    private Integer id;
-
-    /**
-     * 日期
-     */
-    @Column(name = "one_day")
-     private  String oneDay;
+public class DailyVehicleOrderStatistics extends DailyOrderStatistics{
 
     /**
      * 成交总金额
@@ -63,24 +53,12 @@ public class DailyVehicleOrderStatistics {
     @Column(name = "forfeit")
     private  BigDecimal violationMoney;
 
-    /**
-     * 取消订单总额
-     */
-    @Column(name = "penal_sum")
-    private  BigDecimal penalSum;
 
     /**
      * 延期总额
      */
     @Column(name = "postpone")
     private  BigDecimal postpone;
-    /**
-     * 创建时间
-     */
-    @Column(name = "crt_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date crtTime;
 
 
 }

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

+package com.xxfc.platform.order.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
+import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
+import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 每日购买会员订单统计
+ * @author Administrator
+ */
+@Service
+public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderStatisticsMapper, DailyMembersOrderStatistics> {
+
+
+    public boolean memberOrderStatistics()  {
+        try {
+            HashMap<String, Object> resultMap = new HashMap<>();
+            Map<String,Object> travelGmv = mapper.getTravelGmv();
+            resultMap.putAll(travelGmv);
+            DailyMembersOrderStatistics MembersStatistics = new DailyMembersOrderStatistics();
+            BeanUtils.copyProperties(MembersStatistics,resultMap);
+            insertSelective(MembersStatistics);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

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

+package com.xxfc.platform.order.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.DailyOrderStatistics;
+import com.xxfc.platform.order.mapper.DailyOrderStatisticsMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+/**
+ * 每日租车订单统计和保存
+ * @author Administrator
+ */
+@Slf4j
+@Service
+public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper, DailyOrderStatistics> {
+
+    @Autowired
+    private  DailyVehicleOrderStatisticsBiz vehicleStatisticsBiz;
+
+    @Autowired
+    private DailyTravelOrderStatisticsBiz travelStatisticsBiz;
+
+    @Autowired
+    private DailyMembersOrderStatisticsBiz membersStatisticsBiz;
+
+//    @Scheduled(cron = "0 0/1 * * * ?")
+    public boolean statisticalOrder(){
+        boolean vehicleFlag = vehicleStatisticsBiz.StatisticsOfCarRentalOrders();
+        boolean travelFlag = travelStatisticsBiz.StatisticsOfTravelOrders();
+        boolean membersFlag= membersStatisticsBiz.memberOrderStatistics();
+        if (vehicleFlag&&travelFlag&&membersFlag){
+            log.info("----statisticalOrder:成功-----");
+            return true;
+        }
+        log.info("----statisticalOrder:失败-----");
+        return false;
+    }
+
+}

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

+package com.xxfc.platform.order.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
+import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 每日旅游订单统计
+ * @author Administrator
+ */
+@Service
+public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStatisticsMapper, DailyTravelOrderStatistics> {
+
+
+    public boolean StatisticsOfTravelOrders()  {
+        try {
+            HashMap<String, Object> resultMap = new HashMap<>();
+            Map<String,Object> travelGmv = mapper.getTravelGmv();
+            BigDecimal travelPenalSum = mapper.getTravelPenalSum();
+            resultMap.putAll(travelGmv);
+            resultMap.put("penalSum",travelPenalSum);
+            DailyTravelOrderStatistics TravelStatistics = new DailyTravelOrderStatistics();
+            BeanUtils.copyProperties(TravelStatistics,resultMap);
+            insertSelective(TravelStatistics);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}

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

@@ -5,22 +5,21 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
 import com.xxfc.platform.order.mapper.DailyVehicleOrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Slf4j
+/** 每日租车订单统计
+ * @author Administrator
+ */
 @Service
 public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderStatisticsMapper, DailyVehicleOrderStatistics> {
 
@@ -29,7 +28,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
 
 
     @Transactional(rollbackFor = Exception.class)
-    public boolean getTotalOrder()  {
+    public boolean StatisticsOfCarRentalOrders()  {
 
         try {
             HashMap<String, Object> resultMap = new HashMap<>();
@@ -52,7 +51,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
             resultMap.putAll(cpMap);
             DailyVehicleOrderStatistics orderStatistics = new DailyVehicleOrderStatistics();
             BeanUtils.copyProperties(orderStatistics,resultMap);
-            super.insertSelective(orderStatistics);
+            insertSelective(orderStatistics);
             return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -103,8 +102,4 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
         return null;
     }
 
-//    @Scheduled(cron = "0 0 2 * * ? ")
-//    private void  countDailyOrdersRegularly(){
-//        DailyOrderStatistics dailyOrderStatistics= mapper.getTotalOrder();
-//    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/XxlJobConfig.java

@@ -13,7 +13,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xuxueli 2017-04-28
  */
 @Slf4j
-//@Configuration
+@Configuration
 public class XxlJobConfig {
 
     @Value("${xxl.job.admin.addresses}")

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

 package com.xxfc.platform.order.jobhandler;
 
 import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
@@ -12,25 +13,32 @@ import org.springframework.stereotype.Component;
 
 /**
  *  每天2定时统计前一天的数据
+ * @author Administrator
  */
 @JobHandler(value = "baseOrderStatisticsHandler")
 @Component
 @Slf4j
 public class BaseOrderStatisticsJobHandler extends IJobHandler {
     @Autowired
-    private DailyVehicleOrderStatisticsBiz statisticsBiz;
+    private DailyOrderStatisticsBiz statisticsBiz;
 
     @Override
-    public ReturnT<String> execute(String s) throws Exception {
+    public ReturnT<String> execute(String s){
         try {
 
             XxlJobLogger.log("-----定时器进入---baseOrderStatisticsHandler---");
-//            log.info("-----定时器进入---baseOrderStatisticsHandler---");
-            statisticsBiz.getTotalOrder();
+            log.info("-----定时器进入---baseOrderStatisticsHandler---");
+            boolean flag = statisticsBiz.statisticalOrder();
             ReturnT returnT = new ReturnT();
+            if (flag) {
                 returnT.setCode(100);
                 returnT.setMsg("成功");
                 return returnT;
+            }else {
+                returnT.setCode(500);
+                returnT.setMsg("失败");
+                return returnT;
+            }
         } catch (Exception e) {
             XxlJobLogger.log(e);
             return FAIL;

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

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.Map;
+
+/**
+ * 每日会员订单统计mapper
+ * @author Administrator
+ */
+public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOrderStatistics> {
+    Map<String, Object> getTravelGmv();
+
+}

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

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.DailyOrderStatistics;
+import tk.mybatis.mapper.common.Mapper;
+
+
+/**
+ *
+ * @author Administrator
+ */
+public interface DailyOrderStatisticsMapper extends Mapper<DailyOrderStatistics> {
+}

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

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @author Administrator
+ */
+
+public interface DailyTravelOrderStatisticsMapper extends Mapper<DailyTravelOrderStatistics> {
+
+    Map<String,Object> getTravelGmv();
+
+    BigDecimal getTravelPenalSum();
+}

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

@@ -61,6 +61,7 @@ public class OrderRentVehicleController extends CommonBaseController {
             bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
                     StrUtil.splitTrim(vo.getTickerNos(), ","):null);
+            bo.setAccompanyItems(vo.getAccompanyItems());
             orderRentVehicleService.createOrder(bo);
             return ObjectRestResponse.succ(bo.getOrder());
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -25,10 +25,12 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
+import com.xxfc.platform.order.pojo.order.OrderItemDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
@@ -157,22 +159,53 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }
 
         //插入随声物品item
-        Map<String, AccompanyingItemVo> accompanyingItemMap = vehicleFeign.listAccompanyingItem().getData()
+        List<OrderAccompanyDTO> oads = new ArrayList<OrderAccompanyDTO>();
+        List<AccompanyingItemVo> accompanyingItemList = vehicleFeign.listAccompanyingItem().getData();
+//        Map<String, AccompanyingItemVo> accompanyingItemMap = vehicleFeign.listAccompanyingItem().getData()
+//                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
+        if(null == bo.getAccompanyItems()) {
+            bo.setAccompanyItems(new ArrayList<OrderAccompanyDTO>());
+        }
+        Map<String, OrderAccompanyDTO> orderAccompanyDTOMap = bo.getAccompanyItems()
                 .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
-        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
-            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId());
-            oad.setName(aiv.getName());
-            oad.setUnit(aiv.getUnit());
-            oad.setUnitPrice(aiv.getPrice());
-            oad.setNum(aiv.getNumber());
-            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
+
+        for(AccompanyingItemVo aiv : accompanyingItemList) {
+            if(AccompanyingItemType.TOOL.getCode().equals(aiv.getType())
+                || AccompanyingItemType.EQUIPMENT.getCode().equals(aiv.getType())) {
+                OrderAccompanyDTO orderAccompanyDTO = new OrderAccompanyDTO();
+                orderAccompanyDTO.setId(aiv.getId());
+                orderAccompanyDTO.setName(aiv.getName());
+                orderAccompanyDTO.setUnit(aiv.getUnit());
+                orderAccompanyDTO.setUnitPrice(aiv.getPrice());
+                orderAccompanyDTO.setNum(aiv.getNumber());
+                oads.add(orderAccompanyDTO);
+            }else {
+                OrderAccompanyDTO orderAccompanyDTO = orderAccompanyDTOMap.get(aiv.getId().toString());
+                if(null != orderAccompanyDTO) {
+                    orderAccompanyDTO.setName(aiv.getName());
+                    orderAccompanyDTO.setUnit(aiv.getUnit());
+                    orderAccompanyDTO.setUnitPrice(aiv.getPrice());
+                    oads.add(orderAccompanyDTO);
+                }
+            }
         }
+        bo.setAccompanyItems(oads);
+//        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
+//            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId().toString());
+//            oad.setName(aiv.getName());
+//            oad.setUnit(aiv.getUnit());
+//            oad.setUnitPrice(aiv.getPrice());
+//            oad.setNum(aiv.getNumber());
+//            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
+//        }
 
         //获取可用车辆
         acquireVehicle(bo);
 
         OrderItem accompanyItem = orderItemBiz.initOrderItem(BigDecimal.ZERO, 1, "随车物品", null, ACCOMPANY);
+        accompanyItem.setRealAmount(BigDecimal.ZERO);
         accompanyItem.setDetail(JSONUtil.toJsonStr(bo.getAccompanyItems()));
+        accompanyItem.setOrderId(bo.getOrder().getId());
         orderItemBiz.insertSelective(accompanyItem);
 
         super.handleDetail(bo);

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.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.DailyMembersOrderStatisticsMapper">
+    <!--    获取每日租车订单成交金和押金总额-->
+    <select id="getTravelGmv" resultType="HashMap">
+        select
+        COALESCE(date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
+        IFNULL(SUM(real_amount),0) as gmv
+        from
+        base_order
+        where
+        type=3
+        AND
+        date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
+    </select>
+</mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/DailyTravelOrderStatisticsMapper.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.DailyTravelOrderStatisticsMapper">
+    <!--    获取每日租车订单成交金和押金总额-->
+    <select id="getTravelGmv" resultType="HashMap">
+        select
+        COALESCE(date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
+        IFNULL(SUM(real_amount),0) as gmv
+        from
+        base_order
+        where
+        type=2
+        AND
+        date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
+    </select>
+
+    <!--    取消订单扣除款项总和-->
+    <select id="getTravelPenalSum" resultType="BigDecimal">
+        SELECT
+        IFNULL(SUM(r.deduct_amount),0) as penalSum
+        FROM
+        base_order o
+        left join
+        order_refund r
+        on
+        o.id=r.order_id
+        WHERE
+        o.type=2
+        and
+        r.refund_status=1
+        and
+        r.refund_type =1
+        and
+        date(FROM_UNIXTIME(r.refund_time/1000))=date(DATE_SUB(now(),interval 1 day))
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -7,7 +7,7 @@
         select
         COALESCE(date_format(FROM_UNIXTIME(b.pay_time/1000),'%Y-%c-%d'),date(DATE_SUB(now(),interval 1 day))) as oneDay,
         IFNULL(SUM(b.real_amount-v.deposit),0) as gmv,
-        IFNULL(SUM(v.deposit),0) as marginTotal
+        IFNULL(SUM(v.deposit),0) as securityDeposit
         from
         base_order b
         left join