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

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -109,6 +109,16 @@ public class AccessGatewayFilter implements GlobalFilter{
         ServerHttpRequest.Builder mutate = request.mutate();
         // 不进行拦截的地址
         if (isStartWith(requestUri)) {
+            //zjw20190806添加 start ：避免已带token 却拿不到服务client/用户信息
+//            IJWTInfo user = null;
+//            try {
+//                user = getJWTUser(request, mutate);
+                // 申请客户端密钥头
+                mutate.header(serviceAuthConfig.getTokenHeader(), serviceAuthUtil.getClientToken());
+//            } catch (Exception e) {
+//                log.info("调用免登陆接口的用户Token过期异常", e);
+//            }
+            //zjw20190806添加 end
             ServerHttpRequest build = mutate.build();
             return gatewayFilterChain.filter(serverWebExchange.mutate().request(build).build());
         }

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

@@ -223,7 +223,7 @@ public class OrderMsgBiz {
                         }else {
                             smstype = SmsTemplateDTO.PAY_A;
                         }
-                        sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
+                        sms2AppUser(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
 
                         //后台发送消息(客服)
                         Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
@@ -243,10 +243,11 @@ public class OrderMsgBiz {
                     }
                     break;
                 case TOUR:
-                    sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
+                    CompanyDetail startCompanyDetailTour = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    sms2AppUser(startCompanyDetailTour, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
                     break;
                 case MEMBER:
-                    sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_G, smsParams);
+                    sms2AppUser(null, null, orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_G, smsParams);
                     break;
                 default:
                     break;
@@ -371,8 +372,8 @@ public class OrderMsgBiz {
     }
 
 
-    private void sms2AppUser(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
-        handelSmsParamApp(orvd, otd, omd, baseOrder, smsParams, appUserDTO, smstype);
+    private void sms2AppUser(CompanyDetail startCompanyDetail, CompanyDetail endCompanyDetail, OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
+        handelSmsParamApp(startCompanyDetail, endCompanyDetail, orvd, otd, omd, baseOrder, smsParams, appUserDTO, smstype);
         SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{
             setPhoneNumbers(appUserDTO.getUsername());
             setType(smstype);
@@ -420,7 +421,7 @@ public class OrderMsgBiz {
         }
     }
 
-    private void handelSmsParamApp(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
+    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 < baseOrder.getMemberLevel() ) {
@@ -430,19 +431,20 @@ public class OrderMsgBiz {
                 }
                 smsParams.add(baseOrder.getRealAmount().toString());
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
-                smsParams.add(orvd.getStartAddr());
+                smsParams.add(startCompanyDetail.detailAddr());
                 break;
             case SmsTemplateDTO.PAY_B :
                 smsParams.add(orvd.getFreeDays().toString());
                 smsParams.add(appUserDTO.getRentFreeDays().toString());
                 smsParams.add(baseOrder.getRealAmount().toString());
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
-                smsParams.add(orvd.getStartAddr());
+                smsParams.add(startCompanyDetail.detailAddr());
                 break;
             case SmsTemplateDTO.PAY_F :
                 smsParams.add(baseOrder.getName());
+                smsParams.add(baseOrder.getRealAmount().toString());
                 smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
-                smsParams.add(otd.getStartAddr());
+                smsParams.add(startCompanyDetail.detailAddr());
                 break;
             case SmsTemplateDTO.PAY_G :
                 smsParams.add(baseOrder.getName());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -148,4 +148,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "status")
 	@ApiModelProperty(value = "状态 0--下架；1--上架")
 	private  Integer status;
+
+	@Column(name = "cover_pic")
+	@ApiModelProperty(value = "封面图")
+	private  String coverPic;
 }

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

@@ -9,4 +9,19 @@ import java.util.List;
 @Data
 public class CompanyDetail extends BranchCompany {
     List<SysRegion> sysRegions;
+
+    public String detailAddr() {
+        StringBuilder detailAddrStr = new StringBuilder("");
+        if(null != this.getSysRegions() && this.getSysRegions().size() > 0) {
+            for(SysRegion sysRegion : this.getSysRegions()) {
+//                if(0 != detailAddrStr.length()) {
+//
+//                }
+                detailAddrStr.append(sysRegion.getName());
+            }
+        }
+
+        detailAddrStr.append(this.getAddrDetail());
+        return detailAddrStr.toString();
+    }
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/config/WebConfiguration.java

@@ -72,6 +72,7 @@ public class WebConfiguration implements WebMvcConfigurer {
         String[] urls = {
                 "/vehicleInfo/**",
                 "/branchCompany/**",
+                "/vehicleModel/**",
                 "/departure/**"
         };
         Collections.addAll(list, urls);