czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开通 问题

Browse Source
This commit is contained in:
wangw
2025-12-25 14:37:11 +08:00
parent ef48e4e51d
commit 7d434ff5c7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/market-server/src/main/java/com/czg/controller/admin/MemberController.java
View File

@@ -24,6 +24,7 @@ import java.util.Map;
/** /**
* 会员配置管理 * 会员配置管理
* @author ww
*/ */
@RestController @RestController

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@@ -421,7 +421,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
orderInfoService.getOneAs(query().select("sum(pay_amount)").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId()) orderInfoService.getOneAs(query().select("sum(pay_amount)").eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getUserId, shopUser.getUserId())
.eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()), BigDecimal.class) .eq(OrderInfo::getStatus, OrderStatusEnums.DONE.getCode()), BigDecimal.class)
.compareTo(new BigDecimal(item.getValue())) >= 0; .compareTo(new BigDecimal(item.getValue())) >= 0;
case "RECHARGE_AMOUNT" -> paymentService.getOneAs(query().select("sum(amount)") case "RECHARGE_AMOUNT" ->
paymentService.getOneAs(query().select("sum(amount)")
.eq(OrderPayment::getShopId, shopId) .eq(OrderPayment::getShopId, shopId)
.eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN) .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
.eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY) .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)
@@ -439,7 +440,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
upShopUser.setId(shopUser.getId()); upShopUser.setId(shopUser.getId());
upShopUser.setMemberLevelId(levelConfig.getId()); upShopUser.setMemberLevelId(levelConfig.getId());
upShopUser.setStartTime(LocalDateTime.now()); upShopUser.setStartTime(LocalDateTime.now());
upShopUser.setEndTime(shopUser.getStartTime().plusDays(20000)); upShopUser.setEndTime(upShopUser.getStartTime().plusDays(20000));
upShopUser.setIsVip(1); upShopUser.setIsVip(1);
if (shopUser.getJoinTime() != null) { if (shopUser.getJoinTime() != null) {
upShopUser.setJoinTime(LocalDateTime.now()); upShopUser.setJoinTime(LocalDateTime.now());