Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -37,6 +37,11 @@ public interface UserFeign {
     @RequestMapping(value = "/public/userinfo-by-token")
     public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
 
+    @RequestMapping(value = "/public/userinfo-by-uid")
+    public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
+
+    /**************************************************潮惠玩新的*******************************************************/
+
     @RequestMapping(value = "/public/v2/userinfo-by-token")
     ObjectRestResponse<UserDTO> userinfoByTokenV2(@RequestParam("token") String token,@RequestParam("flag") boolean flag);
 
@@ -47,9 +52,8 @@ public interface UserFeign {
     @ResponseBody
     public ObjectRestResponse<UserDTO> businessUserinfoByMobilePhone(@RequestParam("mobilePhone") String mobilePhone);
 
-    @RequestMapping(value = "/public/userinfo-by-uid")
-    public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
-
+    @RequestMapping(value = "/public/v2/userinfo-by-uid")
+    public ObjectRestResponse<UserDTO> userinfoByUidV2(@RequestParam("uid") Integer uid);
 
 
     /**

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

@@ -108,6 +108,46 @@ public class PublicController {
     }
 
 
+    @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse<User> userinfoByUid(Integer uid) throws Exception {
+        if (uid == null||uid==0) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        User user = userBiz.getUserByUid(uid);
+        if (user == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
+        }
+        return ObjectRestResponse.succ(user);
+    }
+
+    @RequestMapping(value = "v2/userinfo-by-uid", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse userinfoByUidV2(Integer uid) throws Exception {
+        User user = userBiz.selectOne(new User(){{
+            setId(uid);
+            setIsDel(SYS_FALSE);
+            setStatus(SYS_TRUE);
+        }});
+        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 = "v2/userinfo-by-appUserId", method = RequestMethod.GET)
     public @ResponseBody
     ObjectRestResponse userinfoByAppUserIdV2(Integer appUserId){
@@ -224,19 +264,6 @@ public class PublicController {
         return userDTO;
     }
 
-    @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)
-    public @ResponseBody
-    ObjectRestResponse<User> userinfoByUid(Integer uid) throws Exception {
-        if (uid == null||uid==0) {
-            return ObjectRestResponse.paramIsEmpty();
-        }
-        User user = userBiz.getUserByUid(uid);
-        if (user == null) {
-            return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
-        }
-        return ObjectRestResponse.succ(user);
-    }
-
     @GetMapping("/getByUserIds")
     public ObjectRestResponse<List<AppUserVo>> getByUserIds(@RequestParam("ids") List<Integer> ids) {
         if(ids == null) {

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

@@ -27,7 +27,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     /**
      * 订单标记 1--普通订单；2--需求预定申请订单；3--特惠租车订单
      */
-    private Integer orderSign = 0;
+    private Integer orderSign = 1;
 
     public Integer getOrderSign() {
         return orderSign;

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

@@ -111,9 +111,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
         for (OrderVehicleCrosstownDto value : list) {
             if (value != null && value.getOrperaterId() != null && value.getType() != 1) {
-                UserDTO userDTO = userFeign.userinfoByUid(value.getOrperaterId()).getData();
-                if (userDTO != null) {
-                    CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyId()).getData();
+                UserDTO userDTO = userFeign.userinfoByUidV2(value.getOrperaterId()).getData();
+                if (userDTO != null && userDTO.getCompanyIds() != null && userDTO.getCompanyIds().size() > 0) {
+                    CompanyDetail branchCompany = vehicleFeign.getCompanyDetail(userDTO.getCompanyIds().get(0)).getData();
                     if (branchCompany != null) {
                         value.setCustomerPhone(branchCompany.getVehiceServicePhone());
                     }