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

.gitignore

@@ -7,8 +7,6 @@ target/
 .settings/
 .classpath
 ace-modules/ace-tool/src/main/resources/application-dev.yml
-/src/main/test/**
-logs/**
-xx-order/xx-order-server/logs/**
-*.log
+**/logs
+**/src/test
 

ace-common/src/main/resources/properties/resultcod.properties

@@ -214,7 +214,7 @@ BOOKED_FAILED_CODE = 4007
 4007=车辆预定失败，请重试！
 
 ONLY_BOOK_FROM_TODAY = 4008
-4008=取消或预定时间不能小于当前时间
+4008=预定时间不能小于当前时间
 
 ADD_VEHICLE_FAIL = 4009
 4009 = 添加车辆失败，请重试
@@ -226,7 +226,7 @@ DATE_TIME_IS_NULL = 4011
 4011 = 预定时间不能为空
 
 ONLY_BOOK_TWO_MONTH = 4012
-4012 = 只能预定两月内的车辆
+4012 = 最多提前三个月预约
 
 ONLY_UNBOOK_TWO_MONTH = 4013
 4013 = 只能取消预定两月内的车辆

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -123,7 +123,6 @@ public class MsgBiz {
         return ObjectRestResponse.succ();
 }
 
-
     public ObjectRestResponse getMsgListByUserId(Integer page, Integer limit) {
         //获取所有朋友圈
             page = page == null ? 1 : page;

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

@@ -115,8 +115,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
             if(depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-                depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + (rentDepositAutoRefundTime == null?0:rentDepositAutoRefundTime*60*60*1000));
-
+                if(rentDepositAutoRefundTime != null) {
+                    Long time = Long.parseLong(rentDepositAutoRefundTime + "");
+                    depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + time * 60 * 60 * 1000);
+                }
             }
         }
         return list;

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

@@ -307,7 +307,10 @@ public class OrderMsgBiz {
 
                         //发送用户取消消息
                         sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
-                        //sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
+
+                        //发送用户退款消息
+//                        smsParams.clear();
+//                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();
@@ -479,6 +482,7 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.detailAddr());
                 break;
             case SmsTemplateDTO.PAY_B :
+                smsParams.add(appUserDTO.getRealname());
                 smsParams.add(orvd.getFreeDays().toString());
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 smsParams.add(baseOrder.getRealAmount().toString());

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -212,6 +212,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         PageDataVO<SummitActivityVo> dataVO = new PageDataVO<>();
 
         Example example = new Example(SummitActivity.class);
+        example.setOrderByClause("rank ASC ,start_time DESC");
         Example.Criteria criteria = example.createCriteria();
         //未删除
         criteria.andEqualTo("isDel", 0);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -31,7 +31,7 @@ public enum ResCode {
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
     VEHICLE_DEPARTURE_VEHICLE_DELETE(104007,"车辆已下架"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
-    VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"车辆不在出车范围内，请按照预定日期出车！"),
+    VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"请按照预定的日期出车！"),
 
     VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
     VEHICLE_UNBOOK_FAIL(104005, "取消预定失败！"),

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

@@ -639,10 +639,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicleBookRecord == null) {
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-        //已通过审核的可以取消预定
-        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
-            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
-        }
+//        //已通过审核的可以取消预定
+//        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
+//            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
+//        }
         //转换为相应取消预定参数
         BookVehicleVO bookVehicleVo = new BookVehicleVO();
         BeanUtils.copyProperties(bookVehicleVo, vehicleBookRecord);

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -20,6 +20,7 @@
         <result column="longitude" property="longitude"/>
         <result column="latitude" property="latitude"/>
         <result column="zone_id" property="zoneId"/>
+        <result column="state" property="state"/>
     </resultMap>
 
     <select id="search" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
@@ -69,7 +70,7 @@
         bc.longitude,
         bc.latitude
         FROM
-        (SELECT * FROM `branch_company` WHERE `is_del`=0) AS `bc`
+        (SELECT * FROM `branch_company` WHERE `is_del`=0 AND `state`=1) AS `bc`
         INNER JOIN (SELECT * FROM `company_base` WHERE `is_del`=0
         <if test="provinceCode != null">
            AND `addr_province`=#{provinceCode}