修改bug

ace-common/src/main/java/com/github/wxiaoqi/security/common/exception/BaseException.java

@@ -53,8 +53,12 @@ public class BaseException extends RuntimeException {
         this.status = code;
     }
 
-    public BaseException(int code, Map<String, Object> map) {
-        super(ResultCode.getMsg(code));
-        this.status = code;
-    }
+//    public BaseException(int code, Map<String, Object> map) {
+//        String msg = ResultCode.getMsg(code);
+//        if(null != map && map.size() > 0){
+//            for(String)
+//
+//        }
+//        this.status = code;
+//    }
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -132,11 +132,11 @@ public class ResultCode {
 	// 账户已禁用
 	public static int ACCOUNTINFO_ISDEL = Integer.valueOf(SystemProperty.getResultConfig("ACCOUNTINFO_ISDEL"));
 
-	// 监控设备不存在
-	public static int DEVICE_NOTEXIST_CODE = Integer.valueOf(SystemProperty.getResultConfig("DEVICE_NOTEXIST_CODE"));
-	// 设备access_token获取失败
-	public static int DEVICE_TOKEN_NOTEXIST_CODE = Integer
-			.valueOf(SystemProperty.getResultConfig("DEVICE_TOKEN_NOTEXIST_CODE"));
+//	// 监控设备不存在
+//	public static int DEVICE_NOTEXIST_CODE = Integer.valueOf(SystemProperty.getResultConfig("DEVICE_NOTEXIST_CODE"));
+//	// 设备access_token获取失败
+//	public static int DEVICE_TOKEN_NOTEXIST_CODE = Integer
+//			.valueOf(SystemProperty.getResultConfig("DEVICE_TOKEN_NOTEXIST_CODE"));
 
 	// 操作频繁提示
 	public static int API_MAX_CODE = Integer.valueOf(SystemProperty.getResultConfig("API_MAX_CODE"));

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

@@ -154,10 +154,10 @@ NICKNAME_NULL_CODE=9006
 ACCOUNTINFO_ISDEL=9007
 9007=账户已禁用
 
-DEVICE_NOTEXIST_CODE=1005
-1005=监控设备不存在
-DEVICE_TOKEN_NOTEXIST_CODE=1006
-1005=设备access_token获取失败
+#DEVICE_NOTEXIST_CODE=1005
+#1005=监控设备不存在
+#DEVICE_TOKEN_NOTEXIST_CODE=1006
+#1005=设备access_token获取失败
 
 REPEAT_SUB_CODE=1008
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -70,6 +70,9 @@ public class BaseOrderController extends CommonBaseController {
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
 
+    @Value("${gateway.insideHost}")
+    String insideHost;
+
     @Value("${gateway.host}")
     String host;
 
@@ -256,7 +259,7 @@ public class BaseOrderController extends CommonBaseController {
         orderPayVo.setBody(baseOrder.getName());
         orderPayVo.setBuyerIp(StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
         orderPayVo.setChannel(PayChannelEnum.ORDER_CRT.getCode());
-        orderPayVo.setNotifyUrl(host + order + notifyUrl + "?orderNo=" + baseOrder.getNo());
+        orderPayVo.setNotifyUrl(insideHost + order + notifyUrl + "?orderNo=" + baseOrder.getNo());
         orderPayVo.setSubject(baseOrder.getName());
         orderPayVo.setUserId(baseOrder.getUserId());
         ObjectRestResponse response = BeanUtil.toBean(thirdFeign.wx(orderPayVo), ObjectRestResponse.class);

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

@@ -93,7 +93,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //发送定时取消订单(30分钟)
         //rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 30);
-        rabbitProduct.sendDelayMessage(bo.getOrder(), 100L * 6 * 3);
+        rabbitProduct.sendDelayMessage(bo.getOrder(), 1000L * 60 * 5);
     }
 
     @Override

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

@@ -50,7 +50,14 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         Integer amount=orderPayVo.getAmount();
         log.error("---下单---order_no====="+order_no+"--支付订单号--trade_no===="+trade_no+"--金额---amount===="+amount);
         //报名费回调路径
-        String jsParam = WXPay.apppay(1+"",orderPayVo.getBody(),"https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify" ,trade_no,orderPayVo.getBuyerIp(),0);
+
+        //临时处理
+        amount = amount/100000;
+        if(amount <= 0) {
+            amount = 1;
+        }
+
+        String jsParam = WXPay.apppay(amount+"",orderPayVo.getBody(),"https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify" ,trade_no,orderPayVo.getBuyerIp(),0);
         log.info("报名费回调路径jsParam:"+jsParam);
         if(!StringUtils.isBlank(jsParam))
         {

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

@@ -333,7 +333,8 @@
         </if>
 
         <include refid="searchUsableSql"/>
-
+        and vm.id is not null
+        and bc.id is not null
         GROUP BY model_id, company_id
         <if test="lon != null and lat != null">, distance</if>