From af3e9c24add00f0e66635d37c7973c23e9e1043b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 16 May 2025 10:33:12 +0800
Subject: [PATCH] feat(pay): 添加微信支付功能并更新资金流向类型
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 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 6b83062..5ba72d0 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
@@ -1,10 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.*;
@@ -12,6 +9,7 @@
import cc.mrbird.febs.mall.conversion.MallShopApplyConversion;
import cc.mrbird.febs.mall.conversion.MallStoreConversion;
import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.dto.signActivity.ApiNewGiftSettingDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
@@ -49,6 +47,7 @@
import java.io.IOException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -650,6 +649,7 @@
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
mallMember.setOpenId(openId);
mallMember.setSessionKey(sessionKey);
+ mallMember.setTradePassword(SecureUtil.md5("123456"));
if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
MallMember member = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
@@ -761,6 +761,47 @@
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);
+ }
+ }
+
+ }
+ }
return new FebsResponse().success();
}
@@ -1526,6 +1567,50 @@
return new FebsResponse().success().data(apiMoneyFlowHeaderVo);
}
+ @Override
+ public FebsResponse newGiftEvent() {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo();
+
+ MallMember mallMember = this.baseMapper.selectById(memberId);
+ Date lastLoginTime = mallMember.getLastLoginTime();
+ if(lastLoginTime == null){
+ 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);
+ }
+ }
+
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
+ CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
+ );
+ ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
+ apiMemberNewGiftSettingVo.setState(apiNewGiftSettingDto.getState());
+ apiMemberNewGiftSettingVo.setPrizeScore(apiNewGiftSettingDto.getPrizeScore());
+
+
+ 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());
+ }
+
+ this.baseMapper.updateLastLoginTime(memberId,new Date());
+
+ return new FebsResponse().success().data(apiMemberNewGiftSettingVo);
+ }
+
// public static void main(String[] args) {
// Long userld = 16425L;
// String shopAccount = "爱和美医疗";
--
Gitblit v1.9.1