修改代码

xx-activity/xx-activity-server/pom.xml

@@ -18,6 +18,12 @@
             <artifactId>xx-activity-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>

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitActivityConfig.java

@@ -6,6 +6,8 @@ import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;
+import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
+
 
 /**
  * rabbitmq配置类
@@ -21,14 +23,19 @@ public class RabbitActivityConfig extends RabbitCommonConfig {
     //新人注册有礼
     public static final String ACTIVITY_NEW_QUEUE = "activity.new.queue";
     public static final String INTEGRAL_HANDLE_QUEUE = "integral_handle_queue";
+
+    //优惠券
+    public static final String COUPON_CANCEL_QUEUE = "coupon.cancel.queue";
+
     static {
         myQueue = new ArrayList<BindDTO>(){{
-            add(new BindDTO(INTEGRAL_QUEUE,  RabbitConstant.ORDER_TOPIC, "order.#"));
-            add(new BindDTO(POPULARZIE_0101_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.register"));
-            add(new BindDTO(POPULARZIE_0101_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.auth"));
-            add(new BindDTO(ACTIVITY_NEW_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.register"));
-            add(new BindDTO(ACTIVITY_NEW_QUEUE,  RabbitConstant.ADMIN_TOPIC, "appUser.auth"));
-            add(new BindDTO(INTEGRAL_HANDLE_QUEUE, RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY));
+            add(new BindDTO(INTEGRAL_QUEUE,  ORDER_TOPIC, "order.#"));
+            add(new BindDTO(POPULARZIE_0101_QUEUE,  ADMIN_TOPIC, KEY_APPUSER_REGISTER));
+            add(new BindDTO(POPULARZIE_0101_QUEUE,  ADMIN_TOPIC, KEY_APPUSER_AUTH));
+            add(new BindDTO(ACTIVITY_NEW_QUEUE,  ADMIN_TOPIC, KEY_APPUSER_REGISTER));
+            add(new BindDTO(ACTIVITY_NEW_QUEUE,  ADMIN_TOPIC, KEY_APPUSER_AUTH));
+            add(new BindDTO(INTEGRAL_HANDLE_QUEUE, INTEGRAL_TOPIC, INTEGRAL_ROUTING_KEY));
+            add(new BindDTO(COUPON_CANCEL_QUEUE, ORDER_TOPIC, KEY_ORDER_CANCEL));
         }};
     }
 

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/handler/CouponMQHandler.java

+package com.xxfc.platform.activity.handler;
+
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
+import com.rabbitmq.client.Channel;
+import com.xxfc.platform.activity.biz.ActivityPopularizeBiz;
+import com.xxfc.platform.activity.biz.ActivityUserJoinBiz;
+import com.xxfc.platform.activity.biz.UserCouponBiz;
+import com.xxfc.platform.activity.config.RabbitActivityConfig;
+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.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@Component
+@Slf4j
+public class CouponMQHandler {
+
+    @Autowired
+    ActivityPopularizeBiz activityPopularizeBiz;
+
+    @Autowired
+    ActivityUserJoinBiz activityUserJoinBiz;
+
+    @Autowired
+    UserCouponBiz userCouponBiz;
+
+    @RabbitListener(queues = {RabbitActivityConfig.COUPON_CANCEL_QUEUE})
+    public void popularizeHandler(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");
+                    log.info("接收到的消息：msg = {}, 消息ID是：messageId = {} ", msg, messageId);
+
+                    if (StringUtils.isNotBlank(msg)) {
+                        OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
+                        if(StrUtil.isNotBlank(orderMQDTO.getCouponTickerNos())) {
+                            for(String tickerNo : orderMQDTO.getCouponTickerNos().split(",")) {
+                                // 返还优惠券
+                                userCouponBiz.cancelTickerNo(tickerNo);
+                            }
+                        }
+                    }
+
+                    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();
+                }
+            }
+        });
+    }
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -235,4 +235,11 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "优惠券优惠的价格")
 	@Column(name = "coupon_amount")
 	private BigDecimal couponAmount;
+
+	/**
+	 * 使用的优惠券票号，逗号分割
+	 */
+	@ApiModelProperty(value = "使用的优惠券票号，逗号分割")
+	@Column(name = "coupon_ticker_no")
+	private String couponTickerNos;
 }

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

@@ -12,6 +12,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
+import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
@@ -93,6 +94,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     public List<OrderPageVO> pageByParm(Map<String, Object> paramMap){
         return mapper.pageByParm(paramMap);
     }

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

@@ -245,6 +245,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //待完成
         if(null != detail.getTickerNo() && detail.getTickerNo().size() > 0) {
             couponAmount = activityFeign.use(dto.getUserid(), detail.getTickerNo().get(0), detail.getOrder().getNo(), channel, goodsAmount, ActivityFeign.TYPE_NO_USE);
+            if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
+                detail.getOrder().setCouponTickerNos(detail.getTickerNo().get(0));
+            }
         }
 
             //总价格（包含押金）

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

@@ -218,6 +218,9 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         //待完成
         if(null != detail.getTickerNo() && detail.getTickerNo().size() > 0) {
             couponAmount = activityFeign.use(dto.getUserid(), detail.getTickerNo().get(0), detail.getOrder().getNo(), channel, goodsAmount, ActivityFeign.TYPE_NO_USE);
+            if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
+                detail.getOrder().setCouponTickerNos(detail.getTickerNo().get(0));
+            }
         }
 
             //总价格