修改

ace-modules/ace-admin/pom.xml

@@ -225,6 +225,12 @@
             <artifactId>xx-universal-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-order-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>ace-admin</finalName>

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

-package com.github.wxiaoqi.security.admin.handler;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
-import com.github.wxiaoqi.security.admin.config.RabbitAdminConfig;
-import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.*;
-
-@Component
-@Slf4j
-public class IntegralMQHandler {
-
-    @Autowired
-    AppUserSellingWaterBiz waterBiz;
-    @RabbitListener(queues = ORDER_WATER_QUEUE)
-    public void integralHandler(String json) {
-        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();
-        }
-
-    }
-
-
-}

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

+package com.github.wxiaoqi.security.admin.handler;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.config.RabbitAdminConfig;
+import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
+import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
+import com.rabbitmq.client.Channel;
+import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
+import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.*;
+
+@Component
+@Slf4j
+public class WaterMQHandler {
+
+    @Autowired
+    AppUserSellingWaterBiz waterBiz;
+
+    /**
+     * 佣金
+     * @param
+     */
+    @RabbitListener(queues = ORDER_WATER_QUEUE)
+    public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String messageId = message.getMessageProperties().getMessageId();
+                    String msg = new String(message.getBody(), "UTF-8");
+                    OrderMQDTO orderMQDTO = JSONObject.parseObject(msg, OrderMQDTO.class);
+                    OrderWaterDTO orderWaterDTO = new OrderWaterDTO(){{
+                        setUserId(orderMQDTO.getUserId());
+                        setOrderNo(orderMQDTO.getNo());
+                        setOrderId(orderMQDTO.getId());
+                    }};
+                    switch (OrderTypeEnum.get(orderMQDTO.getType())) {
+                        case RENT_VEHICLE:
+                            orderWaterDTO.setGoodsDTOList(
+                                    new ArrayList<OrderGoodsDTO>(){{
+                                        add(new OrderGoodsDTO(){{
+                                            setGoodId(orderMQDTO.getOrderRentVehicleDetail().getModelId());
+                                            setGoodNumber(1);
+                                            setImg(orderMQDTO.getPicture());
+                                        }})
+                                    }}
+                            );
+                    }
+
+
+                    OrderWaterDTO orderWaterDTO = JSONObject.parseObject(msg, OrderWaterDTO.class);
+                    waterBiz.orderWater(orderWaterDTO);
+
+                    executorService.shutdown();
+                    Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
+                    // 手动签收
+                    channel.basicAck(deliveryTag, false);
+                } catch (Exception e) {
+                    log.info("接收到的消息失败");
+                    try {
+                        channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
+                    } catch (IOException i) {
+                        i.printStackTrace();
+                    }
+                    e.printStackTrace();
+                }
+            }
+        });
+
+//        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-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

@@ -50,7 +50,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
 
         //获取活动code,并且注册来源是app 并且 是邀请注册
         if(POPULARIZE_0101.equals(registerQueueDTO.getInParamDTO().getActivityCode())
-                && RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign())) {
+                && !RegisterQueueDTO.SIGN_LOGIN.equals(registerQueueDTO.getSign())) {
 
             ActivityPopularize activityPopularize = popularizeBiz.selectOne(new ActivityPopularize(){{
                 setCode(activityCode);

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/ActivityPopularizeController.java

@@ -206,4 +206,13 @@ public class ActivityPopularizeController extends BaseController<ActivityPopular
             return finishUserVO;
         }).collect(Collectors.toList()));
     }
+
+//    public static void main(String[] args) {
+//        Map<String, String> map = new HashMap<String, String>(){{
+////            put("1", null);
+////            put("2", null);
+//        }};
+//        List<String> list = map.entrySet().stream().map(k -> k.getKey()).collect(Collectors.toList());
+//        System.out.println(list);
+//    }
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.pojo.mq;
 
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderTourDetail;
 import lombok.Data;
 
 @Data
-public class OrderMQDTO {
+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;
 
-    Integer orderId;
+    OrderRentVehicleDetail orderRentVehicleDetail;
+
+    OrderTourDetail orderTourDetail;
+
+    OrderMemberDetail orderMemberDetail;
+
     /**
      * 标记是什么操作
      * 0--删除"

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -193,6 +194,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      */
     @Transactional
     public void cancel(BaseOrder baseOrder) {
+        OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
+        OrderTourDetail otd = new OrderTourDetail();
+        OrderMemberDetail omd = new OrderMemberDetail();
         if(cancelAble.get(baseOrder.getType()).contains(baseOrder.getStatus())) {
             BaseOrder updateOrder = new BaseOrder(){{
                 setId(baseOrder.getId());
@@ -207,7 +211,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             if(SYS_TRUE.equals(baseOrder.getHasPay())) {
                 //判断订单类型
                 if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
-                    OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
+                    orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
                         setOrderId(baseOrder.getId());
                     }});
 
@@ -234,7 +238,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     }
 
                 }else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
-                    OrderTourDetail otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
+                    otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                         setOrderId(baseOrder.getId());
                     }});
                     Long timeLag = otd.getStartTime() - System.currentTimeMillis();
@@ -251,7 +255,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
             //处理取消流程
             if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
-                OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
+                orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
                     setOrderId(baseOrder.getId());
                 }});
 
@@ -272,7 +276,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     }
                 }
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
-                OrderTourDetail otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
+                otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());
                 }});
 
@@ -280,8 +284,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
             }
 
+            OrderMQDTO orderMQDTO = new OrderMQDTO();
+            orderMQDTO.setOrderMemberDetail(omd);
+            orderMQDTO.setOrderRentVehicleDetail(orvd);
+            orderMQDTO.setOrderTourDetail(otd);
+
             //发送队列消息
-            sendQueue(baseOrder.getId(), OrderMQDTO.ORDER_PAY);
+            sendQueue(orderMQDTO, OrderMQDTO.ORDER_CANCEL);
         }else {
             throw new BaseException(ResultCode.FAILED_CODE);
         }
@@ -422,6 +431,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Transactional
     public void payNotifyHandle(String orderNo, String tradeNo, Integer type) {
         OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
+        OrderTourDetail otd = new OrderTourDetail();
         OrderMemberDetail omd = new OrderMemberDetail();
         BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
             setNo(orderNo);
@@ -471,7 +481,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                OrderTourDetail otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
+                otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());
                 }});
 
@@ -490,7 +500,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
 
                 //发送队列消息
-                sendQueue(orvd.getOrderId(), OrderMQDTO.ORDER_PAY);
+                OrderMQDTO orderMQDTO = BeanUtil.toBean(baseOrder, OrderMQDTO.class);
+                orderMQDTO.setOrderRentVehicleDetail(orvd);
+                orderMQDTO.setOrderTourDetail(otd);
+                orderMQDTO.setOrderMemberDetail(omd);
+                sendQueue(orderMQDTO, OrderMQDTO.ORDER_PAY);
             }
         } else {
             log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
@@ -524,12 +538,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         return zero;
     }
 
-    private void sendQueue(Integer orderId, Integer sign) {
+    private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
         try {
-            OrderMQDTO orderMQDTO = new OrderMQDTO(){{
-                setOrderId(orderId);
-                setSign(sign);
-            }};
+            orderMQDTO.setSign(sign);
             switch (sign) {
                 case 2:
                     mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));