From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 266 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 205 insertions(+), 61 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 2dd08c5..b5027d5 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
@@ -14,6 +14,8 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiLabelInfoVo;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiMemberLabelVo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.MD5;
@@ -89,6 +91,9 @@
private final MallStoreMemberMapper mallStoreMemberMapper;
private final MallDoctorMapper mallDoctorMapper;
private final HappyMemberLevelMapper happyMemberLevelMapper;
+ private final IApiMallMemberWalletService mallMemberWalletService;
+ private final HappyMemberLabelRecordMapper happyMemberLabelRecordMapper;
+ private final HappyMemberLabelMapper happyMemberLabelMapper;
@Value("${spring.profiles.active}")
@@ -270,17 +275,23 @@
HappyMemberLevel happyMemberLevel = happyMemberLevelMapper.selectOne(
new LambdaQueryWrapper<HappyMemberLevel>()
- .select(HappyMemberLevel::getName)
+ .select(HappyMemberLevel::getName, HappyMemberLevel::getIconPng)
.eq(HappyMemberLevel::getCode, mallMember.getDirector())
);
if(happyMemberLevel != null){
mallMemberVo.setLevelName(happyMemberLevel.getName());
+ mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
}
if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
if (referMember != null) {
mallMemberVo.setReferrerName(referMember.getName());
}
+ }
+ if(mallMember.getStoreMaster() == 0){
+ mallMemberVo.setIsTeamLeader(2);
+ }else{
+ mallMemberVo.setIsTeamLeader(1);
}
if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -316,6 +327,31 @@
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
// mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
+
+ List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+ new LambdaQueryWrapper<HappyMemberLabelRecord>()
+ .eq(HappyMemberLabelRecord::getMemberId, id)
+ .orderByDesc(HappyMemberLabelRecord::getId)
+ .last("limit 5")
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
+ Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
+ List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+ new LambdaQueryWrapper<HappyMemberLabel>()
+ .select(HappyMemberLabel::getIconPng, HappyMemberLabel::getName)
+ .in(HappyMemberLabel::getId, collect)
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabels)){
+ ArrayList<ApiLabelInfoVo> apiMemberLabelVos = new ArrayList<>();
+ for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
+ ApiLabelInfoVo apiLabelInfoVo = new ApiLabelInfoVo();
+ apiLabelInfoVo.setIconPng(happyMemberLabel.getIconPng());
+ apiLabelInfoVo.setName(happyMemberLabel.getName());
+ apiMemberLabelVos.add(apiLabelInfoVo);
+ }
+ mallMemberVo.setLabelList(apiMemberLabelVos);
+ }
+ }
return new FebsResponse().success().data(mallMemberVo);
}
@@ -694,6 +730,33 @@
wallet.setBalance(BigDecimal.ZERO);
wallet.setMemberId(mallMember.getId());
mallMemberWalletMapper.insert(wallet);
+
+ //分销员的邀请码赠送优惠卷
+ if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
+ String couponUUID = IdUtil.simpleUUID();
+ //通过邀请人信息，获取能领取的优惠卷信息
+ MallMember refMember = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
+ if(ObjectUtil.isNotEmpty(refMember)){
+ SalemanCoupon salemanCoupon = salemanCouponMapper.selectByMemberId(refMember.getId());
+ if(ObjectUtil.isNotEmpty(salemanCoupon)){
+ Long couponId = salemanCoupon.getCouponId();
+ List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(mallMember.getId(), couponId);
+ if(CollUtil.isEmpty(mallMemberCoupons)){
+ //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
+ MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+ MallMemberCoupon mallMemberCoupon = new MallMemberCoupon();
+ mallMemberCoupon.setCouponId(couponId);
+ mallMemberCoupon.setCouponName(mallGoodsCoupon.getName());
+ mallMemberCoupon.setMemberId(mallMember.getId());
+ mallMemberCoupon.setCouponUuid(couponUUID);
+ mallMemberCoupon.setInviteId(refMember.getInviteId());
+ mallMemberCoupon.setState(1);
+ mallMemberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(),mallGoodsCoupon.getExpireDay()));
+ mallMemberCouponMapper.insert(mallMemberCoupon);
+ }
+ }
+ }
+ }
} else {
if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
throw new FebsException("账号已停用");
@@ -762,46 +825,49 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
this.baseMapper.updateById(mallMember);
- //完善信息赠送新人礼
- if (StrUtil.isBlank(mallMember.getLevel())) {
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
- CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
- );
- ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
- if (apiNewGiftSettingDto.getState() == 1) {
- String prizeScore = apiNewGiftSettingDto.getPrizeScore();
- BigDecimal bigDecimal = new BigDecimal(prizeScore).setScale(0, RoundingMode.HALF_DOWN);
- if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
- walletService.add(bigDecimal, mallMember.getId(), "prizeScore");
- mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
- bigDecimal,
- ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getValue(),
- MallUtils.getOrderNum(),
- FlowTypeEnum.PRIZE_SCORE.getValue(),
- StrUtil.format(ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getDesc(),bigDecimal),
- 2
- );
- }
- if (apiNewGiftSettingDto.getCouponId() != null) {
- MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(apiNewGiftSettingDto.getCouponId());
- if(ObjectUtil.isNotEmpty(mallGoodsCoupon)){
- MallMemberCoupon memberCoupon = new MallMemberCoupon();
- memberCoupon.setCouponId(mallGoodsCoupon.getId());
- memberCoupon.setCouponName(mallGoodsCoupon.getName());
- memberCoupon.setInviteId(mallMember.getInviteId());
- memberCoupon.setCouponUuid(IdUtil.simpleUUID());
- memberCoupon.setState(1);
- memberCoupon.setFromType(3);
- memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay()));
- memberCoupon.setMemberId(mallMember.getId());
- mallMemberCouponMapper.insert(memberCoupon);
- }
- }
-
- }
- }
+// //完善信息赠送新人礼
+// if (StrUtil.isNotBlank(mallMember.getPhone()) && mallMember.getNewGift() == 0) {
+// DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+// CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
+// CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
+// );
+// mallMember.setNewGift(1);
+// this.baseMapper.updateById(mallMember);
+//
+// ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
+// if (apiNewGiftSettingDto.getState() == 1) {
+// String prizeScore = apiNewGiftSettingDto.getPrizeScore();
+// BigDecimal bigDecimal = new BigDecimal(prizeScore).setScale(0, RoundingMode.HALF_DOWN);
+// if (bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+// walletService.add(bigDecimal, mallMember.getId(), "prizeScore");
+// mallMoneyFlowService.addMoneyFlow(
+// mallMember.getId(),
+// bigDecimal,
+// ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getValue(),
+// MallUtils.getOrderNum(),
+// FlowTypeEnum.PRIZE_SCORE.getValue(),
+// StrUtil.format(ScoreFlowTypeEnum.MEMBER_INFO_GIFT.getDesc(),bigDecimal),
+// 2
+// );
+// }
+// if (apiNewGiftSettingDto.getCouponId() != null) {
+// MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(apiNewGiftSettingDto.getCouponId());
+// if(ObjectUtil.isNotEmpty(mallGoodsCoupon)){
+// MallMemberCoupon memberCoupon = new MallMemberCoupon();
+// memberCoupon.setCouponId(mallGoodsCoupon.getId());
+// memberCoupon.setCouponName(mallGoodsCoupon.getName());
+// memberCoupon.setInviteId(mallMember.getInviteId());
+// memberCoupon.setCouponUuid(IdUtil.simpleUUID());
+// memberCoupon.setState(1);
+// memberCoupon.setFromType(3);
+// memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay()));
+// memberCoupon.setMemberId(mallMember.getId());
+// mallMemberCouponMapper.insert(memberCoupon);
+// }
+// }
+//
+// }
+// }
return new FebsResponse().success();
}
@@ -919,10 +985,12 @@
mallMoneyFlowService.addMoneyFlow(
memberId,
amount,
- MoneyFlowTypeEnum.RECHARGE.getValue(),
+ ScoreFlowTypeEnum.RECHARGE_ING.getValue(),
rechargeNo,
FlowTypeEnum.BALANCE.getValue(),
- "余额充值",1);
+ StrUtil.format(ScoreFlowTypeEnum.RECHARGE_ING.getDesc(),amount),
+ 1
+ );
String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
String payResultStr = brandWCPayRequestData.getPrepay_id();
@@ -1575,18 +1643,12 @@
ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo();
MallMember mallMember = this.baseMapper.selectById(memberId);
- Date lastLoginTime = mallMember.getLastLoginTime();
- if(lastLoginTime == null){
+
+ Integer newGift = mallMember.getNewGift();
+ if(newGift == 0){
apiMemberNewGiftSettingVo.setOpenState(1);
- }
- if(lastLoginTime != null){
- Date now = new Date();
- long between = DateUtil.between(lastLoginTime, now, DateUnit.DAY);
- if(between > 0){
- apiMemberNewGiftSettingVo.setOpenState(1);
- }else{
- apiMemberNewGiftSettingVo.setOpenState(0);
- }
+ }else{
+ apiMemberNewGiftSettingVo.setOpenState(0);
}
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -1595,20 +1657,102 @@
);
ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
apiMemberNewGiftSettingVo.setState(apiNewGiftSettingDto.getState());
- apiMemberNewGiftSettingVo.setPrizeScore(apiNewGiftSettingDto.getPrizeScore());
+ if(apiMemberNewGiftSettingVo.getState() == 1 && apiMemberNewGiftSettingVo.getOpenState() == 1){
+ mallMember.setNewGift(1);
- LambdaQueryWrapper<MallGoodsCoupon> query = new LambdaQueryWrapper<>();
- query.eq(MallGoodsCoupon::getId, apiNewGiftSettingDto.getCouponId())
- .eq(MallGoodsCoupon::getState, 2);
- List<MallGoodsCoupon> coupons = mallGoodsCouponMapper.selectList(query);
- if(CollUtil.isNotEmpty(coupons)){
- apiMemberNewGiftSettingVo.setCouponName(coupons.get(0).getName());
+ BigDecimal prizeScore = new BigDecimal(StrUtil.isBlank(apiNewGiftSettingDto.getPrizeScore()) ? "0" : apiNewGiftSettingDto.getPrizeScore())
+ .setScale(0, RoundingMode.HALF_DOWN);
+
+ if(prizeScore.compareTo(BigDecimal.ZERO) > 0){
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ prizeScore,
+ ScoreFlowTypeEnum.NEW_GIFT_PRIZE_SCORE.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format( ScoreFlowTypeEnum.NEW_GIFT_PRIZE_SCORE.getDesc(),prizeScore),
+ 2);
+ mallMemberWalletService.add(prizeScore,memberId , "prizeScore");
+
+ apiMemberNewGiftSettingVo.setPrizeScore(prizeScore);
+ }
+
+ String couponUUID = IdUtil.simpleUUID();
+ if(ObjectUtil.isNotEmpty(apiNewGiftSettingDto.getCouponId())){
+ Long couponId = apiNewGiftSettingDto.getCouponId();
+ MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId);
+ if(ObjectUtil.isNotEmpty(mallGoodsCoupon) && mallGoodsCoupon.getState() == 2){
+ List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdCouponIdWithOutInviteId(memberId, couponId);
+ if(CollUtil.isEmpty(mallMemberCoupons)){
+ //商品优惠卷如果绑定了，那么当前登陆者获取一张卷
+ 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);
+
+ mallMoneyFlowService.addMoneyFlow(
+ memberId,
+ BigDecimal.ONE,
+ ScoreFlowTypeEnum.NEW_GIFT_COUPON.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.BALANCE.getValue(),
+ StrUtil.format( ScoreFlowTypeEnum.NEW_GIFT_COUPON.getDesc(),mallGoodsCoupon.getName()),
+ 2);
+
+ apiMemberNewGiftSettingVo.setCouponName(mallGoodsCoupon.getName());
+ }
+ }
+ }
}
+ mallMember.setLastLoginTime(new Date());
+ this.baseMapper.updateById(mallMember);
+
+// this.baseMapper.updateLastLoginTime(memberId,new Date());
+
return new FebsResponse().success().data(apiMemberNewGiftSettingVo);
}
+ @Override
+ public FebsResponse getLabelList() {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ArrayList<ApiMemberLabelVo> apiMemberLabelVos = new ArrayList<>();
+
+ List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
+ new LambdaQueryWrapper<HappyMemberLabelRecord>()
+ .eq(HappyMemberLabelRecord::getMemberId,memberId)
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
+ Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
+ List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
+ new LambdaQueryWrapper<HappyMemberLabel>()
+ .select(HappyMemberLabel::getIconPng, HappyMemberLabel::getName, HappyMemberLabel::getContent, HappyMemberLabel::getHeaderPng)
+ .in(HappyMemberLabel::getId, collect)
+ );
+ if(CollUtil.isNotEmpty(happyMemberLabels)){
+ for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
+ ApiMemberLabelVo apiMemberLabelVo = new ApiMemberLabelVo();
+ apiMemberLabelVo.setName(happyMemberLabel.getName());
+ apiMemberLabelVo.setContent(happyMemberLabel.getContent());
+ apiMemberLabelVo.setHeaderPng(happyMemberLabel.getHeaderPng());
+ apiMemberLabelVo.setIconPng(happyMemberLabel.getIconPng());
+ apiMemberLabelVos.add(apiMemberLabelVo);
+ }
+ }
+ }
+
+ return new FebsResponse().success().data(apiMemberLabelVos);
+ }
+
// public static void main(String[] args) {
// Long userld = 16425L;
// String shopAccount = "爱和美医疗";
--
Gitblit v1.9.1