From 8d003e518109240689be3352cc7ff33ae4f8fb76 Mon Sep 17 00:00:00 2001 From: Leo Date: Thu, 13 Mar 2025 17:40:41 +0800 Subject: [PATCH] 1 --- .../java/cn/van/business/util/JDUtil.java | 50 ++++++++----------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 93539d7..e4a30ff 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -36,8 +36,6 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -1215,26 +1213,26 @@ public class JDUtil { try { switch (state.getCurrentStep()) { - case STEP_PRODUCT_LINK: - // 解析商品链接获取SKU - String skuId = parseSkuFromUrl(message); - Map productInfo = queryProductInfo(skuId); - state.getCollectedFields().put("skuId", skuId); - state.getCollectedFields().put("productInfo", productInfo.get("name") + "\n价格：" + productInfo.get("price")); - - state.setCurrentStep(STEP_AMOUNT); - wxUtil.sendTextMessage(fromWxid, "商品信息：\n" + productInfo.get("name") + "\n当前价格：" + productInfo.get("price") + "\n请输入开通金额（元）：", 1, fromWxid); - break; - - case STEP_AMOUNT: - if (!isValidAmount(message)) { - wxUtil.sendTextMessage(fromWxid, "金额格式错误，请重新输入", 1, fromWxid); - return; - } - state.getCollectedFields().put("amount", message); - state.setCurrentStep(STEP_QUANTITY); - wxUtil.sendTextMessage(fromWxid, "请输入开通数量：", 1, fromWxid); - break; + //case STEP_PRODUCT_LINK: + // // 解析商品链接获取SKU + // String skuId = parseSkuFromUrl(message); + // Map productInfo = queryProductInfo(skuId); + // state.getCollectedFields().put("skuId", skuId); + // state.getCollectedFields().put("productInfo", productInfo.get("name") + "\n价格：" + productInfo.get("price")); + // + // state.setCurrentStep(STEP_AMOUNT); + // wxUtil.sendTextMessage(fromWxid, "商品信息：\n" + productInfo.get("name") + "\n当前价格：" + productInfo.get("price") + "\n请输入开通金额（元）：", 1, fromWxid); + // break; + // + //case STEP_AMOUNT: + // if (!isValidAmount(message)) { + // wxUtil.sendTextMessage(fromWxid, "金额格式错误，请重新输入", 1, fromWxid); + // return; + // } + // state.getCollectedFields().put("amount", message); + // state.setCurrentStep(STEP_QUANTITY); + // wxUtil.sendTextMessage(fromWxid, "请输入开通数量：", 1, fromWxid); + // break; case STEP_QUANTITY: if (!isValidQuantity(message)) { @@ -1430,14 +1428,6 @@ public class JDUtil { updateLastInteractionTime(); } - // 推荐使用枚举管理状态 - public enum ProcessState { - INIT, GIFT_MONEY_FLOW, DISINFECTANT_CABINET - } - - public enum GiftMoneyStep { - STEP_PRODUCT_LINK, STEP_AMOUNT, STEP_QUANTITY - } }