From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
index 1a42e2e..f8f68c8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java
@@ -1,20 +1,32 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.conversion.MallAddressInfoConversion;
import cc.mrbird.febs.mall.dto.AddressInfoDto;
+import cc.mrbird.febs.mall.dto.ApiIdentifyAddressDto;
import cc.mrbird.febs.mall.entity.MallAddressInfo;
+import cc.mrbird.febs.mall.entity.MallAddressWorld;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.MallAddressInfoMapper;
+import cc.mrbird.febs.mall.mapper.MallAddressWorldMapper;
import cc.mrbird.febs.mall.service.IApiMallAddressInfoService;
import cc.mrbird.febs.mall.vo.AddressInfoVo;
+import cc.mrbird.febs.pay.util.WechatConfigure;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.io.IOException;
import java.util.Date;
import java.util.List;
@@ -27,6 +39,11 @@
@RequiredArgsConstructor
public class ApiMallAddressInfoServiceImpl extends ServiceImpl<MallAddressInfoMapper, MallAddressInfo> implements IApiMallAddressInfoService {
+ @Autowired
+ private RedisUtils redisUtils;
+ @Autowired
+ private MallAddressWorldMapper mallAddressWorldMapper;
+
@Override
public List<AddressInfoVo> findAddressInfoList() {
Long memberId = LoginUserUtil.getLoginUser().getId();
@@ -36,12 +53,12 @@
}
@Override
- public void addAddress(AddressInfoDto addressInfoDto) {
+ public FebsResponse addAddress(AddressInfoDto addressInfoDto) {
MallAddressInfo addressInfo = MallAddressInfoConversion.INSTANCE.dtoToEntity(addressInfoDto);
MallMember member = LoginUserUtil.getLoginUser();
Long memberId = member.getId();
- List<MallAddressInfo> existAddress = this.baseMapper.selectList(null);
+ List<MallAddressInfo> existAddress = this.baseMapper.selectAddressInfoListByMemberId(memberId);
if (CollUtil.isEmpty(existAddress)) {
addressInfo.setIsDefault(MallAddressInfo.IS_DEFAULT_Y);
} else {
@@ -54,6 +71,8 @@
addressInfo.setCreatedBy(member.getPhone());
addressInfo.setUpdatedBy(member.getPhone());
this.baseMapper.insert(addressInfo);
+
+ return new FebsResponse().success().data(addressInfo.getId());
}
@Override
@@ -85,4 +104,39 @@
this.baseMapper.updateIsDefault(MallAddressInfo.IS_DEFAULT_Y, member.getId(), id);
}
+
+ static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
+
+ @Override
+ public FebsResponse identifyAddress(ApiIdentifyAddressDto identifyAddressDto) {
+ MediaType mediaType = MediaType.parse("application/json");
+ RequestBody body = RequestBody.create(mediaType, JSONUtil.toJsonStr(identifyAddressDto));
+ Request request = new Request.Builder()
+ .url("https://aip.baidubce.com/rpc/2.0/nlp/v1/address?access_token=" + redisUtils.get(WechatConfigure.BAIDU_ACCESS_TOKEN_REDIS_KEY).toString())
+ .method("POST", body)
+ .addHeader("Content-Type", "application/json")
+ .addHeader("Accept", "application/json")
+ .build();
+ String data = "";
+ try {
+ Response response = HTTP_CLIENT.newCall(request).execute();
+ data = response.body().string();
+ if (data.contains("error_code")) {
+ JSONObject jsonObject = JSONUtil.parseObj(data);
+ return new FebsResponse().fail().message("地址识别错误编码："+jsonObject.get("error_code").toString());
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return new FebsResponse().success().data(data);
+ }
+
+ @Override
+ public FebsResponse getProvince(Long id) {
+ LambdaQueryWrapper<MallAddressWorld> addressWorldLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ addressWorldLambdaQueryWrapper.eq(MallAddressWorld::getPid, id)
+ .orderByDesc(MallAddressWorld::getId);
+ List<MallAddressWorld> mallAddressWorlds = mallAddressWorldMapper.selectList(addressWorldLambdaQueryWrapper);
+ return new FebsResponse().success().data(mallAddressWorlds);
+ }
}
--
Gitblit v1.9.1