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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
wangw 2025-10-16 18:03:41 +08:00
parent c4cd9bc231 2e116de9a8
commit b16237467d
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cash-api/market-server/src/main/java/com/czg/controller/user/UBirthdayGiftController.java
View File

@ -1,13 +1,13 @@
package com.czg.controller.user; package com.czg.controller.user;
import com.czg.market.entity.ShopCoupon;
import com.czg.market.service.MkBirthdayGiftService; import com.czg.market.service.MkBirthdayGiftService;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.ArrayList;
import java.util.Map;
/** /**
* 生日有礼相关 * 生日有礼相关
@ -24,7 +24,7 @@ public class UBirthdayGiftController {
* 获取生日有礼 不为空则代表今日发放生日有礼的奖励 * 获取生日有礼 不为空则代表今日发放生日有礼的奖励
*/ */
@GetMapping @GetMapping
public CzgResult<List<ShopCoupon>> detail(@RequestParam Integer shopId) { public CzgResult<ArrayList<Map<String, Object>>> detail(@RequestParam Integer shopId) {
return CzgResult.success(service.getInfo(StpKit.USER.getLoginIdAsLong(), shopId)); return CzgResult.success(service.getInfo(StpKit.USER.getLoginIdAsLong(), shopId));
} }

16
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.czg.constant.TableValueConstant;
import com.czg.market.dto.CouponInfoDTO; import com.czg.market.dto.CouponInfoDTO;
import com.czg.market.dto.MkBirthdayGiftDTO; import com.czg.market.dto.MkBirthdayGiftDTO;
import com.czg.market.dto.MkRewardCouponDTO; import com.czg.market.dto.MkRewardCouponDTO;
import com.czg.market.dto.ShopCouponDTO;
import com.czg.market.entity.*; import com.czg.market.entity.*;
import com.czg.market.service.*; import com.czg.market.service.*;
import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO; import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
@ -35,7 +36,6 @@ import org.springframework.stereotype.Service;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -227,7 +227,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
} }
@Override @Override
public List<ShopCoupon> getInfo(long userId, Integer shopId) { public ArrayList<Map<String, Object>> getInfo(long userId, Integer shopId) {
MkBirthdayGift birthdayGift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId).eq(MkBirthdayGift::getIsEnable, 1)); MkBirthdayGift birthdayGift = getOne(new QueryWrapper().eq(MkBirthdayGift::getMainShopId, shopId).eq(MkBirthdayGift::getIsEnable, 1));
if (birthdayGift == null) { if (birthdayGift == null) {
return null; return null;
@ -253,8 +253,16 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
} }
if (DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate().isEqual(current)) { if (DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate().isEqual(current)) {
List<CouponInfoDTO> couponInfoList = config.getCouponInfoList(); ArrayList<Map<String, Object>> arrayList = new ArrayList<>();
return shopCouponService.list(new QueryWrapper().in(ShopCoupon::getId, couponInfoList.stream().map(CouponInfoDTO::getId).toList())); config.getCouponInfoList().forEach(item -> {
ShopCouponDTO shopCoupon = shopCouponService.getCouponById(item.getId());
arrayList.add(Map.of(
"num", item.getNum(),
"couponInfo", shopCoupon
));
});
return arrayList;
} }
} }

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java
View File

@ -109,7 +109,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl<MkConsumeCashbackM
for (MkConsumeCashbackStep cashbackStep : cashbackStepList) { for (MkConsumeCashbackStep cashbackStep : cashbackStepList) {
if (cashbackStep.getAmount().compareTo(amount) <= 0 ) { if (cashbackStep.getAmount().compareTo(amount) <= 0 ) {
BigDecimal cashbackAmount = BigDecimal.ZERO; BigDecimal cashbackAmount;
// 固定金额 // 固定金额
if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) { if (TableValueConstant.MkConsumeCashback.CashbackType.FIX.getCode().equals(config.getCashbackType())) {
cashbackAmount = cashbackStep.getCashbackAmount(); cashbackAmount = cashbackStep.getCashbackAmount();