Merge branch 'master' into hz_master

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

@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.NONE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -472,7 +472,7 @@ public class OrderMsgBiz {
     private void handelSmsParamApp(CompanyDetail startCompanyDetail, CompanyDetail endCompanyDetail, OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.PAY_A :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -502,14 +502,14 @@ public class OrderMsgBiz {
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 break;
             case SmsTemplateDTO.CANCEL_A :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 break;
             case SmsTemplateDTO.PAY_I :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -517,7 +517,7 @@ public class OrderMsgBiz {
                 smsParams.add(startCompanyDetail.getAddrDetail());
                 break;
             case SmsTemplateDTO.PAY_J :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -534,7 +534,7 @@ public class OrderMsgBiz {
     private void handelDepositSmsParamApp(BigDecimal originalAmount, BigDecimal violateAmount, BigDecimal refundAmount, BigDecimal residueAmount,BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
         switch (paramHandelType) {
             case SmsTemplateDTO.CANCEL_C :
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -549,7 +549,7 @@ public class OrderMsgBiz {
             case SmsTemplateDTO.REFUND_A:
                 Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
                 Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
@@ -562,7 +562,7 @@ public class OrderMsgBiz {
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + Long.valueOf(rentDepositAutoRefundTime * 60 * 60 * 1000))));
                 break;
             case SmsTemplateDTO.REFUND_B:
-                if(0 < appUserDTO.getMemberLevel() ) {
+                if(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());
                 }else {
                     smsParams.add(USER_N+ appUserDTO.getRealname());

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java

@@ -64,6 +64,7 @@ public class VehicleModelController extends CommonBaseController {
     @GetMapping(value = "/findVehicleModelPage")
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(VehicleModelQueryCondition vmqc) {
+        vmqc.setNotInIds("67");
         ObjectRestResponse<PageDataVO<VehicleModelVo>> objectRestResponse = vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
         PageDataVO<VehicleModelVo> pageDataVOs = objectRestResponse.getData();
         pageDataVOs.getData().forEach( v -> {

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

@@ -30,6 +30,8 @@ public class VehicleModelQueryCondition {
     private Integer status;
     @ApiModelProperty("分类逗号分割")
     String catasStr;
+    @ApiModelProperty("排除的车型id")
+    String notInIds;
     @ApiModelProperty(value = "分类列表", hidden = true)
     Map<Integer, List<VehiclePlatCata>> catas;
 }

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

@@ -58,8 +58,8 @@ public class VehicleActiveService {
      *
      * @param departureVo
      */
-    @Transactional
     public void departure(VehicleDepartureVo departureVo) {
+        try {
             Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
             if (vehicle == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -147,6 +147,10 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
 
@@ -187,8 +191,8 @@ public class VehicleActiveService {
         return stringBuilder.toString();
     }
 
-    @Transactional
     public void arrival(VehicleArrivalVo arrivalVo) {
+        try {
             Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
             if (vehicle == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -315,6 +319,9 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态

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

@@ -46,6 +46,13 @@
           </foreach>
           ) > 0
       </if>
+      <if test="notInIds != null">
+          and vmqc.id not in (
+            <foreach collection="notInIds.split(',')" item="noIdItem" index="noIdIndex">
+                #{noIdItem}
+            </foreach>
+          )
+      </if>
       ORDER BY	vmqc.id ASC
   </select>