Merge branch 'order_received_statistics' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/StatisticsStatusEnum.java

@@ -187,12 +187,12 @@ public enum StatisticsStatusEnum {
                 feeTypeBo.setOrderRefundAmount(feeTypeBo.getOrderRefundAmount().add(accountDetailEntity.getOrderAmount()).subtract(feeTypeBo.getNoDeductibleRefundAmount()));
             }
         }
-        //订单支付金额(不包含免赔，押金)减去退款的金额
+/*        //订单支付金额(不包含免赔，押金)减去退款的金额
         feeTypeBo.setTotalAmount(feeTypeBo.getTotalAmount().subtract(feeTypeBo.getOrderRefundAmount()));
         //订单押金减去退款押金
         feeTypeBo.setDepositAmount(feeTypeBo.getDepositAmount().subtract(feeTypeBo.getDepositRefundAmount()));
         //订单免赔金额减去退款的免赔金额
-        feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().subtract(feeTypeBo.getDepositRefundAmount()));
+        feeTypeBo.setNoDeductibleAmount(feeTypeBo.getNoDeductibleAmount().subtract(feeTypeBo.getDepositRefundAmount()));*/
         return feeTypeBo;
     }
 

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

@@ -71,11 +71,11 @@
         `company_id` AS `companyId`,
         `year`,
         `date`,
-        SUM(`member_amount`) AS `memberAmount`,
-        SUM(`travel_amount`) AS `travelAmount`,
-        SUM(`rent_vehicle_amount`) AS `rentVehilceAmount`,
-        SUM(`no_deductible_amount`) as `noDeductibleAmount`,
-        SUM(`deposit_amount`) as `depositAmount`
+        SUM(`member_amount`-`member_refund_amount`) AS `memberAmount`,
+        SUM(`travel_amount`-`travel_refund_amount` ) AS `travelAmount`,
+        SUM(`rent_vehicle_amount`-`rent_vehicle_refund_amount`) AS `rentVehilceAmount`,
+        SUM(`no_deductible_amount` - `no_deductible_refund_amount`) as `noDeductibleAmount`,
+        SUM(`deposit_amount` - `deposit_refund_amount`) as `depositAmount`
         FROM
         `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
@@ -156,11 +156,11 @@
         company_id AS `companyId`,
         `year`,
         `month`,
-        SUM(`member_amount`) AS `memberAmount`,
-        SUM(`travel_amount`) AS `travelAmount`,
-        SUM(`rent_vehicle_amount`) AS `rentVehilceAmount`,
-        SUM(`no_deductible_amount`) as `noDeductibleAmount`,
-        SUM(`deposit_amount`) as `depositAmount`
+        SUM(`member_amount`-`member_refund_amount`) AS `memberAmount`,
+        SUM(`travel_amount`-`travel_refund_amount` ) AS `travelAmount`,
+        SUM(`rent_vehicle_amount`-`rent_vehicle_refund_amount`) AS `rentVehilceAmount`,
+        SUM(`no_deductible_amount` - `no_deductible_refund_amount`) as `noDeductibleAmount`,
+        SUM(`deposit_amount` - `deposit_refund_amount`) as `depositAmount`
         FROM
         `order_received_statistics` WHERE  `has_pay`=1
         <if test="companyName!=null and companyName!=''">
@@ -240,11 +240,11 @@
         company_id AS `companyId`,
         `year`,
         `week_of_year` AS `weekOfYear`,
-        SUM(`member_amount`) AS `memberAmount`,
-        SUM(`travel_amount`) AS `travelAmount`,
-        SUM(`rent_vehicle_amount`) AS `rentVehilceAmount`,
-        SUM(`no_deductible_amount`) as `noDeductibleAmount`,
-        SUM(`deposit_amount`) as `depositAmount`
+        SUM(`member_amount`-`member_refund_amount`) AS `memberAmount`,
+        SUM(`travel_amount`-`travel_refund_amount` ) AS `travelAmount`,
+        SUM(`rent_vehicle_amount`-`rent_vehicle_refund_amount`) AS `rentVehilceAmount`,
+        SUM(`no_deductible_amount` - `no_deductible_refund_amount`) as `noDeductibleAmount`,
+        SUM(`deposit_amount` - `deposit_refund_amount`) as `depositAmount`
         FROM
         `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
@@ -313,7 +313,7 @@
     </select>
 
     <select id="selectCountByDate" resultType="int">
-       select count(0) from (SELECT `date` FROM `order_received_statistics` WHERE `has_pay`=1
+        select count(*) from (SELECT `date` FROM `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
             AND `company_name` LIKE CONCAT('%',#{companyName},'%')
         </if>
@@ -341,7 +341,7 @@
     </select>
 
     <select id="selectCountByMonth" resultType="int">
-        select count(0) from (SELECT `month` FROM `order_received_statistics` WHERE `has_pay`=1
+        select count(*) from (SELECT `month` FROM `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
             AND `company_name` LIKE CONCAT('%',#{companyName},'%')
         </if>
@@ -369,7 +369,7 @@
     </select>
 
     <select id="selectCountByWeekOfYear" resultType="int">
-        select count(0) from (SELECT `week_of_year` FROM `order_received_statistics` WHERE `has_pay`=1
+        select count(*) from (SELECT `week_of_year` FROM `order_received_statistics` WHERE `has_pay`=1
         <if test="companyName!=null and companyName!=''">
             AND `company_name` LIKE CONCAT('%',#{companyName},'%')
         </if>

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -126,16 +126,16 @@ public class ServiceTest {
     @Test
     @SneakyThrows
     public void testOrderReceivedStatisticsJobHandler(){
-/*        cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
+        cn.hutool.core.date.DateTime dateTime = DateUtil.parse("2019-11-29", "yyyy-MM-dd");
      //   cn.hutool.core.date.DateTime offset = DateUtil.offset(dateTime, DateField.DAY_OF_MONTH, 1);
-        orderReceivedStatisticsJobHandler.execute("2019-11-29");*/
-        LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
-        LocalDate endLocalDate = LocalDate.of(2019,11,28);
+        orderReceivedStatisticsJobHandler.execute("2019-11-29");
+       /* LocalDate startLocalDate = LocalDate.of(2019, 10, 1);
+        LocalDate endLocalDate = LocalDate.of(2019,11,29);
         while (startLocalDate.isBefore(endLocalDate)){
             String dateStr = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
             startLocalDate = startLocalDate.plusDays(1);
             orderReceivedStatisticsJobHandler.execute(dateStr);
-        }
+        }*/
 
     }
 }