From 8fd8e2f7c84446ab6bf84fe252053b85d9b20d30 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 30 Oct 2025 10:45:44 +0800
Subject: [PATCH] feat(ai): 简化AI对话项创建逻辑并新增连续对话类型 - 移除复杂的对话项更新逻辑，统一通过add方法创建新项 - 新增AiTalkOutputEnum枚举值CONTEXT_TALK用于AI陪练连续对话 - 更新ApiMemberTalkAnswerSavaDto注释以包含新的对话类型 - 修复对话项创建时类型参数未正确传递的问题 - 优化代码结构，减少冗余的条件判断和数据转换操作
---
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 6a4705b..95c77c8 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -23,6 +23,7 @@
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -41,10 +42,7 @@
import java.io.*;
import java.math.BigDecimal;
import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@Service
@@ -70,6 +68,8 @@
@Autowired
private MallMemberWithdrawMapper mallMemberWithdrawMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
+ private final ClothesTypeMapper clothesTypeMapper;
+ private final ClothesOrderMapper clothesOrderMapper;
@Autowired
RedisUtils redisUtils;
@@ -208,6 +208,34 @@
}
mallOrderInfo.setWxOrderNo(payData.getPrepay_id());
mallOrderInfoMapper.updateById(mallOrderInfo);
+ return payData;
+ }
+
+ @Override
+ public BrandWCPayRequestData startPayment(ClothesOrder orderInfo) throws Exception {
+ BigDecimal unit = new BigDecimal("100");
+ BigDecimal money = new BigDecimal(orderInfo.getRealAmount().toString());
+ BrandWCPayRequestData payData;
+
+ ClothesType clothesType = clothesTypeMapper.selectById(orderInfo.getTypeId());
+ String productNames = clothesType.getName();
+ MallMember mallMember = mallMemberMapper.selectById(orderInfo.getMemberId());
+ Boolean debug = xcxProperties.getDebug();
+ if (debug) {
+ payData = weixinServiceUtil.createOrder("[测试]" + productNames, orderInfo.getOrderNo(),
+ 1, mallMember.getOpenId(), String.valueOf(orderInfo.getId()));
+ } else {
+ payData = weixinServiceUtil.createOrder(productNames, orderInfo.getOrderNo(),
+ unit.multiply(money).intValue(),mallMember.getOpenId(), String.valueOf(orderInfo.getId()));
+ }
+ orderInfo.setPayOrderNo(payData.getPrepay_id());
+
+ clothesOrderMapper.update(null,
+ Wrappers.lambdaUpdate(ClothesOrder.class)
+ .set(ClothesOrder::getPayOrderNo, payData.getPrepay_id())
+ .set(ClothesOrder::getUpdatedTime, new Date())
+ .eq(ClothesOrder::getId, orderInfo.getId())
+ );
return payData;
}
@@ -439,8 +467,10 @@
* @return
*/
//图片上传路径
+ // todo 上线修改图片上传路径
public static final String IMG_UPLOAD_PATH="/home/javaweb/webresource/upload/wxcode";
public String generateAcode(String scene,String path,String imgName,String width, Integer type){
+ // todo 上线修改图片上传路径
String urlPrefix="https://hcres.csxuncong.com/wxcode";
String imgPath=IMG_UPLOAD_PATH+imgName;
if(!FileUtil.exist(imgPath)){
--
Gitblit v1.9.1