From 2493019efefe3fe97906fb55f6dc6fd5b442a591 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 09 Sep 2025 09:53:12 +0800
Subject: [PATCH] feat(AiMemberTalkItemMapper): 添加创建时间比较条件

---
 src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 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..033e393 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,9 +1,16 @@
 package cc.mrbird.febs.pay.service.impl;
 
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
+import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
 import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
 import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
 import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.mall.entity.ClothesOrder;
+import cc.mrbird.febs.mall.entity.ClothesType;
+import cc.mrbird.febs.mall.entity.MallMember;
 import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.mapper.ClothesOrderMapper;
+import cc.mrbird.febs.mall.mapper.ClothesTypeMapper;
 import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
@@ -21,6 +28,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;
@@ -42,6 +50,8 @@
     @Autowired
     private MallOrderInfoMapper orderInfoMapper;
     @Autowired
+    private ClothesTypeMapper clothesTypeMapper;
+    @Autowired
     private AgentProducer agentProducer;
 
     @Value("${spring.profiles.active}")
@@ -50,7 +60,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 +88,39 @@
     }
 
     @Override
+    public String aliPay(ClothesOrder orderInfo) {
+        ClothesType clothesType = clothesTypeMapper.selectById(orderInfo.getTypeId());
+
+        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+        model.setSubject(clothesType.getName());
+        model.setBody(orderInfo.getName());
+        model.setOutTradeNo(orderInfo.getOrderNo());
+        model.setTimeoutExpress("15m");
+
+        if ("dev".equals(active) || "test".equals(active)) {
+            model.setTotalAmount("0.01");
+        } else {
+            model.setTotalAmount(orderInfo.getRealAmount().toString());
+        }
+
+        AliPayPassbackModel passbackModel = new AliPayPassbackModel();
+        passbackModel.setOrderId(orderInfo.getId());
+        passbackModel.setMemberId(orderInfo.getMemberId());
+        model.setPassbackParams(JSONObject.toJSONString(passbackModel));
+
+        model.setProductCode("QUICK_MSECURITY_PAY");
+        AlipayTradeAppPayResponse resp = null;
+        try {
+            resp = AliPayApi.appPayToResponse(model, aliPayProperties.getNoticeUrl());
+        } catch (AlipayApiException e) {
+            log.error("支付宝支付异常", e);
+            throw new FebsException("支付宝支付异常");
+        }
+        return resp.getBody();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public void aliCallback(Map<String, String> params) {
         String modelStr = params.get("passback_params");
 
@@ -88,15 +131,21 @@
             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());
+//        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
+//        agentProducer.sendAutoLevelUpMsg(orderInfo.getMemberId());
 
-        memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
+//        memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.BALANCE.getValue());
     }
 }

--
Gitblit v1.9.1