Merge branch 'master_chw_publish' into dev-chw

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -61,7 +61,7 @@ public interface OrderFeign {
     BaseOrder updateBaseOrder(@RequestBody BaseOrder baseOrder);
 
 
-    @RequestMapping(value = "chw/orderPulishReceive/app/unauth/refund", method = RequestMethod.GET)
-    ObjectRestResponse refund(ReceiveRefundDTO receiveRefundDTO);
+    @PostMapping(value = "chw/orderPulishReceive/app/unauth/refund")
+    ObjectRestResponse refund(@RequestBody ReceiveRefundDTO receiveRefundDTO);
 
 }

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

@@ -41,11 +41,11 @@ public class OrderPulishReceiveController extends BaseController<OrderPulishRece
     }
 
 
-    @RequestMapping(value = "app/unauth/refund", method = RequestMethod.GET)
+    @PostMapping(value = "app/unauth/refund")
     @ResponseBody
     @ApiOperation(value = "退款")
     @IgnoreUserToken
-    public ObjectRestResponse refund(ReceiveRefundDTO receiveRefundDTO) {
+    public ObjectRestResponse refund(@RequestBody ReceiveRefundDTO receiveRefundDTO) {
         receiveService.refund(receiveRefundDTO);
         return ObjectRestResponse.succ();
     }

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

@@ -39,6 +39,11 @@ public class VehicleReceiveMQHandler {
     @RabbitListener(queues = VEHICLE_RECEVIE_REFUND_QUEUE)
     public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
         log.info("接单退款信息 messageJson："+ JSONUtil.parse(message));
+        try {
+            Thread.sleep(2000L);
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(new Runnable() {
             @Override