修改代码

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

@@ -75,7 +75,27 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     public void notice(String orderNo,String serialNumber){
         log.error("---支付回调---trade_no====="+orderNo+"----开始处理");
         Example example =new Example(OrderPay.class);
-        example.createCriteria().andEqualTo("trade_no",orderNo).andEqualTo("is_del",0).andEqualTo("status",0);
+        example.createCriteria().andEqualTo("trade_no", orderNo).andEqualTo(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                "is_del",0).andEqualTo("status",0);
         List<OrderPay> list=mapper.selectByExample(example);
         if(list.size()==0){
             log.error("---支付回调---trade_no====="+orderNo+"----订单不存在或已处理");

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

@@ -20,7 +20,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class VehicleApplication {
 
     public static void main(String[] args) {
-        System.out.println("123123");
         SpringApplication.run(VehicleApplication.class, args);
     }
 

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.xxfc.platform.vehicle.biz.VehicleWarningMsgBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
@@ -15,6 +16,9 @@ import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/vehicleWarningMsg")
 @IgnoreClientToken
@@ -42,6 +46,7 @@ public class VehicleWarningMsgController extends BaseController<VehicleWarningMs
 
     @RequestMapping(value ="",method = RequestMethod.POST)
     private RestResponse<Integer> add(@RequestBody AddVehicleWarningMsgVo addVehicleWarningMsgVo) throws Exception{
+        new RestResponse<Map>().setData(new HashMap<String, Object>());
         return baseBiz.add(addVehicleWarningMsgVo);
     }
 
@@ -49,5 +54,4 @@ public class VehicleWarningMsgController extends BaseController<VehicleWarningMs
     private RestResponse deal(@PathVariable Integer id) throws Exception{
         return baseBiz.deal(id);
     }
-
 }

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

@@ -257,7 +257,7 @@
 
     <select id="searchUsableVehicle" parameterType="java.util.Map"
             resultType="com.xxfc.platform.vehicle.entity.Vehicle">
-        select vm.*
+        select v.*
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
         </if>