Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppBranchCompanyController.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.rest;
 import com.github.wxiaoqi.security.admin.biz.BranchCompanyBiz;
 import com.github.wxiaoqi.security.admin.biz.BranchCompanyGiveBiz;
 import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
 import com.github.wxiaoqi.security.admin.entity.BranchCompanyGive;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
 import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
@@ -71,6 +72,12 @@ public class AppBranchCompanyController extends BaseController<BranchCompanyBiz>
         return ObjectRestResponse.succ(list.get(0));
     }
 
+    @PostMapping("addOrUpd")
+    @ApiModelProperty("店铺更新")
+    public  ObjectRestResponse addOrUpd(@RequestBody BranchCompany branchCompany) {
+        return baseBiz.addOrUpd(branchCompany);
+    }
+
 
     @GetMapping("checkGive")
     @ApiModelProperty("检查点赞")

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java

 package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +20,22 @@ import lombok.Data;
 public class SpecialRent implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public static final int STATUS_DEL = 0;
+	public static final int STATUS_CRT = 1;
+	public static final int STATUS_CNL = 2;
+	public static final int STATUS_ORDER = 4;
+	public static final int STATUS_AUTOCNL_REQUIRE = 501;
+	public static final int STATUS_AUTOCNL_ORDER = 502;
+	public static final int STATUS_AUTOCNL_TOPAY = 503;
+	public static final int STATUS_AUTOCNL_PAYED = 504;
+	public static final int STATUS_ERR = 6;
+	public static final int STATUS_SUCC = 7;
+
+
+	public static final int ORDER_STATUS_TOPAY = 1;
+	public static final int ORDER_STATUS_PAY = 2;
+	public static final int ORDER_STATUS_CANCEL = 3;
+
 	/**
     *  主键
    */
@@ -201,5 +218,17 @@ public class SpecialRent implements Serializable {
 	@ApiModelProperty(value = "商品类型 1--房车；2--机车；3--游艇")
     private Integer goodsType;
 
+	/**
+	 * 单价，每日价格
+	 */
+	@Column(name = "unit_price")
+	@ApiModelProperty(value = "单价，每日价格")
+	private BigDecimal unitPrice;
 
+	/**
+	 * 商品信息，json
+	 */
+	@Column(name = "goods_json")
+	@ApiModelProperty(value = "商品信息json")
+	private String goodsJson;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -34,4 +34,8 @@ public interface OrderFeign {
     @PostMapping(value = "/count/basebase/findOrdersByorderIdV2")
     ObjectRestResponse<List<OrderDTO>> findOrdersByorderIdV2(@RequestBody List<Integer> orderIds);
 
+
+    @GetMapping(value = "/specialRent/app/unauth/checkHasSpecialRentFegin")
+    public ObjectRestResponse<Boolean> checkHasSpecialRentFegin(String vehicleId);
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -29,6 +29,11 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
      */
     private Integer applyOrderSign = 0;
 
+    /**
+     * 是否特惠租车下订单
+     */
+    private Integer specialOrderSign = 0;
+
     /**
      * 是否使用出租免费天数
      */

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.collection.CollUtil;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.order.entity.SpecialRent;
 import com.xxfc.platform.order.mapper.SpecialRentMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.List;
+
 /**
  * 特惠租车
  *
@@ -15,4 +18,22 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
+
+    /**
+     * 判断车辆是否有进行中的特惠租车
+     * @param vehicleId
+     * @return
+     */
+    public Boolean checkHasSpecialRent(String vehicleId) {
+        List<SpecialRent> list = selectByWeekend(w -> {
+            w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(SpecialRent.STATUS_CRT, SpecialRent.STATUS_ORDER))
+             .andEqualTo(SpecialRent::getVehicleId, vehicleId);
+            return w;
+        });
+
+        if(list.size() > 0) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
 }
\ No newline at end of file

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

@@ -98,7 +98,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     }
 
     /**
-     * 创建订单及其子项
+     * 创建订单及其子项 （需求预定申请）
      * @param detail
      */
     public void applyCreateOrder(RentVehicleBO detail, String orderNo) {
@@ -112,12 +112,33 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         handleDetail(detail);
     }
 
+//    /**
+//     * 创建订单及其子项（特惠租车）
+//     * @param detail
+//     */
+//    public void specialCreateOrder(RentVehicleBO detail, String orderNo) {
+//        //初始化
+//        applyInitDetail(detail, orderNo);
+//        //计算价格
+//        handleCalculate(detail);
+//        //插入baseOrder
+//        baseOrderBiz.insertSelective(detail.getOrder());
+//        //处理detail
+//        handleDetail(detail);
+//    }
+
     public void applyInitDetail(RentVehicleBO bo, String orderNo) {
         BaseOrder order = createBaseOrder(bo.getOrderOrigin(), bo.getFacilitatePhone(), bo.getAppUserDTO(), orderNo);
         bo.setOrder(order);
         initDetailSecond(bo);
     }
 
+//    public void specialInitDetail(RentVehicleBO bo, String orderNo) {
+//        BaseOrder order = createBaseOrder(bo.getOrderOrigin(), bo.getFacilitatePhone(), bo.getAppUserDTO(), orderNo);
+//        bo.setOrder(order);
+//        initDetailSecond(bo);
+//    }
+
     @Override
     public void initDetail(RentVehicleBO bo) {
         super.initDetail(bo);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -41,6 +41,10 @@ public interface VehicleFeign {
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
     public RestResponse<List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
 
+    //提车
+    @PostMapping("/backstage/vehicle/unauth/app/updVehicleFeign")
+    public ObjectRestResponse updVehicleFeign(@RequestBody Vehicle vehicle);
+
     //提车
     @PostMapping("/active/small/departure")
     public RestResponse departureBySmall(@RequestBody VehicleDepartureVo departureVo);

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest.admin;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleExtensionBiz;
@@ -32,10 +33,6 @@ import java.util.stream.Collectors;
 @Api(tags = {"商品申请"})
 public class AdminVehicleController extends BaseController<VehicleBiz>{
 
-
-
-
-
     @Autowired
     UserFeign userFeign;
 
@@ -73,6 +70,14 @@ public class AdminVehicleController extends BaseController<VehicleBiz>{
         return ObjectRestResponse.succ();
     }
 
+    @PostMapping("/unauth/app/updVehicleFeign")
+    @IgnoreUserToken
+    @ApiModelProperty("更新商品信息Feign")
+    public ObjectRestResponse updVehicleFeign(@RequestBody Vehicle vehicle) {
+        baseBiz.updateSelectiveById(vehicle);
+        return ObjectRestResponse.succ();
+    }
+
     @PostMapping("delVehicle")
     @ApiModelProperty("更新商品信息")
     public  ObjectRestResponse delVehicle(@RequestBody Vehicle vehicle) {

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

@@ -1417,7 +1417,9 @@
         v.*,
         b.cn_name as brandName,
         c.`name` categoryName,
-        bc.`name` as companyName
+        bc.`name` as companyName,
+        bc1.`leader` as manageCompanyLeader,
+        bc1.`leader_contact_info` as manageCompanyLeaderContact
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
         </if>
@@ -1425,6 +1427,7 @@
         LEFT JOIN vehicle_brand b ON v.brand_id=b.id
         LEFT JOIN vehicle_category c ON v.category_id=c.id
         LEFT JOIN branch_company bc ON v.subordinate_branch=bc.id
+        LEFT JOIN branch_company bc1 ON v.manage_company_id=bc1.id
         <where>
             v.is_del = 0
             <if test="addrCity !=null">