Merge branch '2019-11-15-vehicle' into dev

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -24,7 +23,6 @@ import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
-import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.CheckUserInfoDto;
@@ -40,9 +38,7 @@ import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;
@@ -296,6 +292,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
+                if (restResponse.getStatus() != 200) {
+                    return ObjectRestResponse.createFailedResult(1001, restResponse.getMessage());
+                }
                 log.error("返回信息： " + restResponse.toString());
             } catch (Exception e) {
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());

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

@@ -331,6 +331,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         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());

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

@@ -398,7 +398,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }});
         orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
         orv.setOrderNo(baseOrder.getNo());
-        orv.setRefundDesc("");
+        orv.setRefundDesc("退款");
         orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
         ObjectRestResponse<String> result = thirdFeign.refund(orv);
         return ObjectRestResponse.succ(result);

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

@@ -121,6 +121,11 @@ public class  Vehicle {
      */
     private String drivingLicensePath;
 
+    /**
+     *行驶证副本
+     */
+    private String drivingLicenseDuplicatePath;
+
     /**
      * 发动机号
      */

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

@@ -118,6 +118,11 @@ public class AddOrUpdateVehicleVo {
      */
     private String drivingLicensePath;
 
+    /**
+     * 行驶副本
+     */
+    private String drivingLicenseDuplicatePath;
+
     /**
      * 发动机号
      */

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

@@ -316,7 +316,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
                 }
             }
         } catch (Exception e) {
-            log.error(e.getMessage(), e);;
+            e.printStackTrace();
             return RestResponse.codeAndMessage(10001, "网络异常！");
         }
         return RestResponse.suc();