Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -62,6 +62,10 @@ public class SmsTemplateDTO {
     public static final int REFUND_A = 22;
     //违章押金退还
     public static final int REFUND_B = 23;
+    //旅游内部通知（客服）
+    public static final int PAY_H = 24;
+    //取消旅游订单（客服）
+    public static final int CANCEL_F = 25;
 
 
 

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

@@ -58,6 +58,11 @@ public class CCPRestSmsBiz{
     //违章押金退还 23
     public static final String TEMPLATE_ID_FINISH_B = "460773";
 
+    //旅游内部通知（客服）24
+    public static final String TEMPLATE_ID_PAY_H = "461421";
+    //取消旅游订单（客服）25
+    public static final String TEMPLATE_ID_CANCEL_F = "461424";
+
 
 
 
@@ -131,6 +136,12 @@ public class CCPRestSmsBiz{
              case 23 :
                  CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_FINISH_B);
                  break;
+             case 24 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_PAY_H);
+                 break;
+             case 25 :
+                 CCPRestSmsUtils.sendTemplateSMS(phoneNumbers,params,TEMPLATE_ID_CANCEL_F);
+                 break;
 
          }
 

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

@@ -158,10 +158,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     return RestResponse.suc();
                 }
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                if(companyList.contains(vehicleBookRecordQueryVo.getLiftCompany())) { //如果权限中有这个公司就允许查询， 否则就直接返回空
+                    companyList.clear();
+                    companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+                } else {
+                    return RestResponse.suc();
+                }
+            }
         } else {
             if(vehicleBookRecordQueryVo.getCompanyId() != null) {
                 companyList.add(vehicleBookRecordQueryVo.getCompanyId());
             }
+            if(vehicleBookRecordQueryVo.getLiftCompany() != null) {
+                companyList.add(vehicleBookRecordQueryVo.getLiftCompany());
+            }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);

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

@@ -425,11 +425,14 @@
                 and v1.book_type = #{bookType}
             </if>
             <if test="companyIds != null and companyIds.size > 0">
-                and v1.lift_company in
+                and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
-
+                or v1.ret_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>)
             </if>
             and v1.status between 1 and 2 and v1.book_user != -2
         </where>