diff --git a/hai-service/src/main/java/com/hai/common/utils/RequestUtils.java b/hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
index 3774a300..756c5ce6 100644
--- a/hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
+++ b/hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
@@ -45,6 +45,10 @@ public class RequestUtils {
 
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
 
+        if  (requestAttributes == null) {
+            return null;
+        }
+
         // 从获取RequestAttributes中获取HttpServletRequest的信息
         HttpServletRequest request = (HttpServletRequest) requestAttributes.resolveReference(RequestAttributes.REFERENCE_REQUEST);
 
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageServiceImpl.java
index 25bc2d92..e50451c2 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageServiceImpl.java
@@ -429,8 +429,8 @@ public class HighDiscountPackageServiceImpl implements HighDiscountPackageServic
                         deliverUser.setPackageId(packageId);
                         deliverUser.setPackageName(discountPackage.getTitle());
                         deliverUser.setPackageActualId(packageActual.getId().longValue());
-                        deliverUser.setUserId(highUser.getId());
-                        deliverUser.setUserPhone(highUser.getPhone());
+                        deliverUser.setUserId(user.getId());
+                        deliverUser.setUserPhone(user.getPhone());
                         deliverUser.setStatus(2);
                         discountPackageDeliverService.insertDeliverUser(deliverUser);
                     }
diff --git a/hai-user/src/main/java/com/web/controller/TestController.java b/hai-user/src/main/java/com/web/controller/TestController.java
index d0a7159c..b5683385 100644
--- a/hai-user/src/main/java/com/web/controller/TestController.java
+++ b/hai-user/src/main/java/com/web/controller/TestController.java
@@ -1 +1 @@
-package com.web.controller;

