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

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

@@ -22,9 +22,11 @@ import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.slf4j.Slf4j;
@@ -35,8 +37,10 @@ import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 
 import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.*;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -84,6 +88,24 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         initDictionary();
         VehicleModel vehicleModel = vehicleFeign.get(bo.getModelId()).getData();
         bo.setVehicleModel(vehicleModel);
+        //根据还车城市设置还车公司id
+        if(SYS_FALSE.equals(bo.getEndCompanyId())) {
+            if(null != bo.getEndCity() && null != bo.getStartCity()) {
+                if(bo.getEndCity().equals(bo.getStartCity())) {
+                    bo.setEndCompanyId(bo.getStartCompanyId());
+                }else {
+                    //查询结束城市分公司
+                    List<BranchCompany> companyDetails = vehicleFeign.branchCompanyEntityList(
+                            BeanUtil.beanToMap(new BranchCompany(){{
+                                setAddrCity(bo.getEndCity());
+                            }}, false, true)).getData();
+
+                    if(null != companyDetails && companyDetails.size() > 0) {
+                        bo.setEndCompanyId(companyDetails.get(0).getId());
+                    }
+                }
+            }
+        }
     }
 
     public void initDictionary() {

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

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by ace on 2017/9/15.
@@ -55,9 +56,11 @@ public interface VehicleFeign {
     public  List<BranchCompany>  companyAll(
             @RequestParam(value = "dataAll")Integer dataAll,
             @RequestParam(value = "dataCompany")String dataCompany,
-
             @RequestParam(value = "dataZone")String dataZone);
 
+    @GetMapping("/branchCompany/entityList")
+    public ObjectRestResponse<List<BranchCompany>> branchCompanyEntityList(@RequestParam("entity") Map<String, Object> entity);
+
     @RequestMapping(value = "/user/license/one", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> one(@RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
 

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

 package com.xxfc.platform.vehicle.common;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Slf4j
 public class BaseController<Biz extends BaseBiz> {
@@ -12,5 +18,4 @@ public class BaseController<Biz extends BaseBiz> {
     protected HttpServletRequest request;
     @Autowired
     protected Biz baseBiz;
-
 }

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

@@ -151,4 +151,12 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         }
         return baseBiz.getListByUser(userDTO);
     }
+
+    @ApiOperation("根据参数查询，等于")
+    @RequestMapping(value = "/entityList",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<List<BranchCompany>> entityList(BranchCompany entity){
+        //查询列表数据
+        return ObjectRestResponse.succ(baseBiz.selectList(entity));
+    }
 }

xx-vehicle/xx-vehicle-server/src/test/java/com/xxfc/platform/vehicle/ListTest.java

@@ -3,13 +3,19 @@ package com.xxfc.platform.vehicle;
 import org.junit.Test;
 
 import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 public class ListTest {
-    @Test
+    //@Test
     public void ListTest(){
         List<Object> objects = Arrays.asList();
         System.out.println("objects.size()"+objects.get(0));
     }
+
+    public static void main(String[] args) {
+        List<Object> objects = new ArrayList<Object>();
+        System.out.println("objects.size()"+objects.get(0));
+    }
 }