Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -3,17 +3,16 @@ package com.xxfc.platform.app.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSON;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.EntityUtils;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.entity.vo.WithDrawRuleVo;
+import com.xxfc.platform.app.mapper.CofigMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.app.entity.Cofig;
-import com.xxfc.platform.app.mapper.CofigMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;

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,19 +159,45 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }
 
         //插入随声物品item
-        Map<String, AccompanyingItemVo> accompanyingItemMap = vehicleFeign.listAccompanyingItem().getData()
-                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
+        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>());
         }
-        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())));
+        Map<String, OrderAccompanyDTO> orderAccompanyDTOMap = bo.getAccompanyItems()
+                .parallelStream().collect(Collectors.toMap(en -> en.getId().toString(), en -> en));
+
+        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);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -180,10 +180,12 @@ public class VehicleBookRecord {
      */
     private String orderNo;
 
+    @Column(name = "vehicle_username")
     private String vehicleUsername;
 
+    @Column(name = "vehicle_user_phone")
     private String vehicleUserPhone;
 
-    @Column(name = "vehicle_upkeep_item_ids")
+    @Column(name = "upkeep_ids")
     private String upkeepIds;
 }
\ No newline at end of file

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

@@ -40,6 +40,9 @@ public class VehicleJobHandler extends IJobHandler {
             int nowMonth = date.getMonthValue();
             int month = nowMonth + VehicleBookInfoBiz.MONTH_INTERVAL > 12 ? (VehicleBookInfoBiz.MONTH_INTERVAL + nowMonth) - 12 : nowMonth + VehicleBookInfoBiz.MONTH_INTERVAL;
             year = month > nowMonth ? year : year + 1;
+            if ("8".equals(s) || "9".equals(s)){
+                month = Integer.valueOf(s);
+            }
             String yearAndMonth = String.format("%d-%d", year, month);
             XxlJobLogger.log("----查询到的车型ids:【{}】",existVehicleIds);
             if (CollectionUtils.isNotEmpty(existVehicleIds)) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -27,6 +27,7 @@ import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
 import io.swagger.annotations.Api;
@@ -74,6 +75,9 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @Autowired
     private VehicleWarningMsgBiz vehicleWarningMsgBiz;
 
+    @Autowired
+    private VehicleJobHandler vehicleJobHandler;
+
 
     private static Integer MAX_DRIVING_LICENSE_SIZE = 10 * 1024 * 1024;//10M
 
@@ -547,4 +551,11 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return baseBiz.delVehicleById(id);
     }
 
+    @GetMapping("/app/unauth/data/{month}")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public  RestResponse dataCo(@PathVariable(value = "month") String month) throws Exception {
+        vehicleJobHandler.execute(month);
+        return RestResponse.suc();
+    }
 }