From 35a8f79b54101498b91ab915bcabaf731eef542a Mon Sep 17 00:00:00 2001
From: Van0313 <60689272+Van0313@users.noreply.github.com>
Date: Wed, 23 Apr 2025 21:02:27 +0800
Subject: [PATCH] bug fix

---
 src/main/java/cn/van/business/util/JDUtil.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index c849592..d3e27ea 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -884,7 +884,7 @@ public class JDUtil {
             if ("1".equals(message)) {
                 // 用户选择开通礼金
                 state.setCurrentState(UserInteractionState.ProcessState.GIFT_MONEY_FLOW);
-                state.setCurrentStep(UserInteractionState.GiftMoneyStep.STEP_AMOUNT);
+                state.setCurrentStep(STEP_AMOUNT);
                 state.getCollectedFields().clear();
                 wxUtil.sendTextMessage(wxid, "当前选择" + jsonObjectArr.size() + "个商品\n" + "请输入开通金额（1-50元，支持小数点后两位）：\n" + "示例：20.50", 1, wxid, false);
             } else if ("2".equals(message)) {
@@ -906,7 +906,7 @@ public class JDUtil {
                 cacheMap.remove("finalWenAn" + wxid);
                 wxUtil.sendTextMessage(wxid, "已清除商品信息缓存,可输入新的文案", 1, wxid, false);
                 // 进入输入方案流程
-                state.setCurrentState(UserInteractionState.ProcessState.INIT);
+                state.setCurrentState(INIT);
                 state.setCurrentField("content");
 
 
@@ -932,7 +932,7 @@ public class JDUtil {
      * @param message 方案内容，包含商品链接
      * @return 处理后的方案，附带商品信息
      */
-    public HashMap<String, List<String>> generatePromotionContent(String message, Boolean isCj) {
+    public synchronized   HashMap<String, List<String>> generatePromotionContent(String message, Boolean isCj) {
         HashMap<String, List<String>> finallMessage = new HashMap<>();
         List<String> textList = new ArrayList<>();
         List<String> imagesList = new ArrayList<>();
@@ -1187,7 +1187,7 @@ public class JDUtil {
          * */
 
         // 如果需要图片和SKU名称，则代表要把图片下载发过去，还有对应的skuName
-        StringBuilder couponInfo = new StringBuilder();
+        StringBuilder couponInfo = null;
         ArrayList<HashMap<String, String>> resultList = new ArrayList<>();
 
         String format = null;
@@ -1525,7 +1525,7 @@ public class JDUtil {
         private String currentField; // 当前正在询问的字段
 
         public UserInteractionState() {
-            this.currentStep = GiftMoneyStep.STEP_CONFIRM_GIFT; // 初始
+            this.currentStep = STEP_CONFIRM_GIFT; // 初始
             this.lastInteractionTime = LocalDateTime.now().format(DATE_TIME_FORMATTER);
             this.currentState = INIT;
             this.collectedFields = new HashMap<>();