修改订单统计

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

-package com.xxfc.platform.order.entity;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-@Data
-public class DailyOrderStatistics {
-
-    @Column(name = "one_day")
-    private System oneDay;
-
-    @Column(name = "total_orders")
-    private BigInteger totalOrders;
-
-    @Column(name = "actual_total_income")
-    private BigDecimal actualTotalIncome;
-
-
-
-
-}

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * 每日租车订单
+ * @author Administrator
+ */
+@Data
+public class DailyVehicleOrderStatistics {
+
+    /**
+     * 日期
+     */
+    @Column(name = "on_day")
+     private  String oneDay;
+
+    /**
+     * 成交总金额
+     */
+    @Column(name = "gmv")
+    private BigDecimal gmv;
+
+    /**
+     * 预交押金总额
+     */
+    @Column(name = "security_deposit")
+    private BigDecimal  securityDeposit;
+
+    /**
+     * 退还押金总额
+     */
+    @Column(name = "refund_security_deposit")
+    private BigDecimal  refundSecurityDeposit;
+
+    /**
+     * 赔偿总额
+     */
+    @Column(name = "compensation")
+    private BigDecimal compensation;
+
+    /**
+     * 违章总额
+     */
+    @Column(name = "forfeit")
+    private  BigDecimal violationMoney;
+
+    /**
+     * 取消订单总额
+     */
+    @Column(name = "penal_sum")
+    private  BigDecimal penalSum;
+
+    /**
+     * 延期总额
+     */
+    @Column(name = "postpone")
+    private  BigDecimal postpone;
+
+}

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

@@ -39,6 +39,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.jexl2.MapContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -376,11 +377,12 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         }
     }
 
+//    @Scheduled(cron = "0 0/2 * * * ? ")
     public boolean getTotalOrder() {
+        //获取车辆成交总额和预付押金总额
+        Map<String, BigDecimal> map = mapper.getTotalOrder();
 
-      mapper.getTotalOrder();
-      return false;
-
+        return false;
     }
 
 //    @Scheduled(cron = "0 0 2 * * ? ")

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.entity.DailyOrderStatistics;
-import com.xxfc.platform.order.mapper.BaseOrderMapper;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHandler;

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

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.DailyOrderStatistics;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -28,5 +28,5 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	public OrderPageVO getOrderDetail(String no);
 
-	DailyOrderStatistics getTotalOrder();
+	Map<String, BigDecimal> getTotalOrder();
 }

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

@@ -219,33 +219,36 @@
         where no = #{no}
     </select>
 
-    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">
-
+    <!--    获取每日租车订单成交金额和押金金额-->
+    <select id="getTotalOrder" resultType="HashMap">
         select
-        date_format(pay_time,'%Y-%c-%d') as oneDay,
-        sum(1) as totalOrders,
-        sum(pay_time)as actualTotalIncome
+        date_format(FROM_UNIXTIME(pay_time/1000),'%Y-%c-%d') as oneDay,
+				IFNULL(SUM(b.real_amount-v.deposit),0) as gmv,
+				IFNULL(SUM(v.deposit),0) as marginTotal
         from
-        base_order
+        base_order b
+				left join
+				order_rent_vehicle_detail v
+				on
+				b.id=v.order_id
         where
-        date(pay_time)=date(now())-1
-        group by
-        date_format(pay_time,'%d')
+				b.type=1
+			  AND
+        date(FROM_UNIXTIME(pay_time/1000))=date(DATE_SUB(now(),interval 1 day))
     </select>
 
 
-<!--    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">-->
-
-<!--        select-->
-<!--        date_format(refund_time,'%Y-%c-%d') as oneDay,-->
-<!--        sum(1) as totalOrders,-->
-<!--        sum(refund_time)as actualTotalIncome-->
-<!--        from-->
-<!--        base_order-->
-<!--        where-->
-<!--        date(refund_time)=date(now())-1-->
-<!--        group by-->
-<!--        date_format(refund_time,'%d')-->
-<!--    </select>-->
+    <!--    <select id="getTotalOrder" resultType="com.xxfc.platform.order.entity.DailyOrderStatistics">-->
+    <!--        select-->
+    <!--        date_format(refund_time,'%Y-%c-%d') as oneDay,-->
+    <!--        sum(1) as totalOrders,-->
+    <!--        sum(refund_time)as actualTotalIncome-->
+    <!--        from-->
+    <!--        base_order-->
+    <!--        where-->
+    <!--        date(refund_time)=date(now())-1-->
+    <!--        group by-->
+    <!--        date_format(refund_time,'%d')-->
+    <!--    </select>-->
 
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -91,7 +91,7 @@ public interface VehicleFeign {
      * @return
      */
     @PostMapping("/sysRegion/getSysRegion")
-    ObjectRestResponse<List<SysRegion>> getSysRegion(Set<Integer> idSet);
+    ObjectRestResponse<List<SysRegion>> getSysRegion(@RequestBody Set<Integer> idSet);
 
     /**
      * 获取公司所在的城市