From 5c0f33651a8f2c06e83caff54f99bffb9d81a47f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 14:13:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
index fb728ad..5e4b367 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java
@@ -17,7 +17,7 @@
import com.stylefeng.guns.modular.system.response.MerchantActivityVo;
import com.stylefeng.guns.modular.system.response.UserRequest;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.OrderUtil;
+import com.stylefeng.guns.modular.system.util.OrderUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -280,7 +280,7 @@
UserMerchantCoupon userMerchantCoupon = new UserMerchantCoupon();
userMerchantCoupon.setUserId(two.getUserId());
userMerchantCoupon.setUserType(two.getType());
- userMerchantCoupon.setCode(OrderUtil.getRandomCode(16));
+ userMerchantCoupon.setCode(OrderUtils.getRandomCode(16));
userMerchantCoupon.setMerchantActivityId(merchantActivity.getId());
userMerchantCoupon.setMerchantCouponId(activitySlave.getMerchantCouponId());
userMerchantCoupon.setStatus(1);
--
Gitblit v1.7.1