修改代码

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.*;
+import static com.xxfc.platform.order.pojo.mq.OrderMQDTO.*;
 
 @Component
 @Slf4j
@@ -46,16 +47,29 @@ public class WaterMQHandler {
                     String messageId = message.getMessageProperties().getMessageId();
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
-                    OrderWaterDTO orderWaterDTO = new OrderWaterDTO(){{
+                    OrderWaterDTO orderWaterDTO = new OrderWaterDTO() {{
                         setUserId(orderMQDTO.getUserId());
                         setOrderNo(orderMQDTO.getNo());
                         setOrderId(orderMQDTO.getId());
                     }};
+                    switch (orderMQDTO.getSign()) {
+                        case ORDER_PAY:
+                            orderWaterDTO.setStatus(1);
+                            break;
+                        case ORDER_FINISH:
+                            orderWaterDTO.setStatus(2);
+                            break;
+                        case ORDER_CANCEL:
+                            orderWaterDTO.setStatus(3);
+                            break;
+                        default:
+                            break;
+                    }
                     switch (OrderTypeEnum.get(orderMQDTO.getType())) {
                         case RENT_VEHICLE:
                             orderWaterDTO.setGoodsDTOList(
-                                    new ArrayList<OrderGoodsDTO>(){{
-                                        add(new OrderGoodsDTO(){{
+                                    new ArrayList<OrderGoodsDTO>() {{
+                                        add(new OrderGoodsDTO() {{
                                             setGoodId(orderMQDTO.getOrderRentVehicleDetail().getModelId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
@@ -68,8 +82,8 @@ public class WaterMQHandler {
                             break;
                         case TOUR:
                             orderWaterDTO.setGoodsDTOList(
-                                    new ArrayList<OrderGoodsDTO>(){{
-                                        add(new OrderGoodsDTO(){{
+                                    new ArrayList<OrderGoodsDTO>() {{
+                                        add(new OrderGoodsDTO() {{
                                             setGoodId(orderMQDTO.getOrderTourDetail().getGoodId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
@@ -82,8 +96,8 @@ public class WaterMQHandler {
                             break;
                         case MEMBER:
                             orderWaterDTO.setGoodsDTOList(
-                                    new ArrayList<OrderGoodsDTO>(){{
-                                        add(new OrderGoodsDTO(){{
+                                    new ArrayList<OrderGoodsDTO>() {{
+                                        add(new OrderGoodsDTO() {{
                                             setGoodId(orderMQDTO.getOrderMemberDetail().getMemberLevelId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
@@ -115,31 +129,5 @@ public class WaterMQHandler {
                 }
             }
         });
-
-//        log.info("接收到的消息：json = {}", json);
-//        try{
-//
-//            OrderWaterDTO orderWaterDTO = JSONObject.parseObject(json, OrderWaterDTO.class);
-//            waterBiz.orderWater(orderWaterDTO);
-//        }catch (Exception e){
-//            log.info("接收到的消息失败");
-//            e.printStackTrace();
-//        }
-
     }
-
-    @RabbitListener(queues = {ORDER_FINLISH_USER_RE_QUEUE})
-    public void integralHandler2(String json) {
-        log.info("接收到的消息：json = {}", json);
-        try{
-            OrderWaterDTO orderWaterDTO = JSONObject.parseObject(json, OrderWaterDTO.class);
-            waterBiz.orderWater(orderWaterDTO);
-        }catch (Exception e){
-            log.info("接收到的消息失败");
-            e.printStackTrace();
-        }
-
-    }
-
-
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/mq/OrderMQDTO.java

@@ -9,10 +9,10 @@ import lombok.Data;
 @Data
 public class OrderMQDTO extends BaseOrder {
 
-    public static final Integer ORDER_CRT = 1;
-    public static final Integer ORDER_CANCEL = 2;
-    public static final Integer ORDER_PAY = 4;
-    public static final Integer ORDER_FINISH = 6;
+    public static final int ORDER_CRT = 1;
+    public static final int ORDER_CANCEL = 2;
+    public static final int ORDER_PAY = 4;
+    public static final int ORDER_FINISH = 6;
 
     OrderRentVehicleDetail orderRentVehicleDetail;