Merge branch 'master-modify-cutAmount' into dev

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

@@ -14,7 +14,6 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -283,24 +282,13 @@ public class OrderMsgBiz {
                     CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
                     CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
                     if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
-//                        //查询订单退款记录
-//                        OrderRefund orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
-//                            setOrderId(baseOrder.getId());
-//                            setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
-//                        }});
 
-                        //新的账单,
+                        //新的账单 记录
                         OrderAccount orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                             setOrderId(baseOrder.getId());
                             setAccountType(AccountTypeEnum.IN_ORDER_PAY.getCode());
                         }});
 
-//                        //查询押金退款记录
-//                        OrderRefund depositOrderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
-//                            setOrderId(baseOrder.getId());
-//                            setRefundType(RefundTypeEnum.DEPOSIT.getCode());
-//                        }});
-
                         if(BigDecimal.ZERO.equals(orderAccount.getDeductAmount())) {
                             //使用免费天数
                             if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
@@ -308,6 +296,9 @@ public class OrderMsgBiz {
                             }else {
                                 smstype = SmsTemplateDTO.CANCEL_A;
                             }
+
+                            //发送用户取消消息
+                            sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
                         }else {
                             //使用免费天数
                             if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
@@ -315,14 +306,13 @@ public class OrderMsgBiz {
                             }else {
                                 smstype = SmsTemplateDTO.CANCEL_C;
                             }
+
+                            //发送用户退款消息
+                            smsParams.clear();
+                            sms2RefundAppUser(BigDecimal.ZERO, orderAccount.getDeductAmount(), orderAccount.getAccountAmount(), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
                         }
 
-                        //发送用户取消消息
-                        sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
 
-                        //发送用户退款消息
-//                        smsParams.clear();
-//                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(出车人)
                         smsParams.clear();
@@ -520,6 +510,13 @@ public class OrderMsgBiz {
                     smsParams.add(USER_N+ appUserDTO.getRealname());
                 }
                 break;
+            case SmsTemplateDTO.CANCEL_B :
+                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(SYS_TRUE.equals(appUserDTO.getIsMember()) && !NONE.getCode().equals(appUserDTO.getMemberLevel()) ) {
                     smsParams.add(USER_M+ appUserDTO.getRealname());

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

@@ -259,9 +259,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (addOrUpdateVehicleVo.getNumberPlate() == null) {
             throw new BaseException(ResultCode.NUMBER_PLAT_CAN_NOT_BE_NULL);
         }
-         boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(),addOrUpdateVehicleVo.getId());
-        if (exist){
-            throw new BaseException("车辆编码已经被占用",400);
+        boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(), addOrUpdateVehicleVo.getId());
+        if (exist) {
+            throw new BaseException("车辆编码已经被占用", 400);
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;

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

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId} and v1.book_end_date > #{time} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.book_end_date &gt; #{time} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">