import com.alibaba.fastjson.JSONObject;
import com.hai.common.utils.DateUtil;
import com.hai.common.utils.RedisUtil;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.HuiLianTongUnionCardConfig;
import com.hai.entity.HighOrder;
import com.hai.model.ResponseData;
import com.hai.order.model.CreateOrderModel;
import com.hai.order.service.OrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class TestController {

    private static Logger log = LoggerFactory.getLogger(TestController.class);

    @Autowired
    private RocketMQTemplate rocketMQTemplate;

    @Resource
    private OrderService orderService;

    @Resource
    private RedisUtil redisUtil;

    @Autowired
    private RedisTemplate redisTemplate;

    @RequestMapping(value = "/q", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData q(@RequestParam(name = "orderNo", required = true) String orderNo) {
    try {

        // 查询工会卡
        JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance("8800030115015135432");
        if (cardInfo.getInteger("respCode").equals(0000)) {
            // 解密响应参数
            JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"));
            return ResponseMsgUtil.success(resolveResponse.getBigDecimal("balance"));
        }
        return ResponseMsgUtil.success(0);

    } catch (Exception e) {
        log.error("HighUserCardController --> rocketMq() error!", e);
        return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/rocketMq", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup,
                                 @RequestParam(name = "body", required = true) String body) {
        try {

            long startTime = System.currentTimeMillis();

            // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build();

            CreateOrderModel createOrder = new CreateOrderModel();

            //发送对象消息
            HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class);
            System.out.println("订单号：" + order.getOrderNo());

            // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000);

            /*List<HighOrder> list = new LinkedList<>();
            for (int i = 0; i <= 100;i++) {
                list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));
*//*                list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//*
               *//* updateUserWithRedisLock("coupon_" + couponKey, i+"");
                new Thread(() -> {*//*
                   *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i);
                    System.out.println("加入数据" + i);*//*

                    // redisTemplate.delete("coupon" + couponKey);
                    // System.out.println("释放数据" + index);
*//*
                });*//*
            }*/

            System.out.println(System.currentTimeMillis() - startTime);
            return ResponseMsgUtil.success(null);

        } catch (Exception e) {
            log.error("HighUserCardController --> rocketMq() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException {
        // 占分布式锁，去redis占坑
        // 1. 分布式锁占坑
        Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value);
        if(lock) {
            //加锁成功...
            // todo business
            System.out.println("加锁成功： " + value);

            redisTemplate.delete("coupon" + couponKey);   //删除key，释放锁
        } else {
            System.out.println("加锁失败");
           /* Thread.sleep(100);   // 加锁失败，重试
            updateUserWithRedisLock("sysUser");*/
        }
    }

}

\ No newline at end of file
+package com.web.controller;

import com.alibaba.fastjson.JSONObject;
import com.hai.common.utils.DateUtil;
import com.hai.common.utils.RedisUtil;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.config.HuiLianTongUnionCardConfig;
import com.hai.entity.HighOrder;
import com.hai.model.ResponseData;
import com.hai.order.model.CreateOrderModel;
import com.hai.order.service.OrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.Date;

/**
 * @Auther: 胡锐
 * @Description:
 * @Date: 2021/3/26 23:08
 */
@Controller
@RequestMapping(value = "/test")
@Api(value = "订单接口")
public class TestController {

    private static Logger log = LoggerFactory.getLogger(TestController.class);

    @Autowired
    private RocketMQTemplate rocketMQTemplate;

    @Autowired
    private RedisTemplate redisTemplate;

    @RequestMapping(value = "/q", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData q(@RequestParam(name = "orderNo", required = true) String orderNo) {
    try {

        // 查询工会卡
        JSONObject cardInfo = HuiLianTongUnionCardConfig.queryBalance("8800030115015135432");
        if (cardInfo.getInteger("respCode").equals(0000)) {
            // 解密响应参数
            JSONObject resolveResponse = HuiLianTongUnionCardConfig.resolveResponse(cardInfo.getString("data"));
            return ResponseMsgUtil.success(resolveResponse.getBigDecimal("balance"));
        }
        return ResponseMsgUtil.success(0);

    } catch (Exception e) {
        log.error("HighUserCardController --> rocketMq() error!", e);
        return ResponseMsgUtil.exception(e);
        }
    }

    @RequestMapping(value = "/rocketMq", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation(value = "")
    public ResponseData rocketMq(@RequestParam(name = "topicGroup", required = true) String topicGroup,
                                 @RequestParam(name = "body", required = true) String body) {
        try {

            long startTime = System.currentTimeMillis();

            // org.springframework.messaging.Message message = MessageBuilder.withPayload(order).build();

            CreateOrderModel createOrder = new CreateOrderModel();

            //发送对象消息
            HighOrder order = rocketMQTemplate.sendAndReceive("order-topic:create", createOrder, HighOrder.class);
            System.out.println("订单号：" + order.getOrderNo());

            // SendResult sendResult = rocketMQTemplate.syncSend("order-topic:create", message, 3000);

            /*List<HighOrder> list = new LinkedList<>();
            for (int i = 0; i <= 100;i++) {
                list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));
*//*                list.add(orderService.getDetailByOrderNo("HF2022080918014365701"));*//*
               *//* updateUserWithRedisLock("coupon_" + couponKey, i+"");
                new Thread(() -> {*//*
                   *//* redisTemplate.opsForValue().setIfAbsent("coupon_" + couponKey, i);
                    System.out.println("加入数据" + i);*//*

                    // redisTemplate.delete("coupon" + couponKey);
                    // System.out.println("释放数据" + index);
*//*
                });*//*
            }*/

            System.out.println(System.currentTimeMillis() - startTime);
            return ResponseMsgUtil.success(null);

        } catch (Exception e) {
            log.error("HighUserCardController --> rocketMq() error!", e);
            return ResponseMsgUtil.exception(e);
        }
    }

    public void updateUserWithRedisLock(String couponKey, String value) throws InterruptedException {
        // 占分布式锁，去redis占坑
        // 1. 分布式锁占坑
        Boolean lock = redisTemplate.opsForValue().setIfAbsent("coupon" + couponKey, value);
        if(lock) {
            //加锁成功...
            // todo business
            System.out.println("加锁成功： " + value);

            redisTemplate.delete("coupon" + couponKey);   //删除key，释放锁
        } else {
            System.out.println("加锁失败");
           /* Thread.sleep(100);   // 加锁失败，重试
            updateUserWithRedisLock("sysUser");*/
        }
    }

}

\ No newline at end of file