From 8522e469e00e1cf6c0410165b0f76c806c13ca83 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:17:04 +0800
Subject: [PATCH] 合并代码
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/MerchantActivityGiveController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 d39026d..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;
@@ -53,7 +53,7 @@
@Autowired
private IUserService userService;
- @Resource
+ @Autowired
private ShiroExtUtil shiroExtUtil;
@RequestMapping("/index")
@@ -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