核销相关

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/CommonBaseController.java

@@ -43,4 +43,5 @@ public class CommonBaseController {
             return null;
         }
     }
+
 }

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

@@ -43,6 +43,10 @@ public interface UserFeign {
     @RequestMapping(value = "/public/v2/userinfo-by-appUserId")
     ObjectRestResponse<UserDTO> userinfoByAppUserIdV2(@RequestParam("appUserId") Integer appUserId);
 
+    @RequestMapping(value = "/public/business/userinfo-by-mobilePhone", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<UserDTO> businessUserinfoByMobilePhone(@RequestParam("mobilePhone") String mobilePhone);
+
     @RequestMapping(value = "/public/userinfo-by-uid")
     public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
 
@@ -63,6 +67,14 @@ public interface UserFeign {
     @RequestMapping(value = "/public/app/userinfo-by-id")
     public ObjectRestResponse<AppUserDTO> userDetailById(@RequestParam("id") Integer id);
 
+    /**
+     * username获取用户信息
+     * @param name
+     * @return
+     */
+    @RequestMapping(value = "/public/app/business/userinfo-by-username")
+    public ObjectRestResponse<AppUserDTO> userDetailByUsernameBusiness(@RequestParam("name") String name);
+
 
     @GetMapping("/app/user/app/unauth/getUserIdByUsername")
     public List<Integer> getUserIdByUsername(@RequestParam(value="keywords")String keywords);

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

 package com.github.wxiaoqi.security.admin.feign.rest;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -109,4 +110,19 @@ public interface UserRestInterface  {
         return  null;
     }
 
+    default List<Integer> getBusinessUserCompanyIds(){
+        //Integer currentUserIdInt = getCurrentUserIdInt();
+        String currentUserName = BaseContextHandler.getUsername();
+        if (StrUtil.isNotBlank(currentUserName)){
+            ObjectRestResponse<UserDTO> restResponse = getUserFeign().businessUserinfoByMobilePhone(currentUserName);
+            if (restResponse.getData() != null){
+                UserDTO userDTO =restResponse.getData();
+                if (userDTO != null){
+                    return  userDTO.getCompanyIds();
+                }
+            }
+        }
+        return  null;
+    }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfiguration.java

@@ -64,7 +64,8 @@ public class WebConfiguration implements WebMvcConfigurer {
                 "/api/permissions",
                 "/api/user/un/**",
                 "/app/**",
-                "/backstage/**",
+                "/backstage/**"
+//                ,"/chw/**"
 //                "/api/app/**"
         };
         Collections.addAll(list, urls);

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

@@ -25,6 +25,9 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 /**
  * ${DESCRIPTION}
  *
@@ -105,10 +108,36 @@ public class PublicController {
     }
 
 
-    @RequestMapping(value = "v2/userinfo-by-appUserId", method = RequestMethod.GET)
-    public @ResponseBody
-    ObjectRestResponse userinfoByAppUserIdV2(Integer appUserId){
-        User user = userBiz.getUserByAppUserId(appUserId);
+//    @RequestMapping(value = "v2/userinfo-by-appUserId", method = RequestMethod.GET)
+//    public @ResponseBody
+//    ObjectRestResponse userinfoByAppUserIdV2(Integer appUserId){
+//        User user = userBiz.getUserByAppUserId(appUserId);
+//        if (user == null) {
+//            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+//        }
+//        if (user.getDataCorporation() != null){
+//            com.github.wxiaoqi.security.admin.dto.CompanySearchDTO companySearchDTO =new com.github.wxiaoqi.security.admin.dto.CompanySearchDTO();
+//            companySearchDTO.setDataCorporationIds(Arrays.asList(user.getDataCorporation().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList()));
+//            List<com.github.wxiaoqi.security.admin.vo.CompanySearchVO> companySearchVOList=branchCompanyBiz.getList(companySearchDTO);
+//            if(companySearchVOList != null && companySearchVOList.size() > 0){
+//                List<Integer> companyIds = companySearchVOList.stream().map(com.github.wxiaoqi.security.admin.vo.CompanySearchVO::getId).distinct().collect(Collectors.toList());
+//                user.setCompanyIds(companyIds);
+//            }
+//        }else if (user.getDataCompany() != null ){
+//            List<Integer> companyIds = Arrays.asList(user.getDataCompany().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+//            user.setCompanyIds(companyIds);
+//        }
+//        return new ObjectRestResponse<User>().rel(true).data(user);
+//    }
+
+    @RequestMapping(value = "business/userinfo-by-mobilePhone", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse userinfoByAppUserIdV2(String mobilePhone){
+        User user = userBiz.selectOne(new User(){{
+            setMobilePhone(mobilePhone);
+            setIsDel(SYS_FALSE);
+            setStatus(SYS_TRUE);
+        }});
         if (user == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
@@ -162,6 +191,25 @@ public class PublicController {
         return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
     }
 
+    @RequestMapping(value = "/app/business/userinfo-by-username", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse<AppUserDTO> userDetailByUsernameBusiness(String name) throws Exception {
+        AppUserLogin appUserLogin;
+        if (StrUtil.isBlank(name)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }else {
+            appUserLogin = appUserLoginBiz.selectOne(new AppUserLogin(){{
+                setUsername(name);
+                setIsdel(SYS_FALSE);
+                setStatus(SYS_TRUE);
+            }});
+            if(null == appUserLogin) {
+                return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+            }
+        }
+        return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
+    }
+
     private AppUserDTO getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {
         AppUserDTO userDTO=new AppUserDTO();
         //获取用户基础信息

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

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -59,7 +60,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
 @Slf4j
-public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapper, OrderVehicleCrosstown> {
+public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapper, OrderVehicleCrosstown> implements UserRestInterface {
 
     @Autowired
     OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
@@ -87,6 +88,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Autowired
     OrderAccountBiz orderAccountBiz;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
 
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
@@ -222,7 +227,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         log.info("交还车参数：orderVehicleCrosstown = {}", orderVehicleCrosstownDto);
+
+        //获取app用户信息 根据用户名（手机号）定位后台商家用户
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
+        if(null == userDTO && null != getAppUser()) {
+            userDTO = userFeign.businessUserinfoByMobilePhone(getAppUser().getUsername()).getData();
+        }
+
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/WebConfiguration.java

@@ -62,6 +62,7 @@ public class WebConfiguration implements WebMvcConfigurer {
                 "/orderVehicle/**",
                 "/shuntApply/**",
                 "/admin/**",
+                "/chw/**",
         };
         Collections.addAll(list, urls);
         return list;

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

+package com.xxfc.platform.order.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.github.wxiaoqi.security.common.util.AssertUtils;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.activity.entity.Coupon;
+import com.xxfc.platform.activity.feign.ActivityFeign;
+import com.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.biz.inner.OrderDelayBiz;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
+import com.xxfc.platform.order.pojo.order.*;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.order.service.OrderRentVehicleService;
+import com.xxfc.platform.tour.entity.TourUser;
+import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import jodd.util.StringUtil;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.mockito.internal.util.collections.Sets;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE_FORMATTER;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
+
+@Controller
+@RequestMapping("/chw/appOrder")
+@Api(value = "订单后台相关", tags = {"订单后台相关"})
+@Slf4j
+public class AppOrderController extends CommonBaseController implements UserRestInterface {
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    VehicleFeign vehicleFeign;
+
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @Autowired
+    OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+    @RequestMapping(value = "/getVehicleList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "交还车租车订单列表")
+    public ObjectRestResponse<List<OrderPageVO>> getVehicleList(BaseOrderController.QueryOrderList dto) {
+        log.info("交还车租车订单列表请求参数：dto = {}", dto);
+        if (dto.getStartTime() != null) {
+            if (dto.getEndTime() == null) {
+                dto.setEndTime(new Date().getTime());
+            }
+        }
+        List<Integer> userIds = new ArrayList<>();
+        if (StringUtils.isNotBlank(dto.getKeywords())) {
+            List<Integer> list = userFeign.getUserIdByUsername(dto.getKeywords());
+            if (list != null) {
+                userIds.addAll(list);
+            }
+            if (userIds.size() <= 0) {
+                return ObjectRestResponse.succ(new PageDataVO<>());
+            }
+        }
+
+        //获取app用户信息 根据用户名（手机号）定位后台商家用户
+//        UserDTO userDTO = userFeign.businessUserinfoByMobilePhone(currentAppUser.getUsername()).getData();
+//        getBusinessUserCompanyIds();
+//
+////        UserDTO userDTO = getAdminUserInfo();
+//        if (userDTO == null) {
+//            return ObjectRestResponse.succ(new PageDataVO<>());
+//        }
+
+        //List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        //List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+        List<Integer> companyIds = getBusinessUserCompanyIds();
+        if(null == companyIds) {
+            return ObjectRestResponse.succ(new PageDataVO<>());
+        }
+        if (dto.getStartCompanyId() != null) {
+            if (companyIds.size() > 0) {
+                if (companyIds.contains(dto.getStartCompanyId())) {
+                    companyIds.clear();
+                    companyIds.add(dto.getStartCompanyId());
+                } else {
+                    return ObjectRestResponse.succ();
+                }
+            } else {
+                companyIds.add(dto.getStartCompanyId());
+            }
+        }
+        dto.setCompanyIds(companyIds);
+        Query query = new Query(dto);
+        PageDataVO<OrderPageVO> pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.getRentVehicle(query.getSuper()));
+        for (OrderPageVO orderPageVO : pageDataVO.getData()) {
+            if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
+                ObjectRestResponse<Vehicle> restResponse = vehicleFeign.get(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
+                log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
+                if (restResponse.getData() != null) {
+                    orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                    orderPageVO.setCode(restResponse.getData().getCode());
+                }
+            }
+            if (orderPageVO.getUserId() != null) {
+                AppUserDTO appUserDTO = userFeign.userDetailById(orderPageVO.getUserId()).getData();
+                if (appUserDTO != null) {
+                    orderPageVO.setUsername(appUserDTO.getUsername());
+                    orderPageVO.setRealName(appUserDTO.getRealname());
+                }
+            }
+        }
+        return new ObjectRestResponse<>().data(pageDataVO);
+    }
+
+    @GetMapping(value = "/vehicleCrosstown/getByOrderId")
+    @ApiOperation(value = "根据订单Id获取所有记录信息")
+    public ObjectRestResponse<List<OrderVehicleCrosstownDto>> getByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
+        UserDTO userDTO = getAdminUserInfo();
+        AppUserDTO appUserDTO = getAppUser();
+        if (userDTO == null && appUserDTO == null) {
+            return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
+        }
+        if (orderVehicleCrosstownDto == null) {
+            return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
+        }
+        return ObjectRestResponse.succ(orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto));
+    }
+}

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

@@ -387,6 +387,9 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo, Boolean flag) {
         UserDTO userDTO = getAdminUserInfo();
+        if(null == userDTO && null != getAppUser()) {
+            userDTO = userFeign.businessUserinfoByMobilePhone(getAppUser().getUsername()).getData();
+        }
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -29,7 +30,7 @@ import java.util.List;
  */
 @Service
 @Slf4j
-public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,VehicleDispatchInfo> {
+public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,VehicleDispatchInfo> implements UserRestInterface {
 
      @Autowired
     UserFeign userFeign;
@@ -40,6 +41,10 @@ public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,Ve
     @Autowired
     VehicleBiz vehicleBiz;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
 
     //提交调度申请表单
     public ObjectRestResponse addDisspatchInfo(VehicleDispatchInfo vehicleDispatchInfo){
@@ -52,7 +57,11 @@ public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,Ve
 
     //获取申请列表
     public  ObjectRestResponse getInfoList(VehicleDispatchInfoDto dispatchInfoDto, HttpServletRequest request){
-        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+//        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        UserDTO userDTO = getAdminUserInfo();
+        if(null == userDTO && null != getAppUser()) {
+            userDTO = userFeign.businessUserinfoByMobilePhone(getAppUser().getUsername()).getData();
+        }
         List<VehicleDispatchInfoVo> list=new ArrayList<>();
         Integer pageSize=dispatchInfoDto.getPage()==null?1:dispatchInfoDto.getPage();
         Integer pageNo=dispatchInfoDto.getPage()==null?10:dispatchInfoDto.getLimit();
@@ -65,21 +74,21 @@ public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,Ve
             }else {
                 companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
             }
-             dispatchInfoDto.setCompanyList(companyList);
-             list=mapper.getInfoList(dispatchInfoDto);
-             if (list.size()>0){
-                 for (VehicleDispatchInfoVo vehicleDispatchInfoVo:list){
-                     String recordIds=vehicleDispatchInfoVo.getRecordIds();
-                     if (StringUtils.isBlank(recordIds)){
-                         continue;
-                     }
-                     String[] ids=recordIds.split(",");
-                     List<VehiclDispatchRecordVo> recordVos= mapper.getRecordList(Arrays.asList(ids));
-                     if (recordVos.size()>0) {
-                         vehicleDispatchInfoVo.setDispatchRecords(recordVos);
-                     }
-                 }
-             }
+            dispatchInfoDto.setCompanyList(companyList);
+            list=mapper.getInfoList(dispatchInfoDto);
+            if (list.size()>0){
+                for (VehicleDispatchInfoVo vehicleDispatchInfoVo:list){
+                    String recordIds=vehicleDispatchInfoVo.getRecordIds();
+                    if (StringUtils.isBlank(recordIds)){
+                        continue;
+                    }
+                    String[] ids=recordIds.split(",");
+                    List<VehiclDispatchRecordVo> recordVos= mapper.getRecordList(Arrays.asList(ids));
+                    if (recordVos.size()>0) {
+                        vehicleDispatchInfoVo.setDispatchRecords(recordVos);
+                    }
+                }
+            }
         }
         PageHelper.startPage(pageNo,pageSize);
         PageInfo<VehicleDispatchInfoVo> pageInfo = new PageInfo<>(list);

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

@@ -28,7 +28,7 @@ public class AppVehicleApplyController extends BaseController<VehicleApplyBiz> {
     @ApiModelProperty("商家入驻申请")
     public  ObjectRestResponse apply(@RequestBody Vehicle vehicle) {
      if (vehicle.getSubordinateBranch() == null || vehicle.getSubordinateBranch() == 0){
-         List<Integer> companyIds = getCompanyIds();
+         List<Integer> companyIds = getBusinessUserCompanyIds();
          if (companyIds != null && companyIds.size() > 0){
              vehicle.setSubordinateBranch(companyIds.get(0));
          }
@@ -41,7 +41,7 @@ public class AppVehicleApplyController extends BaseController<VehicleApplyBiz> {
     @GetMapping("apply/selectList")
     @ApiModelProperty("商品审核列表")
     public  ObjectRestResponse selectList(VehicleApplyFindDTO vehicleApplyFindDTO) {
-        List<Integer> companyIds = getCompanyIds();
+        List<Integer> companyIds = getBusinessUserCompanyIds();
         if (companyIds == null && companyIds.size() == 0){
             return  ObjectRestResponse.succ();
         }

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

@@ -32,7 +32,7 @@ public class AppVehicleController extends BaseController<VehicleBiz> {
     @ApiModelProperty("商品列表")
     public  ObjectRestResponse selectList(VehicleFindDTO vehicleFindDTO) {
         if (vehicleFindDTO.getBranchId() == null || vehicleFindDTO.getBranchId() == 0){
-            List<Integer> companyIds = getCompanyIds();
+            List<Integer> companyIds = getBusinessUserCompanyIds();
             if (companyIds != null && companyIds.size() > 0){
                 vehicleFindDTO.setBranchId(companyIds.get(0));
             }

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

 package com.xxfc.platform.vehicle.rest;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -14,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.List;
 
 @Slf4j
-public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
+public class BaseController<Biz extends BaseBiz> extends CommonBaseController implements UserRestInterface {
     
     @Autowired
     protected Biz baseBiz;
@@ -28,8 +30,12 @@ public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
     @Autowired
     UserFeign userFeign;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
 
-  public String getUserName()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName(); }
+    public String getUserName()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName(); }
 
     public Biz getBaseBiz() {
         return baseBiz;
@@ -37,19 +43,4 @@ public class BaseController<Biz extends BaseBiz> extends CommonBaseController {
 
     public String getUserId()throws Exception{ return  userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId(); }
 
-
-    public List<Integer> getCompanyIds(){
-        Integer currentUserIdInt = getCurrentUserIdInt();
-        if (currentUserIdInt != null && currentUserIdInt > 0 ){
-            ObjectRestResponse<UserDTO> restResponse = userFeign.userinfoByAppUserIdV2(currentUserIdInt);
-            if (restResponse.getData() != null){
-                UserDTO userDTO =restResponse.getData();
-                if (userDTO != null){
-                    return  userDTO.getCompanyIds();
-                }
-            }
-        }
-        return  null;
-    }
-
 }

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

@@ -16,12 +16,15 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleFindAppDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -34,6 +37,8 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 @RestController
 @RequestMapping("/branchCompany")
 @Slf4j

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

@@ -706,6 +706,15 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
     }
 
+    @GetMapping("app/unauth/shop/headSelectList")
+    @ApiModelProperty("店铺商品列表(头部输入框)")
+    @IgnoreUserToken
+    public  ObjectRestResponse<PageDataVO<VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+        vehicleFindAppDTO.setState(Vehicle.STATE_UP);
+        vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
+        return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
+    }
+
     @Data
     static public class VehicleVO extends Vehicle {
         private VehicleModel vehicleModel;

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

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("backstage/vehicle")
 @Api(tags = {"商品申请"})
-public class AdminVehicleController extends BaseController<VehicleBiz> implements UserRestInterface {
+public class AdminVehicleController extends BaseController<VehicleBiz>{