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

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

@@ -110,15 +110,15 @@ 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();
-//                    if (branchCompany != null) {
-//                        value.setCustomerPhone(branchCompany.getVehiceServicePhone());
-//                    }
-//                }
-//            }
+            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();
+                    if (branchCompany != null) {
+                        value.setCustomerPhone(branchCompany.getVehiceServicePhone());
+                    }
+                }
+            }
 
             if (value.getType() == 2 || value.getType() == 3) {
                 List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId());
@@ -256,10 +256,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (null == userDTO.getCompanyIds() || !userDTO.getCompanyIds().contains(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
             }
+            userDTO.setCompanyId(orderRentVehicleDetail.getStartCompanyId());
         } else {
             if (null == userDTO.getCompanyIds() || !userDTO.getCompanyIds().contains(orderRentVehicleDetail.getEndCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3503, "无收车权限");
             }
+            userDTO.setCompanyId(orderRentVehicleDetail.getEndCompanyId());
         }
         Vehicle vehicle = null;
         RestResponse<Vehicle> vehicleRestResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -271,7 +271,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         AlipayClient alipayClient = getAlipayClient();
         //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
         try {
-            return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
+            return appOrderPay(alipayClient, orderPayVo, notifyUrl);
         } catch (Exception e) {
             log.error(e.getMessage(), e);;
         }