From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
index 46b2aae..7e04b7b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
@@ -72,11 +72,11 @@
}
Integer num = card.getNum();
- Integer startNo = Integer.valueOf(cardParam.getStartNo());
+ int startNo = Integer.valueOf(cardParam.getStartNo());
Card count = new Card();
count.setParamId(card.getParamId());
- Integer countNum = count(count);
- startNo = countNum != 0 ? startNo+countNum : startNo;
+ long countNum = Constants.formatLongNum(count(count));
+ startNo = countNum != 0 ? (int) (startNo + countNum) : startNo;
List<Integer> list = new ArrayList<>();
for (int i = 0; i <num; i++) {
@@ -201,7 +201,7 @@
}
@Override
- public Integer count(Card card) {
+ public Long count(Card card) {
QueryWrapper<Card> wrapper = new QueryWrapper<>(card);
return cardMapper.selectCount(wrapper);
}
@@ -254,6 +254,6 @@
dealIntegralRequest.setMemberId(memberId);
dealIntegralRequest.setObjId(card.getId());
dealIntegralRequest.setDealType(Constants.ZERO);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
}
--
Gitblit v1.9.3