From 55e47b2e1a6b414fb2d50e952832b44d972ae2ab Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 30 Apr 2025 15:49:32 +0800
Subject: [PATCH] refactor(socialCircle): 添加上传图片规格说明
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index c8ef391..035ddd5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -582,6 +582,7 @@
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("orderId",happyActivityOrder.getId());
stringObjectHashMap.put("amount",amount);
+ stringObjectHashMap.put("payType",happyActivityOrder.getPayType());
stringObjectHashMap.put("failTime",failTime);
return new FebsResponse().success().data(stringObjectHashMap);
@@ -907,7 +908,7 @@
.last("limit 1")
);
if(happyActivityOrderItem == null){
- throw new FebsException("票号异常！");
+ throw new FebsException("票号不存在！");
}
HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
@@ -943,16 +944,17 @@
.eq(HappyActivityOrderItem::getCode, orderItemCode)
.last("limit 1")
);
- if(happyActivityOrderItem != null){
- if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("票号已核销！");
- }
-
- happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
- happyActivityOrderItem.setTransferItemId(memberId);
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
- agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
+ if(happyActivityOrderItem == null){
+ throw new FebsException("票号不存在！");
}
+ if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
+ throw new FebsException("票号已核销！");
+ }
+
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItem.setTransferItemId(memberId);
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1