Merge branch 'master' into dev

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

@@ -3,11 +3,9 @@ package com.xxfc.platform.order.biz.inner;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.common.constant.CommonConstants;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.app.feign.ConfigFeign;
@@ -24,9 +22,9 @@ import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
-import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
 import com.xxfc.platform.order.pojo.calculate.OrderRefundPriceVO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.VehicleItemDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -41,8 +39,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -139,7 +135,7 @@ public class OrderCalculateBiz {
                 //融入日期价格
             //consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
             for(int i = offsetDays; i < (offsetDays+ consumeDays); i++) {
-                consumeAmount = consumeAmount.add(vmcpds.get(i).getConsumeAmount());
+                consumeAmount = consumeAmount.add(vmcpds == null || vmcpds.size() <=0 ? new BigDecimal(0) : vmcpds.get(i).getConsumeAmount());
             }
 
             if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {

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

@@ -108,11 +108,17 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @CrossOrigin
     public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(BaseOrderController.QueryOrderList dto) {
-		UserDTO userDTO = getAdminUserInfo();
-		if (userDTO == null) {
-			return ObjectRestResponse.succ(new PageDataVO<>());
-		}
-
+        if (dto.getStartTime() != null) {
+            if (dto.getEndTime() == null) {
+                dto.setEndTime(new Date().getTime());
+            }
+        }
+        //车辆排班表查询订单详情
+        if (dto.getOneNo()!=null) {
+            dto.setPage(1);
+            dto.setLimit(1);
+            dto.setType(1);
+        }
         if (StringUtils.isNotBlank(dto.getPhone()) || StringUtils.isNotBlank(dto.getRealName())) {
             List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(), dto.getRealName());
             if (CollectionUtil.isNotEmpty(appUserLoins)) {
@@ -122,11 +128,19 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
         }
-        //获取权限公司列表
-        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-        List<Integer> companyId = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-        dto.setCompanyIds(companyId);
-        //大区搜索
+
+
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.succ(new PageDataVO<>());
+        }
+        //权限
+        if (userDTO.getDataAll()!=1&&dto.getType() != null && dto.getType() != 3) {
+            List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+            List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+            dto.setCompanyIds(companyIds);
+        }
+        //大区查询
         if (dto.getZoneId() != null) {
             if (userDTO.getDataAll() != 1 && !dto.getZoneId().equals(userDTO.getZoneId())) {
                 return ObjectRestResponse.succ(new PageDataVO<>());
@@ -437,12 +451,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return baseOrderBiz.save(orderRentVehicleDetail);
     }
 
-    @GetMapping(value = "/getAll")
-    @ResponseBody
-    public ObjectRestResponse getAllOrderList(BaseOrderController.QueryOrderList dto) {
-        return backgroundBaseOrderBiz.getAllOrderList(dto);
-    }
-
     @Data
     public static class ChangeVehicleDTO {
         String no;

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

@@ -263,11 +263,11 @@
         FROM
         base_order b1
         LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id
-        LEFT JOIN xxfc_vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
-        LEFT JOIN xxfc_vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
-        LEFT JOIN xxfc_vehicle.vehicle v1 ON v1.id = o1.vehicle_id
+        LEFT JOIN vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
+        LEFT JOIN vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
+        LEFT JOIN vehicle.vehicle v1 ON v1.id = o1.vehicle_id
         LEFT JOIN xxfc_third_platform.id_information a1 ON b1.user_id = a1.user_login_id
-        LEFT JOIN ag_admin_v2.app_user_login a2 ON a2.id = b1.user_id
+        LEFT JOIN ag_admin_v1.app_user_login a2 ON a2.id = b1.user_id
         <where>
             <if test="userIds != null and userIds.size() > 0">
                 and b1.user_id in

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

@@ -4,14 +4,16 @@
     <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition"
             resultType="com.xxfc.platform.vehicle.pojo.VehicleModelVo">
         SELECT * from
-        (select vm.*,v.sum,v2.leasableQuantity,vpc.`name` brandName,vpc2.name numberName from vehicle_model vm left JOIN
-        (select model_id as mid, count(1) as sum FROM vehicle GROUP BY mid) v
-        on vm.id=v.mid left JOIN
-        (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`use_type`=1 GROUP BY model_id) v2
+        (select vm.*,v.sum,v2.leasableQuantity,vpc.`name` brandName,vpc2.name numberName from vehicle_model vm
+        left JOIN
+        (select model_id as mid, count(1) as sum FROM vehicle where is_del= 0 GROUP BY mid) v
+        on vm.id=v.mid
+        left JOIN
+        (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`use_type`=1 and is_del= 0 GROUP BY model_id) v2
         on v.mid=v2.mid2
         left join (SELECT id,name FROM vehicle_plat_cata where state=0) vpc on vm.brand=vpc.id
         left join (SELECT id,name FROM vehicle_plat_cata where state=0) vpc2 on vm.number=vpc2.id
-        where isdel = 0
+        where vm.isdel = 0
         ) vmqc WHERE 1=1
 
         <if test="isDel !=null ">