From 57f5dbb0ba230bdbc40409c1274d98f56e35e45b Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 15 May 2025 16:11:02 +0800 Subject: [PATCH] refactor(mall): 优化订单列表接口响应时间 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 163 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 132 insertions(+), 31 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 4510ac0..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; @@ -357,6 +356,11 @@ return new FebsResponse().success().message("设置成功"); } + public static void main(String[] args) { + String pwd = SecureUtil.md5("123456"); + System.out.println(pwd); + } + @Override public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) { MallMember member = LoginUserUtil.getLoginUser(); @@ -645,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()); @@ -756,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(); } @@ -1510,39 +1556,94 @@ return new FebsResponse().success().data(pages); } - public static void main(String[] args) { - Long userld = 16425L; - String shopAccount = "爱和美医疗"; - String shopPwd = "blnka2005"; + @Override + public FebsResponse flowHeader() { + // 获取当前登录用户的ID + Long memberId = LoginUserUtil.getLoginUser().getId(); + ApiMoneyFlowHeaderVo apiMoneyFlowHeaderVo = new ApiMoneyFlowHeaderVo(); + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); + apiMoneyFlowHeaderVo.setBalance(mallMemberWallet.getBalance()); + apiMoneyFlowHeaderVo.setPrizeScore(mallMemberWallet.getPrizeScore()); + return new FebsResponse().success().data(apiMoneyFlowHeaderVo); + } - HashMap<String, String> objectObjectHashMap = new HashMap<>(); + @Override + public FebsResponse newGiftEvent() { + // 获取当前登录用户的ID + Long memberId = LoginUserUtil.getLoginUser().getId(); - objectObjectHashMap.put("shopAccount",shopAccount); - objectObjectHashMap.put("shopPwd",shopPwd); - objectObjectHashMap.put("userId",userld.toString()); + ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo(); - //sign= MD5(shopAccount+shopPwd+userId) - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(shopAccount); - stringBuffer.append(shopPwd); - stringBuffer.append(userld); - String sign = MD5.MD5Encode(stringBuffer.toString()); - objectObjectHashMap.put("sign",sign); - - System.out.println(sign); - - System.out.println(objectObjectHashMap); - String url = "https://data.muchun.co/api/getCustomerCheckRecords"; - String result = HttpCurlUtil.sendPost(url, objectObjectHashMap); - Integer retCode = JSONUtil.parseObj(result).getInt("retCode"); - String message = JSONUtil.parseObj(result).getStr("message"); - if(0 != retCode){ - System.out.println(message); + 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); + } } - JSONArray data = JSONUtil.parseObj(result).getJSONArray("data"); - System.out.println(data); + 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 = "爱和美医疗"; +// String shopPwd = "blnka2005"; +// +// HashMap<String, String> objectObjectHashMap = new HashMap<>(); +// +// objectObjectHashMap.put("shopAccount",shopAccount); +// objectObjectHashMap.put("shopPwd",shopPwd); +// objectObjectHashMap.put("userId",userld.toString()); +// +// //sign= MD5(shopAccount+shopPwd+userId) +// StringBuffer stringBuffer = new StringBuffer(); +// stringBuffer.append(shopAccount); +// stringBuffer.append(shopPwd); +// stringBuffer.append(userld); +// String sign = MD5.MD5Encode(stringBuffer.toString()); +// objectObjectHashMap.put("sign",sign); +// +// System.out.println(sign); +// +// System.out.println(objectObjectHashMap); +// String url = "https://data.muchun.co/api/getCustomerCheckRecords"; +// String result = HttpCurlUtil.sendPost(url, objectObjectHashMap); +// Integer retCode = JSONUtil.parseObj(result).getInt("retCode"); +// String message = JSONUtil.parseObj(result).getStr("message"); +// if(0 != retCode){ +// System.out.println(message); +// } +// +// JSONArray data = JSONUtil.parseObj(result).getJSONArray("data"); +// System.out.println(data); +// } + } -- Gitblit v1.9.1