From 3802d7f8a475e9b34f4d06fd511c4f7d0f652ed2 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Wed, 24 Jan 2024 17:17:53 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 1be19b6..0e4af18 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -304,7 +304,7 @@
}
}
- List<MallShoppingCart> carts = mallShoppingCartMapper.selectCartGoodsList(id);
+ List<MallShoppingCart> carts = mallShoppingCartMapper.selectCartGoodsList(id, 1);
Map<String, Object> result = new HashMap<>();
result.put("order", orderCnt);
result.put("carts", carts.size());
@@ -703,7 +703,15 @@
if(StrUtil.isNotEmpty(avatarUrl)){
mallMember.setAvatar(avatarUrl);
}
-// mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
+
+ if (StrUtil.isNotBlank(apiXcxSaveInfoDto.getRealName())) {
+ mallMember.setRealName(apiXcxSaveInfoDto.getRealName());
+ }
+
+ if (apiXcxSaveInfoDto.getBirthday() != null) {
+ mallMember.setBirthday(apiXcxSaveInfoDto.getBirthday());
+ }
+ mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
this.baseMapper.updateById(mallMember);
return new FebsResponse().success();
}
@@ -935,6 +943,35 @@
}
@Override
+ public FebsResponse scanCoupon(GetCouponDto getCouponDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ String couponUUID = IdUtil.simpleUUID();
+ //通过邀请人信息，获取能领取的优惠卷信息
+ MallMember mallMember = this.baseMapper.selectInfoByInviteId(getCouponDto.getInviteId());
+ if(ObjectUtil.isNotEmpty(mallMember)){
+ SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(mallMember.getId());
+ if(ObjectUtil.isNotEmpty(salemanCoupon)){
+ Long couponId = salemanCoupon.getCouponId();
+ List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(memberId, couponId);
+ if(CollUtil.isEmpty(mallMemberCoupons)){
+ //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
+ MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+ MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+ mallMemberCoupon.setCouponId(couponId);
+ mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+ mallMemberCoupon.setMemberId(memberId);
+ mallMemberCoupon.setCouponUuid(couponUUID);
+ mallMemberCoupon.setInviteId(mallMember.getInviteId());
+ mallMemberCoupon.setState(1);
+ mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+ mallMemberCouponMapper.insert(mallMemberCoupon);
+ }
+ }
+ }
+ return new FebsResponse().success();
+ }
+
+ @Override
public FebsResponse memberCoupon(MallMemberCouponDto mallMemberCouponDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
IPage<MallMemberCouponVo> page = new Page<>(mallMemberCouponDto.getPageNum(), mallMemberCouponDto.getPageSize());
@@ -942,6 +979,19 @@
mallMemberCouponDto.setExpireTime(DateUtil.date());
IPage<MallMemberCouponVo> pages = mallMemberCouponMapper.selectListInPage(page, mallMemberCouponDto);
return new FebsResponse().success().data(pages);
+ }
+
+ @Override
+ public FebsResponse memberPayCoupon(MallMemberCouponDto mallMemberCouponDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ mallMemberCouponDto.setMemberId(memberId);
+ mallMemberCouponDto.setExpireTime(DateUtil.date());
+ List<Long> couponIds = couponGoodsMapper.selectByGoodId(mallMemberCouponDto.getGoodsId());
+ List<MallMemberCouponVo> mallMemberCouponVos = new ArrayList<>();
+ if(CollUtil.isNotEmpty(couponIds)){
+ mallMemberCouponVos = mallMemberCouponMapper.selectListCreateInPage(mallMemberCouponDto,couponIds);
+ }
+ return new FebsResponse().success().data(mallMemberCouponVos);
}
@Override
@@ -953,6 +1003,7 @@
MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(mallMemberCoupon.getCouponId());
mallMemberCouponVo.setCostAmount(mallGoodsCoupon.getCostAmount());
mallMemberCouponVo.setRealAmount(mallGoodsCoupon.getRealAmount());
+ mallMemberCouponVo.setType(mallGoodsCoupon.getType());
return new FebsResponse().success().data(mallMemberCouponVo);
}
--
Gitblit v1.9.1