Merge branch 'dev' into base-modify

.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
 

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-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -125,7 +125,7 @@ public class AliYunSmsBiz {
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_D);
                  break;
              case 14 :
-                 SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_E);
+                 SmsService.sendTemplateToJson14(phoneNumbers,params,TEMPLATE_ID_PAY_E);
                  break;
              case 15 :
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_F);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/SmsService.java

@@ -178,7 +178,7 @@ public class SmsService {
         //request.setOutId("yourOutId");
         //hint 此处可能会抛出异常，注意catch
         SendSmsResponse  sendSmsResponse = acsClient.getAcsResponse(request);
-        log.info("短信接口返回的数据----------------mobile======"+PhoneNumbers+"----templateParam===="+params);
+        log.info("短信接口返回的数据--templateCode===="+templateCode+"--------mobile======"+PhoneNumbers+"----templateParam===="+params);
         log.info("Code=" + sendSmsResponse.getCode());
         log.info("Message=" + sendSmsResponse.getMessage());
         log.info("RequestId=" + sendSmsResponse.getRequestId());
@@ -211,6 +211,31 @@ public class SmsService {
 
     }
 
+    public  static  void  sendTemplateToJson14(String PhoneNumbers,String[] params,String templateCode){
+        try {
+            JSONObject jsonParams=new JSONObject();
+            for (int i=0;i<params.length;i++){
+                String para=params[i];
+                if (para.contains("【")){
+                    para=para.replaceAll("【","");
+                }
+                if (para.contains("】")){
+                    para=para.replaceAll("】","");
+                }
+                if (i>3){
+                    jsonParams.put(param+(i+2),para);
+                }else {
+                    jsonParams.put(param+(i+1),para);
+                }
+
+            }
+            sendTemplate(PhoneNumbers,jsonParams.toJSONString(),templateCode);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
+
     public static void main(String[] args) throws ClientException, InterruptedException {
         SmsService smsService=new SmsService();
         //发短信

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}