Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-common/src/main/resources/properties/systemconfig.properties

@@ -13,24 +13,24 @@ USER_HEADER_URL_DEFAULT=https://xxtest.upyuns.com/image/app/default_%20avatar.pn
 #默认昵称
 USER_NIKENAME_DEFAULT=XX_
 #短信机
-ACCESSKEYID=LTAIlXrgxOBAj2Ny
-ACCESSKEYSECRET=zo8OkOCF4iygqOjYYoxRKfVRxDvgTI
-TEMPLATECODE=SMS_166480010
-SIGNNAME=升云
+ACCESSKEYID=LTAInxMDwHQL8yg9
+ACCESSKEYSECRET=OCKDEiwKGjePCZgPeWMEUFGwGbKYLA
+TEMPLATECODE=SMS_170070101
+SIGNNAME=滴房车
 #微信支付配置
 WINXIN_AppID=wxcc2c9b7c87439a6d
 WINXIN_AppSecret=279796e8c2963c8a5ddc8270ef642b29
-WINXIN_PARTNER_KEY=CNITR89201000CNITR89201000FUWUSH
-WINXIN_PARTNER=1512136241
+WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
+WINXIN_PARTNER=1539689201
 #ios
 APP_ID_IOS=wx3f51779d49171d63
 APP_PARTNER_IOS=1492557632
 APP_PARTNER_KEY_IOS=89201002892010008920100quanzinet
 APP_TRADE_TYPE_IOS=APP
 #andoir
-APP_ID=wx9c9d978e5698d00f
-APP_PARTNER=1514583081
-APP_PARTNER_KEY=qwelkjuoivc1398767lkj834123kljic
+APP_ID=wx9ed5e51251cf7c61
+APP_PARTNER=1539689201
+APP_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
 APP_TRADE_TYPE=APP
 #支付回调
 weixinHost=xxtest.upyuns.com

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

@@ -281,7 +281,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
             //符合范围
             if(IntervalUtil.staticIsInTheInterval(hourLag.toString(), names[0])){
-                refundGoodsAmont = new BigDecimal(((Double) IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
+                refundGoodsAmont = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
                     //ga : goodsAmount
                     set("ga", baseOrder.getGoodsAmount());
                 }})).toString());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -166,7 +166,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
 
         //如果用户存在，并且为会员，并且车辆有优惠价
-        if(null != dto && !NONE.equals(detail.getAppUserDTO()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
+        if(null != dto && !NONE.getCode().equals(dto.getMemberLevel()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPrepay.java

@@ -75,7 +75,7 @@ public class WXPrepay {
 			if (httpEntity != null) {
 				// 打印响应内容
 				String result = EntityUtils.toString(httpEntity, "UTF-8");
-			//	System.out.println(result);
+				System.out.println(result);
 				// 过滤
 				result = result.replaceAll("<![CDATA[|]]>", "");
 				String prepay_id = Jsoup.parse(result).select("prepay_id").html();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -376,10 +376,9 @@ public class VehicleController extends BaseController<VehicleBiz> {
                 vpcMap.put(vpc.getParentId(), vpcs);
             }
             dto.setCatas(vpcMap);
-
-            //设置显示是否有车
-            //dto.setYearNo4Where(Boolean.TRUE);
         }
+        //设置显示是否有车
+        dto.setYearNo4Where(Boolean.TRUE);
         return new ObjectRestResponse<>().data(vehicleBiz.searchUsableModel(dto)).rel(true);
     }