Merge remote-tracking branch 'origin/master'

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

@@ -305,6 +305,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                 types.add(DeductionTypeEnum.VIOLATE_ADVANCE.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_DELAY.getCode());
+                types.add(DeductionTypeEnum.VIOLATE_CHANGE_C.getCode());
                 orderStatistics.setDefaultMoney(get(OrderAccountDeductions, types));
 
 

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

@@ -111,7 +111,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
                 return ObjectRestResponse.succ(baseBiz.getTourHomePageOrderData(companyIds));
             }
             //只统计会员订单
-            if (TYPE_MEMBER.equals(type)||DATA_AUTHORITY.equals(user.getDataAll())) {
+            if (TYPE_MEMBER.equals(type)&&DATA_AUTHORITY.equals(user.getDataAll())) {
                 return ObjectRestResponse.succ(baseBiz.getMemberHomePageOrderData(companyIds));
             }
             //所有订单

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

@@ -333,9 +333,6 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         pageDataVO.setPageNum(memberOrderFindDTO.getPage());
         pageDataVO.setPageSize(memberOrderFindDTO.getLimit());
         pageDataVO.setData(Collections.EMPTY_LIST);
-
-        String name = memberOrderFindDTO.getLevel()==null?"":memberOrderFindDTO.getLevel()==1?"普通":memberOrderFindDTO.getLevel()==2?"黄金":memberOrderFindDTO.getLevel()==3?"钻石":null;
-        memberOrderFindDTO.setLevelName(name);
         if (Objects.nonNull(memberOrderFindDTO.getEndPayTime())){
             Long payEndTime = memberOrderFindDTO.getEndPayTime()+(1000*60*60*24);
             memberOrderFindDTO.setEndPayTime(payEndTime);
@@ -407,40 +404,29 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
 
     private MemberOrderStatisticsBo getMemberOrderStatisticsBo(List<MemberOrderBo> baseOrders){
         MemberOrderStatisticsBo memberOrderStatisticsBo = new MemberOrderStatisticsBo();
-        baseOrders.stream().peek(x->{
-            if(x.getName().contains("黄金")){
-                x.setDesc("黄金");
-            }
-            if (x.getName().contains("钻石")){
-                x.setDesc("钻石");
-            }
-            if (x.getName().contains("普通")){
-                x.setDesc("普通");
-            }
-        }).count();
-        Map<String, List<MemberOrderBo>> baseOrderMap = baseOrders.stream().collect(Collectors.groupingBy(MemberOrderBo::getDesc, Collectors.toList()));
-        Map<String, List<MemberOrderBo>> baseOrderHasPayMap = baseOrders.stream().filter(x->x.getHasPay()==1).collect(Collectors.groupingBy(MemberOrderBo::getDesc, Collectors.toList()));
+        Map<Integer, List<MemberOrderBo>> baseOrderMap = baseOrders.stream().collect(Collectors.groupingBy(MemberOrderBo::getMemberLevel, Collectors.toList()));
+        Map<Integer, List<MemberOrderBo>> baseOrderHasPayMap = baseOrders.stream().filter(x->x.getHasPay()==1).collect(Collectors.groupingBy(MemberOrderBo::getMemberLevel, Collectors.toList()));
         memberOrderStatisticsBo.setOrderNum(baseOrders.size());
         BigDecimal totalAmount = baseOrders.stream().filter(x->x.getHasPay()==1).map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalAmount(totalAmount);
 
-        List<MemberOrderBo> diamondOrders = baseOrderMap.get(levelEnum.DIAMOND.getDesc());
+        List<MemberOrderBo> diamondOrders = baseOrderMap.get(levelEnum.DIAMOND.getLevel());
         memberOrderStatisticsBo.setDiamondOrderNum(diamondOrders==null?0:diamondOrders.size());
-        List<MemberOrderBo> diamondHashPayOrders =  baseOrderHasPayMap.get(levelEnum.DIAMOND.getDesc());
+        List<MemberOrderBo> diamondHashPayOrders =  baseOrderHasPayMap.get(levelEnum.DIAMOND.getLevel());
         diamondHashPayOrders = diamondHashPayOrders==null?Collections.EMPTY_LIST:diamondHashPayOrders;
         BigDecimal diamondAmount = diamondHashPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         memberOrderStatisticsBo.setTotalDiamondAmount(diamondAmount);
 
-        List<MemberOrderBo> goldOrders = baseOrderMap.get(levelEnum.GOLD.getDesc());
+        List<MemberOrderBo> goldOrders = baseOrderMap.get(levelEnum.GOLD.getLevel());
         memberOrderStatisticsBo.setGoldOrderNum(goldOrders==null?0:goldOrders.size());
-        List<MemberOrderBo> goldHasPayOrders = baseOrderHasPayMap.get(levelEnum.GOLD.getDesc());
+        List<MemberOrderBo> goldHasPayOrders = baseOrderHasPayMap.get(levelEnum.GOLD.getLevel());
         goldHasPayOrders = goldHasPayOrders==null?Collections.EMPTY_LIST:goldHasPayOrders;
         BigDecimal goldAmount = goldHasPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalGoldAmount(goldAmount);
 
-        List<MemberOrderBo> generalOrders = baseOrderMap.get(levelEnum.GENERAL.getDesc());
+        List<MemberOrderBo> generalOrders = baseOrderMap.get(levelEnum.GENERAL.getLevel());
         memberOrderStatisticsBo.setGeneralOrderNum(generalOrders==null?0:generalOrders.size());
-        List<MemberOrderBo> generalHasPayOrders = baseOrderHasPayMap.get(levelEnum.GENERAL.getDesc());
+        List<MemberOrderBo> generalHasPayOrders = baseOrderHasPayMap.get(levelEnum.GENERAL.getLevel());
         generalHasPayOrders = generalHasPayOrders==null?Collections.EMPTY_LIST:generalHasPayOrders;
         BigDecimal generalAmount = generalHasPayOrders.stream().map(MemberOrderBo::getOrderAmount).reduce(BigDecimal.ZERO, (x, y) -> x.add(y));
         memberOrderStatisticsBo.setTotalGeneralAmount(generalAmount);
@@ -448,16 +434,26 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         return memberOrderStatisticsBo;
     }
     private enum  levelEnum{
-        DIAMOND("钻石"),
-        GOLD("黄金"),
-        GENERAL("普通");
+        DIAMOND(3,"钻石"),
+        GOLD(2,"黄金"),
+        GENERAL(1,"普通");
 
-        levelEnum(String desc) {
+        levelEnum(Integer level,String desc) {
+            this.level = level;
             this.desc = desc;
         }
 
+        private Integer level;
         private String desc;
 
+        public Integer getLevel() {
+            return level;
+        }
+
+        public void setLevel(Integer level) {
+            this.level = level;
+        }
+
         public String getDesc() {
             return desc;
         }

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

@@ -285,6 +285,7 @@
     </select>
 
     <select id="findMemberOrders" resultType="com.xxfc.platform.order.pojo.dto.MemberOrderBo">
+    select bo.*,omd.member_level AS `memberLevel` from (
         SELECT
         `id`,
         `no` AS `orderNo`,
@@ -298,7 +299,6 @@
         `coupon_amount` AS `couponAmount`,
         `user_id` AS `userId`,
         `has_pay` AS `hasPay`,
-        `member_level` AS `memberLevel`,
         `facilitate_id` AS `facilitateId`,
         `facilitate_phone` AS `facilitatePhone`
         FROM
@@ -332,15 +332,18 @@
         <if test="endPayTime!=null and startPayTime==null">
             and `pay_time` <![CDATA[<=#{endPayTime}]]>
         </if>
-            <if test="levelName!=null and levelName!=''">
-                and `name` like CONCAT('%',#{levelName},'%')
-            </if>
         <if test="userIds!=null and userIds.size()>0">
             and `user_id` IN
             <foreach collection="userIds" item="userId" separator="," open="(" close=")">
                 #{userId}
             </foreach>
         </if>
-        ORDER BY `crt_time` DESC
+        ) AS `bo`
+        INNER JOIN (select  * from `order_member_detail` where  1=1
+        <if test="level!=null">
+          and  `member_level`=#{level}
+        </if>
+        ) AS `omd` ON omd.order_id=bo.id
+        ORDER BY bo.`creatTime` DESC
     </select>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -22,6 +22,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.*;
+import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
@@ -89,6 +90,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     @Autowired
     private VehicleBookInfoBiz vehicleBookInfoBiz;
 
+    @Autowired
+    private VehicleJobHandler vehicleJobHandler;
+
 
     @Override
     public UserFeign getUserFeign() {
@@ -237,6 +241,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 //                }
             }
             mapper.insertSelective(vehicle);
+            //排班表插入
+            vehicleJobHandler.InsertBookInfo(vehicle.getId());
+
         }
         return RestResponse.suc();
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/jobhandler/VehicleJobHandler.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author libin
@@ -66,4 +67,21 @@ public class VehicleJobHandler extends IJobHandler {
             return FAIL;
         }
     }
+
+    public void  InsertBookInfo(String vehicleId){
+        XxlJobLogger.log("----添加新建的车辆【{}】的bookInfo",vehicleId);
+        List<VehicleBookInfo> bookInfos = Stream.of(0, 1, 2).map(x -> {
+            LocalDate date = LocalDate.now().plusMonths(x);
+            int year = date.getYear();
+            int month = date.getMonthValue();
+            String yearAndMonth = String.format("%d-%02d", year, month);
+
+            VehicleBookInfo vehicleBookInfo = new VehicleBookInfo();
+            vehicleBookInfo.setVehicle(vehicleId);
+            vehicleBookInfo.setYearMonth(yearAndMonth);
+            return vehicleBookInfo;
+        }).collect(Collectors.toList());
+        XxlJobLogger.log("----插入车型对象:【{}】",bookInfos);
+        vehicleBookInfoBiz.InsertBatch(bookInfos);
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -871,7 +871,7 @@
                         bc.id = #{parkBranchCompanyId}
                     </otherwise>
                 </choose>
-            where vm.isdel = 0 and vm.status = 0)
+            where vm.isdel = 0 and vm.status = 0 and vm.app_show = 1)
         </if>
         <if test="lon != null and lat != null">
             order by