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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserSellingWater.java

@@ -129,7 +129,7 @@ public class AppUserSellingWater implements Serializable {
      */
     @Column(name = "extract")
 	@ApiModelProperty(value = "提成百分比")
-    private Integer extract;
+    private BigDecimal extract;
 	
 	    /**
      *  是否入账：0-未入账；1-已入账

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseCommissionRatio.java

@@ -35,7 +35,7 @@ public class BaseCommissionRatio implements Serializable {
 
     @Column(name = "extract")
 	@ApiModelProperty(value = "拥金比例")
-    private Integer extract;
+    private BigDecimal extract;
 
 
 	@Column(name = "content")

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseOrderAcceptDetailed.java

@@ -82,7 +82,7 @@ public class BaseOrderAcceptDetailed implements Serializable {
 
 	@Column(name = "extract")
 	@ApiModelProperty(value = "抽成比例")
-	private Integer extract;
+	private BigDecimal extract;
 
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -168,7 +168,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         sellingWater.setAcceptId(zAcceptId);
         sellingWater=selectOne(sellingWater);
         if (sellingWater != null ){
-            BigDecimal commission=orderAmount.multiply(new BigDecimal(sellingWater.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+            BigDecimal commission=orderAmount.multiply(sellingWater.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
             sellingWater.setAcceptId(acceptId);
             sellingWater.setWaiting(1);
             sellingWater.setStatus(1);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -131,7 +131,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                 if (type != 3 && mchId  == 0){
                     continue;
                 }
-                BigDecimal divisionAmount=orderAmount.multiply(new BigDecimal(commissionRatio.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                BigDecimal divisionAmount=orderAmount.multiply(commissionRatio.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                 BaseOrderAcceptDetailed acceptDetailed=new BaseOrderAcceptDetailed();
                 BeanUtils.copyProperties(orderWaterDTO,acceptDetailed);
                 acceptDetailed.setMchId(mchId);
@@ -188,7 +188,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                                 insertSelective(acceptDetailed1);
                             }
                         }else {
-                            BigDecimal divisionAmount=orderAmount.multiply(new BigDecimal(acceptDetailed1.getExtract())).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
+                            BigDecimal divisionAmount=orderAmount.multiply(acceptDetailed1.getExtract()).divide(new BigDecimal(100)).setScale(2,   BigDecimal.ROUND_HALF_UP);
                             acceptDetailed1.setDivisionAmount(divisionAmount);
                             insertSelective(acceptDetailed1);
                             amount=amount.add(divisionAmount);

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -195,7 +195,7 @@
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
         LEFT JOIN app_user_detail pd ON pl.id = pd.userid
-        LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
+        LEFT JOIN chw_app.app_version_mark z ON z.mark = d.register_source
         WHERE
         l.isdel = 0
         and

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/CouponFindDTO.java

@@ -25,4 +25,14 @@ public class CouponFindDTO  extends PageParam {
      private List<Integer> companyIds;
 
      private Integer bizType;
+
+     private Integer isLed;
+
+     private Long userId;
+
+     private Long ledTime;
+
+     public  Long getLedTime(){
+          return  System.currentTimeMillis();
+     }
 }

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityCouponVo.java

+package com.xxfc.platform.activity.vo;
+
+
+import com.xxfc.platform.activity.entity.Coupon;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 15:00
+ */
+@Data
+public class ActivityCouponVo extends Coupon {
+
+    @ApiModelProperty("是否使用")
+    private Integer isUsd;
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.activity.dto.CouponDTO;
 import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.entity.UserCoupon;
+import com.xxfc.platform.activity.vo.ActivityCouponVo;
 import com.xxfc.platform.activity.vo.CouponPagVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import com.xxfc.platform.activity.vo.CouponVo;
@@ -179,4 +180,11 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
         example.setOrderByClause("crt_time DESC");
         return   mapper.selectByExample(example);
     }
+
+
+    public PageDataVO<ActivityCouponVo> selectList(CouponFindDTO couponFindDTO) {
+        Integer page = couponFindDTO.getPage() == null ? 1 : couponFindDTO.getPage();
+        Integer limit = couponFindDTO.getLimit() == null ? 10 : couponFindDTO.getLimit();
+        return  PageDataVO.pageInfo(page, limit, () -> mapper.selectList(couponFindDTO));
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/CouponMapper.java

 package com.xxfc.platform.activity.mapper;
 
 import com.xxfc.platform.activity.dto.CouponDTO;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.vo.ActivityCouponVo;
 import com.xxfc.platform.activity.vo.CouponTitleVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
-
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 优惠券表
@@ -27,4 +26,7 @@ public interface CouponMapper extends Mapper<Coupon> {
     List<Coupon> couponsByTickerNoList(@Param(value = "tickerNoList") List<String> tickerNoList);
 
     List<CouponDTO> findCouponsByIds(@Param("ids") List<Integer> ids);
+
+
+    List<ActivityCouponVo> selectList(CouponFindDTO couponFindDTO);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/CouponController.java

 package com.xxfc.platform.activity.rest;
 
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.activity.biz.CouponBiz;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
 import com.xxfc.platform.activity.entity.Coupon;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -29,4 +30,20 @@ public class CouponController extends BaseController<CouponBiz, Coupon> {
         return baseBiz.couponsByTickerNoList(tickerNoList);
     }
 
+
+    @ApiOperation("领劵中心")
+    @RequestMapping(value = "app/unauth/ledList", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public ObjectRestResponse ledList(CouponFindDTO couponFindDTO){
+        String userIdStr=getCurrentUserId();
+        Long userId=0L;
+        if (StringUtils.isNotBlank(userIdStr)){
+            userId=Long.parseLong(userIdStr);
+        }
+        couponFindDTO.setUserId(userId);
+        couponFindDTO.setStatus(1);
+        couponFindDTO.setIsLed(1);
+        return ObjectRestResponse.succ(baseBiz.selectList(couponFindDTO));
+    }
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -95,14 +95,14 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     }
 
     @ApiOperation("领取优惠卷")
-    @RequestMapping(value = "/coupon/led", method = RequestMethod.POST)
-    public ObjectRestResponse led() {
+    @RequestMapping(value = "ledCoupon/{couponId}", method = RequestMethod.POST)
+    public ObjectRestResponse ledCoupon(@PathVariable Integer couponId) {
         AppUserDTO userInfo = getUserInfo();
         Integer userId = userInfo.getUserid();
         if (userId == null) {
             return ObjectRestResponse.createDefaultFail();
         }
-        return  joinBiz.receiveCoupn(userId);
+        return  ObjectRestResponse.succ(baseBiz.userLedCoupon(userId,couponId));
     }
 
     @RequestMapping(value = "/getCoupon", method = RequestMethod.GET)
@@ -130,4 +130,17 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     }
 
 
+
+    @ApiOperation("领取优惠卷")
+    @RequestMapping(value = "/coupon/led", method = RequestMethod.POST)
+    public ObjectRestResponse led() {
+        AppUserDTO userInfo = getUserInfo();
+        Integer userId = userInfo.getUserid();
+        if (userId == null) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+        return  joinBiz.receiveCoupn(userId);
+    }
+
+
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/CouponMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.xxfc.platform.activity.mapper.CouponMapper">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.xxfc.platform.activity.entity.Coupon" id="couponMap">
+    <resultMap type="com.xxfc.platform.activity.vo.ActivityCouponVo" id="couponMap">
         <result property="id" column="id"/>
         <result property="title" column="title"/>
         <result property="icon" column="icon"/>
@@ -35,6 +35,7 @@
         <result property="updName" column="upd_name"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
+        <result property="isLed" column="isLed"/>
     </resultMap>
 
     <select id="selectTitles" resultType="com.xxfc.platform.activity.vo.CouponTitleVo">
@@ -66,4 +67,25 @@
      </foreach>
      </if>
     </select>
+
+    <select id="selectList" resultMap="couponMap" parameterType="com.xxfc.platform.activity.dto.CouponFindDTO">
+        select  c.*,IF(COUNT(uc.id) >0 ,1,0) as isLed  from `coupon` c
+        LEFT JOIN  (SELECT * FROM user_coupon
+        WHERE 1=1
+        <if test="userId != null and userId >= 0">
+            and  user_id=#{userId}
+        </if>
+        ) uc ON c.id=uc.coupon_id
+        where c.`is_del`=0
+        <if test="isLed != null and isLed >= 0">
+            and c.is_led=#{isLed}
+        </if>
+        <if test="status != null and status >= 0">
+            and c.status=#{status}
+        </if>
+        <if test="ledTime != null and ledTime > 0L" >
+            and (c.start_time &lt;= #{ledTime} or c.start_time  = 0) and (c.end_time >= #{ledTime} or c.end_time  = 0)
+        </if>
+        GROUP BY c.id
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -18,7 +18,7 @@ public class VehicleApply {
      * 主键(uuid)
      */
     @Id
-    private String id;
+    private Integer id;
 
 
 

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

+package com.xxfc.platform.vehicle.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.persistence.*;
+
+@Data
+@Table(name = "vehicle_manage_apply")
+public class VehicleManageApply {
+
+    @Id
+    @GeneratedValue(strategy=GenerationType.IDENTITY)
+    private Integer id;
+
+
+
+    @Column(name = "vehicle_id")
+    @ApiModelProperty("商品id")
+    private String vehicleId;
+
+
+
+    @Column(name = "type")
+    @ApiModelProperty("申请类型：1-申请经营；2-取消经营；3-还车")
+    private Integer type;
+
+
+    @Column(name = "apply_id")
+    @ApiModelProperty("申请公司id")
+    private Integer applyId;
+
+
+
+    @Column(name = "to_apply_id")
+    @ApiModelProperty("被申请公司id")
+    private Integer toApplyId;
+
+
+    @Column(name = "verify_id")
+    @ApiModelProperty("审核公司id")
+    private Integer verifyId;
+
+
+
+    @Column(name = "status")
+    @ApiModelProperty("状态：0-未审核；1-审核通过;2-审核失败")
+    private Integer status;
+
+
+
+    @ApiModelProperty("失败原因")
+    private String reason;
+
+
+    @Column(name = "crt_time")
+    private Long crtTime;
+
+
+    @Column(name = "upd_time")
+    private Long updTime;
+
+
+
+    @Column(name = "is_del")
+    @ApiModelProperty("是否删除：0-正常；1-删除")
+    private Integer isDel;
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehicleFindDTO.java

@@ -52,4 +52,7 @@ public class VehicleFindDTO extends PageParam implements DataInter {
     List<Integer> dataCompanyIds;
 
     Integer bizType;
+
+    @ApiModelProperty("店铺类型：1-店铺资产；2-店铺经营；3-店铺停靠")
+    private Integer  type;
 }

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

@@ -5,8 +5,8 @@ import com.xxfc.platform.vehicle.entity.VehicleApply;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class VehicleVO extends Vehicle {
@@ -21,12 +21,32 @@ public class VehicleVO extends Vehicle {
     private String categoryName;
 
 
-    @ApiModelProperty("店铺名称")
+    @ApiModelProperty("所属店铺名称")
     private String companyName;
 
+    @ApiModelProperty("经营店铺名称")
+    private String manageCompanyName;
+
+
+    @ApiModelProperty("停靠店铺名称")
+    private String parkCompanyName;
+
     private VehicleApply vehicleApply;
 
     private  List<VehicleExtensionVO> extensionVOS;
 
     private Double distance;
+
+
+    private String statusText;// 状态的处理
+
+
+     private String vehicleTitle;//头部标题
+
+
+    private Map<String,Object> handleOption; // 可操作的选项
+
+
+
+
 }
\ No newline at end of file

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

@@ -119,6 +119,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     @Autowired
     MQSenderFeign mqSenderFeign;
 
+    @Autowired
+    VehicleManageApplyBiz vehicleManageApplyBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -1662,9 +1665,95 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     }
 
     public ObjectRestResponse selectList(VehicleFindDTO vehicleFindDTO){
-        PageHelper.startPage(vehicleFindDTO.getPage(), vehicleFindDTO.getLimit());
-        PageInfo<VehicleVO> pageInfo = new PageInfo<>(getList(vehicleFindDTO));
-        return ObjectRestResponse.succ(PageDataVO.pageInfo(pageInfo));
+        Integer type=vehicleFindDTO.getType() == null ? 0 :vehicleFindDTO.getType();
+        if (type > 0){
+            List<Integer> dataCompanyIds=vehicleFindDTO.getDataCompanyIds() == null ? new ArrayList<>() : vehicleFindDTO.getDataCompanyIds();
+            if (vehicleFindDTO.getBranchId() != null && vehicleFindDTO.getBranchId() > 0){
+                dataCompanyIds.add(vehicleFindDTO.getBranchId());
+                vehicleFindDTO.setDataCompanyIds(dataCompanyIds);
+            }
+        }
+        PageDataVO<VehicleVO> dataVo = PageDataVO.pageInfo(vehicleFindDTO.initQuery(),()-> getList(vehicleFindDTO));
+        List<VehicleVO> list = dataVo.getData();
+        if (type > 0){
+            if(list != null && list.size() > 0){
+                for (VehicleVO vehicleVO : list){
+                    Map<String,Object> handleOption = new HashMap();
+                    handleOption.put("update", false);// 编辑操作
+                    handleOption.put("verify", false);// 审核操作
+                    handleOption.put("receive", false);// 收车操作
+                    handleOption.put("cancleManage", false);// 取消经营操作
+                    handleOption.put("applyManage", false);// 申请经营操作
+                    handleOption.put("return", false);// 还车操作
+                    Integer manageCompanyId = vehicleVO.getManageCompanyId() == null ? 0 :vehicleVO.getManageCompanyId(); //我的经营
+                    Integer subordinateBranc = vehicleVO.getSubordinateBranch() == null ? 0 :vehicleVO.getSubordinateBranch(); //我的资产
+                    Integer parkBranchCompanyId = vehicleVO.getParkBranchCompanyId() == null ? 0 :vehicleVO.getParkBranchCompanyId(); //我的停靠
+                    String vehicleId=vehicleVO.getId();
+                    String vehicleTitle="";
+                    String statusText="";
+                    if (type == 1){
+                        VehicleManageApply vehicleManageApply = vehicleManageApplyBiz.getApplyByOrder(vehicleId);
+                        //类型是申请经营并且状态是未审核
+                        if (vehicleManageApply !=null && vehicleManageApply.getType() == 1 && vehicleManageApply.getStatus() == 0){
+                            handleOption.put("verify", true);// 审核操作
+                            BranchCompany branchCompany = branchCompanyBiz.selectById(vehicleManageApply.getApplyId());
+                            vehicleTitle=branchCompany.getName()+"申请经营";
+                            //类型是还车并且状态是未审核
+                        }else if (vehicleManageApply != null && vehicleManageApply.getType() == 3 && vehicleManageApply.getStatus() == 0){
+                            handleOption.put("receive", true);// 收车操作
+                            BranchCompany branchCompany = branchCompanyBiz.selectById(vehicleManageApply.getApplyId());
+                            vehicleTitle=branchCompany.getName()+"已取消经营";
+                            statusText="待收车";
+                            //经营 == 资产
+                        }else if (manageCompanyId.equals(subordinateBranc) ){
+                            handleOption.put("update", true);// 编辑操作
+                        }else {
+                            statusText="已调出";
+                        }
+                    }else if (type == 2){
+                        //经营 != 资产
+                        if (!manageCompanyId .equals(subordinateBranc) ){
+                            handleOption.put("cancleManage", true);// 取消经营操作
+                        }
+                        handleOption.put("update", true);// 编辑操作
+                    }else if (type == 3){
+                        VehicleManageApply vehicleManageApply = vehicleManageApplyBiz.getApplyByOrder(vehicleId);
+                        //类型是申请经营并且申请公司是停靠公司
+                        if (vehicleManageApply !=null && vehicleManageApply.getApplyId() == parkBranchCompanyId && vehicleManageApply.getType() == 1){
+                            if (vehicleManageApply.getStatus() == 0){
+                                 statusText="审核中";
+                            }else if (vehicleManageApply.getStatus() == 1){
+                                statusText="申请通过";
+                            }else if (vehicleManageApply.getStatus() == 2){
+                                statusText="申请失败";
+                            }
+                        }//类型是还车并且申请公司是停靠公司
+                        else if (vehicleManageApply != null && vehicleManageApply.getApplyId().equals(parkBranchCompanyId) && vehicleManageApply.getType() == 3){
+                            //经营公司 == 停靠公司
+                            if (manageCompanyId == parkBranchCompanyId){
+                                statusText="取消经营，";
+                            }
+                            if (vehicleManageApply.getStatus() == 0){
+                                statusText+="还车中";
+                            }else if (vehicleManageApply.getStatus() == 1){
+                                statusText+="还车成功";
+                            }else if (vehicleManageApply.getStatus() == 2){
+                                statusText+="还车失败";
+                            }
+                        }else if (vehicleManageApply == null ||  !vehicleManageApply.getApplyId().equals( parkBranchCompanyId) ){
+                            handleOption.put("applyManage", true);// 申请经营操作
+                            handleOption.put("return", true);// 还车操作
+                        }
+                    }
+                    vehicleVO.setStatusText(statusText);
+                    vehicleVO.setHandleOption(handleOption);
+                    vehicleVO.setVehicleTitle(vehicleTitle);
+                }
+
+            }
+        }
+
+        return ObjectRestResponse.succ(dataVo);
     }
 
     public PageDataVO<VehicleVO> appSelectList(VehicleFindAppDTO vehicleFindAppDTO){

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

+package com.xxfc.platform.vehicle.biz;
+
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.entity.Area;
+import com.xxfc.platform.vehicle.entity.VehicleManageApply;
+import com.xxfc.platform.vehicle.mapper.VehicleManageApplyMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+
+@Service
+public class VehicleManageApplyBiz extends BaseBiz<VehicleManageApplyMapper, VehicleManageApply> {
+
+
+
+
+    public List<VehicleManageApply>  getManageApply(VehicleManageApply vehicleManageApply){
+        Example example=new Example(VehicleManageApply.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel",0);
+        if (vehicleManageApply.getType() != null){
+            criteria.andEqualTo("type",vehicleManageApply.getType());
+        }
+        if (StringUtils.isNotBlank(vehicleManageApply.getVehicleId())){
+            criteria.andEqualTo("vehicleId",vehicleManageApply.getVehicleId());
+        }
+        if (vehicleManageApply.getStatus()   != null){
+            criteria.andEqualTo("status",vehicleManageApply.getStatus());
+        }
+
+        return  selectByExample(vehicleManageApply);
+    }
+
+
+    public  VehicleManageApply getApplyByOrder(String vehicleId){
+        return mapper.getVehicleApply(vehicleId);
+    }
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleManageApplyMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.VehicleManageApply;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface VehicleManageApplyMapper extends Mapper<VehicleManageApply> {
+
+    @Select("SELECT * FROM vehicle_manage_apply WHERE is_del = 0 and vehicle_id =#{vehicleId} ORDER BY id DESC LIMIT 1")
+    VehicleManageApply getVehicleApply(@Param("vehicleId")String vehicleId);
+
+}
\ No newline at end of file

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

@@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -1305,11 +1305,15 @@
         v.*,
         b.cn_name as brandName,
         c.`name` categoryName,
-        bc.`name` as companyName
+        bc.`name` as companyName,
+        bc1.`name` as manageCompanyName,
+        bc2.`name` as parkCompanyName
         FROM  vehicle v
         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
+        LEFT JOIN branch_company bc2 ON v.park_branch_company_id=bc2.id
         <where>
             v.is_del = 0
             <if test="name != null and  name != ''">
@@ -1325,7 +1329,7 @@
                 AND  v.`category_id`= #{categoryId}
             </if>
             <if test="branchId != null and branchId > 0">
-                AND  v.`subordinate_branch`= #{branchId}
+                AND  (v.`subordinate_branch`= #{branchId} or v.`park_branch_company_id`= #{branchId} or v.`manage_company_id`= #{branchId} )
             </if>
             <if test="state != null ">
                 AND  v.`state`= #{state}
@@ -1334,10 +1338,49 @@
                 AND  v.`goods_type`= #{goodsType}
             </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
-                and bc.id in
-                <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
+                <if test="type != null and type > 0">
+                    <choose>
+                        <when test="type !=null and type == 1">
+                            and bc.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                        </when>
+                        <when test="type !=null and type == 2">
+                            and bc1.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                        </when>
+                        <when test="type !=null and type == 3">
+                            and (
+                            bc2.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            and  v.subordinate_branch not in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            )
+                        </when>
+                        <otherwise>
+                            and (bc.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            or bc1.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            or bc2.id in
+                            <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                                #{id}
+                            </foreach>
+                            )
+                        </otherwise>
+                    </choose>
+                </if>
             </if>
             <if test="dataCorporationIds != null and dataCorporationIds.size > 0">
                 and bc.company_id  in