From b29fe428f618c5cc960966a5f15febd3d9474c5e Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Thu, 18 Sep 2025 10:33:12 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/manage/AcConsumeRuleConfigController.java      | 2 +-
 .../controller/manage/AcMemberConsumeRuleController.java      | 2 +-
 .../consume/service/impl/AcConsumeRuleConfigServiceImpl.java  | 2 +-
 .../consume/service/impl/AcMemberConsumeRuleServiceImpl.java  | 2 +-
 .../draw/controller/manage/AcDrawRewardRecordController.java  | 2 ++
 .../wares/controller/manage/WaresRuleConfigController.java    | 2 +-
 .../wares/service/impl/AcWaresRuleConfigServiceImpl.java      | 2 ++
 .../java/com/hzs/common/core/enums/EOperationBusiness.java    | 4 ++++
 .../main/java/com/hzs/common/core/enums/EOperationModule.java | 4 ++++
 9 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java
index 3b143642..4552ac5b 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java
@@ -172,7 +172,7 @@ public class AcConsumeRuleConfigController extends BaseController {
      * @param recommendParam 消费赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
+    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "消费赠送")
     @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java
index b19c5675..3a36d6f9 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java
@@ -111,7 +111,7 @@ public class AcMemberConsumeRuleController extends BaseController {
      * @param memberConsumeRuleVo 会员消费赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈")
+    @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "会员消费赠送")
     @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) {
         memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser());
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java
index 7dc426f1..fb28a6de 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java
@@ -108,7 +108,7 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl<AcConsumeRuleCon
      * @param recommendParam
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcRecommendParam recommendParam) {
         log.info("消费赠送入参{}", recommendParam);
         EApprovalBusiness approvalBusiness = null;
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
index 82ead04c..e62b66ef 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcMemberConsumeRuleServiceImpl.java
@@ -82,7 +82,7 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl<AcMemberConsumeR
      * @return: java.lang.Boolean
      **/
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcMemberConsumeRuleVo memberConsumeRuleVo) {
         log.info("商品赠送入参{}",JSONUtil.toJsonStr(memberConsumeRuleVo));
         EApprovalBusiness approvalBusiness = null;
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java
index bcf7ce39..2fd67f2f 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawRewardRecordController.java
@@ -118,6 +118,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值已购买次数按钮 (审批)
      */
     @PostMapping("/purchased-times")
+    @Log(module = EOperationModule.DRAW_PURCHASED,business = EOperationBusiness.DRAW_PURCHASED,method = EOperationMethod.INSERT,remark = "充值已购买次数")
     public AjaxResult purchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {
@@ -145,6 +146,7 @@ public class AcDrawRewardRecordController extends BaseController {
      * 充值未购买次数 (走审批)
      */
     @PostMapping("/unpurchased-times")
+    @Log(module = EOperationModule.DRAW_UNPURCHASED,business = EOperationBusiness.DRAW_UNPURCHASED,method = EOperationMethod.INSERT,remark = "充值未购买次数")
     public AjaxResult unpurchasedTimes(@RequestBody PurchasedTimesParam purchasedTimesParam) {
         Integer pkCountry = SecurityUtils.getPkCountry();
         if (StringUtils.isBlank(purchasedTimesParam.getMemberCode())) {
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java
index 6bac0df9..633f5207 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/controller/manage/WaresRuleConfigController.java
@@ -163,7 +163,7 @@ public class WaresRuleConfigController extends BaseController {
      * @param recommendParam 商品赠送参数
      * @return AjaxResult
      */
-    @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "在线签呈")
+    @Log(module = EOperationModule.AC_WARES_RULE_CONFIG, business = EOperationBusiness.AC_WARES_RULE_CONFIG, method = EOperationMethod.INSERT, remark = "商品赠送")
     @PostMapping("/submit")
     public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) {
         recommendParam.setPkCountry(SecurityUtils.getPkCountry());
diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java
index dbad8392..0f75c255 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java
@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -110,6 +111,7 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl<AcWaresRuleConfigM
      * @param recommendParam
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String onLinePetition(AcRecommendParam recommendParam) {
         log.info("商品赠送入参{}",recommendParam);
         EApprovalBusiness approvalBusiness = null;
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
index 7f27224f..a5bb49d7 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java
@@ -248,6 +248,10 @@ public enum EOperationBusiness {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     AC_RECOMMEEND_CONFIG("直推赠送"),
 
     AC_WARES_RULE_CONFIG("商品赠送"),
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
index f634f3a7..68ac3a01 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
@@ -164,6 +164,10 @@ public enum EOperationModule {
 
     DRAW_DETAIL("抽奖明细"),
 
+    DRAW_PURCHASED("充值已购买次数"),
+
+    DRAW_UNPURCHASED("充值未购买次数"),
+
     RECOMMEND_GIVE("直推赠送"),
     BENEFITS_GIVE("权益赠送"),
     BENEFITS_GIVE_LOG("权益赠送记录"),