From 645950a4e087a24dcb3bf9f0b6220b6c9c1cb1ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Sep 2022 18:37:53 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 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 ce21773..5d19108 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
@@ -17,6 +17,8 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
+import cc.mrbird.febs.pay.service.IXcxPayService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
@@ -25,6 +27,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -436,15 +439,7 @@
public BigDecimal canMoney() {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
- BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
-
- BigDecimal canMoney = wallet.getCommission();
- if (profit != null) {
- if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
- canMoney = canMoney.subtract(profit);
- }
- }
- return canMoney;
+ return wallet.getBalance().setScale(2,BigDecimal.ROUND_DOWN);
}
@Override
@@ -696,7 +691,7 @@
authInfo.put("token", token);
authInfo.put("member", mallMember);
authInfo.put("rasToken", generateAsaToken(token));
- return new FebsResponse().success().message("登陆成功");
+ return new FebsResponse().success().data(authInfo);
}
return new FebsResponse().fail().message("验证码错误");
}
@@ -713,10 +708,10 @@
DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
if(ObjectUtil.isEmpty(rangeSize)){
- return new FebsResponse().fail();
+ return new FebsResponse().success().data(2);
}
if(StrUtil.isBlank(rangeSize.getValue())){
- return new FebsResponse().fail();
+ return new FebsResponse().success().data(2);
}
//方位大小，换成单位：米
Integer value = Integer.parseInt(rangeSize.getValue()) * 1000;
@@ -724,10 +719,35 @@
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByLonAndLat(longitude, latitude);
Double distance = mallTeamLeader.getDistance();
if(value <= distance){
- return new FebsResponse().fail();
+ return new FebsResponse().success().data(2);
}
}
- return new FebsResponse().success();
+ return new FebsResponse().success().data(1);
+ }
+
+ private final IXcxPayService iXcxPayService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public FebsResponse rechargeWallet(ApiRechargeWalletDto apiRechargeWalletDto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ BigDecimal amount = apiRechargeWalletDto.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount)>0){
+ return new FebsResponse().fail().message("请输入正确的充值金额");
+ }
+ apiRechargeWalletDto.setMemberId(memberId);
+ BrandWCPayRequestData brandWCPayRequestData = null;
+ try {
+ brandWCPayRequestData = iXcxPayService.startRechargeWallet(apiRechargeWalletDto);
+ } catch (Exception e) {
+ throw new FebsException("支付失败");
+ }
+ String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
+ String payResultStr = brandWCPayRequestData.getPrepay_id();
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderInfo", payResultStr);
+ map.put("wxResultStr", wxResultStr);
+ return new FebsResponse().success().data(map).message("充值即将到账");
}
private String getXcxLoginUrl(String code) {
--
Gitblit v1.9.1