From 37e4208f813a17f62686a774df8d9baa4d406c5d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 15:30:17 +0800
Subject: [PATCH] feat(mall): 新增新用户礼品设置功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 12 +++---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 86 +++++++++++++++++++++---------------------
2 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index e8c6729..030d529 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -82,12 +82,12 @@
.append("-")
.append(mallOrderItem.getSkuName())
.append("*").append(mallOrderItem.getCnt()).append("；");
- if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
- MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
- if(ObjectUtil.isNotEmpty(mallMember)){
- adminMallOrderInfoVo.setRefererName(mallMember.getName());
- }
- }
+// if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
+// MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
+// if(ObjectUtil.isNotEmpty(mallMember)){
+// adminMallOrderInfoVo.setRefererName(mallMember.getName());
+// }
+// }
}
adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
}
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 bddc8fd..d17b877 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
@@ -776,49 +776,49 @@
mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");
this.baseMapper.updateById(mallMember);
- //完善信息赠送新人礼
- 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);
- }
- }
-
- }
- }
+// //完善信息赠送新人礼
+// 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();
}
--
Gitblit v1.9.1