From dacb049fcace5768db68f956895bdabaccb757f4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 23 Dec 2024 14:31:54 +0800
Subject: [PATCH] fix: 更新阿里云 OSS SDK脚本链接
---
src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
index 68d7505..e2bf3ff 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java
@@ -1,17 +1,16 @@
package cc.mrbird.febs.pay.service.impl;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cc.mrbird.febs.pay.model.AliPayPassbackModel;
import cc.mrbird.febs.pay.properties.AliPayProperties;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
-import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.domain.AlipayTradeAppPayModel;
@@ -21,6 +20,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
@@ -50,7 +50,7 @@
@Override
public String aliPay(MallOrderInfo orderInfo) {
AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
- model.setSubject("全民商城商品支付");
+ model.setSubject("壹元蔬菜商品支付");
model.setBody(orderInfo.getName());
model.setOutTradeNo(orderInfo.getOrderNo());
model.setTimeoutExpress("15m");
@@ -78,6 +78,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void aliCallback(Map<String, String> params) {
String modelStr = params.get("passback_params");
@@ -88,15 +89,17 @@
return;
}
+ MallMember member = memberService.getById(orderInfo.getMemberId());
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
+ member.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ memberService.updateById(member);
+ }
+
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setPayResult("1");
orderInfo.setPayTime(new Date());
orderInfo.setPayTradeNo(params.get("trade_no"));
orderInfoMapper.updateById(orderInfo);
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
- agentProducer.sendAutoLevelUpMsg(orderInfo.getMemberId());
-
- memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
}
}
--
Gitblit v1.9.1