Merge branch 'feature_chw_zjw' into master-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -126,6 +126,19 @@ public interface UserRestInterface  {
         return  null;
     }
 
+    default Integer getBusinessUserCompanyId(){
+        return getBusinessUserCompanyIds() == null? null : getBusinessUserCompanyIds().get(0);
+    }
+
+    default Integer getBgUserCompanyId(){
+        UserDTO userDTO = getAdminUserInfoV2();
+        if(userDTO != null && CollUtil.isNotEmpty(userDTO.getCompanyIds())) {
+            return userDTO.getCompanyIds().get(0);
+        } else {
+            return null;
+        }
+    }
+
     default UserDTO getBusinessUserByAppUser(){
         String currentUserName = BaseContextHandler.getUsername();
         if (StrUtil.isNotBlank(currentUserName)){

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

@@ -93,7 +93,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
      * @param specialRent
      * @param userDTO
      */
-    public void addRent(@RequestBody SpecialRent specialRent, UserDTO userDTO) {
+    public void addRent(@RequestBody SpecialRent specialRent, UserDTO userDTO, Integer currentCompanyId) {
         AssertUtils.isBlank(userDTO);
         AssertUtils.isBlank(specialRent.getUnitPrice());
         if(StrUtil.isBlank(specialRent.getVehicleId())) {
@@ -123,6 +123,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
         specialRent.setCategoryId(vehicle.getCategoryId());
         specialRent.setGoodsType(vehicle.getGoodsType());
         specialRent.setPriceType(vehicle.getPriceType());
+        specialRent.setPublishCompanyId(currentCompanyId);
 
         //缓存商品信息
         specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString());

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

@@ -231,6 +231,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
             setStatus(ShuntApply.STATUS_ORDER);
             setOrderStatus(ShuntApply.ORDER_STATUS_TOPAY);
             setRealAmount(bo.getOrder().getRealAmount());
+            setOrderId(bo.getOrder().getId());
         }});
         return ObjectRestResponse.succ(bo.getOrder());
     }
@@ -363,7 +364,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         shuntApply.setOrderNo(detail.getOrder().getNo());
         shuntApply.setOverTime(DateUtil.offsetHour(DateUtil.date(), 1).getTime());
         shuntApply.setConfirmUserId(userDTO.getId());
-        shuntApply.setConfirmCompanyId(userDTO.getCompanyId());
+        shuntApply.setConfirmCompanyId(getBusinessUserCompanyId());
         shuntApply.setBookRecordId(detail.getBookRecordId());
         baseBiz.updateSelectiveByIdRe(shuntApply);
 
@@ -432,7 +433,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         UserDTO userDTO = getBusinessUserByAppUser();
         AssertUtils.isBlank(userDTO);
         PageDataVO<ShuntApplyController.ShuntApplyVO> pages = PageDataVO.pageInfo(dto.initQuery(), () -> baseBiz.selectByWeekend(w -> {
-            w.andEqualTo(ShuntApply::getConfirmUserId, userDTO.getId());
+            w.andEqualTo(ShuntApply::getConfirmCompanyId, getBusinessUserCompanyId());
             w.andEqualTo(ShuntApply::getIsBizdel, SYS_FALSE);
             if(StrUtil.isNotBlank(dto.getMultiStatus())) {
                 w.andIn(ShuntApply::getStatus, CollUtil.toList(dto.getMultiStatus().split(",")));

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

@@ -68,7 +68,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     public ObjectRestResponse appBusinessAddRent(@RequestBody SpecialRent specialRent) {
         UserDTO userDTO = getBusinessUserByAppUser();
 
-        baseBiz.addRent(specialRent, userDTO);
+        baseBiz.addRent(specialRent, userDTO, getBusinessUserCompanyId());
 
         return ObjectRestResponse.succ();
     }
@@ -152,7 +152,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andEqualTo(SpecialRent::getIsDel, SYS_FALSE);
-            w.andEqualTo(SpecialRent::getPublishUserId, userDTO.getId());
+            w.andEqualTo(SpecialRent::getPublishCompanyId, getBusinessUserCompanyId());
             return w;
         }, " crt_time desc "), SpecialRentVO.class);
 
@@ -208,6 +208,8 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
             setId(specialRent.getId());
             setStatus(SpecialRent.STATUS_ORDER);
             setOrderStatus(SpecialRent.ORDER_STATUS_TOPAY);
+            setJoinUserId(getCurrentUserIdInt());
+            setOrderId(bo.getOrder().getId());
         }});
         return ObjectRestResponse.succ(bo.getOrder());
     }

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

@@ -67,7 +67,7 @@ public class BgSpecialRentController extends BaseController<SpecialRentBiz, Spec
     @ApiOperation(value = "添加特惠租车")
     public ObjectRestResponse businessAddRent(@RequestBody SpecialRent specialRent) {
         UserDTO userDTO = getAdminUserInfoV2();
-        baseBiz.addRent(specialRent, userDTO);
+        baseBiz.addRent(specialRent, userDTO, getBgUserCompanyId());
 
         return ObjectRestResponse.succ();
     }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleVO.java

@@ -72,6 +72,10 @@ public class VehicleVO extends Vehicle {
 
     private List<VehicleExtensionVO> vehicleExtensions;
 
+    public void setExtensionVOS(List<VehicleExtensionVO> extensionVOS) {
+        this.extensionVOS = extensionVOS;
+    }
+
     private String manageProvinceName;
 
     private String manageCityName;

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

@@ -100,6 +100,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     VehicleHolidayPriceInfoBiz vehicleHolidayPriceInfoBiz;
 
+    @Autowired
+    VehicleExtensionBiz extensionBiz;
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -704,10 +707,25 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
     }
 
+    @GetMapping("app/unauth/website/selectList")
+    @ApiModelProperty("店铺商品列表(官网)")
+    @IgnoreUserToken
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> websiteSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+        vehicleFindAppDTO.setState(Vehicle.STATE_UP);
+        vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
+        PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO> pageVo = baseBiz.appSelectList(vehicleFindAppDTO);
+        if(CollUtil.isNotEmpty(pageVo.getData())) {
+            pageVo.getData().forEach(v -> {
+                v.setVehicleExtensions(extensionBiz.getTree(v.getId()));
+            });
+        }
+        return  ObjectRestResponse.succ(pageVo);
+    }
+
     @GetMapping("app/unauth/shop/headSelectList")
     @ApiModelProperty("店铺商品列表(头部输入框)")
     @IgnoreUserToken
-    public  ObjectRestResponse<PageDataVO<VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
         vehicleFindAppDTO.setState(Vehicle.STATE_UP);
         vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
@@ -723,6 +741,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     static public class VehicleVO extends Vehicle {
         private VehicleModel vehicleModel;
         private List<VehiclePlatCata> vehiclePlatCatas;
+
         private List<VehicleModelCalendarPriceDTO> priceDTOS;
         /**
          * 价格开始日期