1
This commit is contained in:
@@ -36,8 +36,6 @@ import java.time.format.DateTimeFormatter;
|
|||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.regex.Matcher;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@@ -1215,26 +1213,26 @@ public class JDUtil {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
switch (state.getCurrentStep()) {
|
switch (state.getCurrentStep()) {
|
||||||
case STEP_PRODUCT_LINK:
|
//case STEP_PRODUCT_LINK:
|
||||||
// 解析商品链接获取SKU
|
// // 解析商品链接获取SKU
|
||||||
String skuId = parseSkuFromUrl(message);
|
// String skuId = parseSkuFromUrl(message);
|
||||||
Map<String, String> productInfo = queryProductInfo(skuId);
|
// Map<String, String> productInfo = queryProductInfo(skuId);
|
||||||
state.getCollectedFields().put("skuId", skuId);
|
// state.getCollectedFields().put("skuId", skuId);
|
||||||
state.getCollectedFields().put("productInfo", productInfo.get("name") + "\n价格:" + productInfo.get("price"));
|
// state.getCollectedFields().put("productInfo", productInfo.get("name") + "\n价格:" + productInfo.get("price"));
|
||||||
|
//
|
||||||
state.setCurrentStep(STEP_AMOUNT);
|
// state.setCurrentStep(STEP_AMOUNT);
|
||||||
wxUtil.sendTextMessage(fromWxid, "商品信息:\n" + productInfo.get("name") + "\n当前价格:" + productInfo.get("price") + "\n请输入开通金额(元):", 1, fromWxid);
|
// wxUtil.sendTextMessage(fromWxid, "商品信息:\n" + productInfo.get("name") + "\n当前价格:" + productInfo.get("price") + "\n请输入开通金额(元):", 1, fromWxid);
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
case STEP_AMOUNT:
|
//case STEP_AMOUNT:
|
||||||
if (!isValidAmount(message)) {
|
// if (!isValidAmount(message)) {
|
||||||
wxUtil.sendTextMessage(fromWxid, "金额格式错误,请重新输入", 1, fromWxid);
|
// wxUtil.sendTextMessage(fromWxid, "金额格式错误,请重新输入", 1, fromWxid);
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
state.getCollectedFields().put("amount", message);
|
// state.getCollectedFields().put("amount", message);
|
||||||
state.setCurrentStep(STEP_QUANTITY);
|
// state.setCurrentStep(STEP_QUANTITY);
|
||||||
wxUtil.sendTextMessage(fromWxid, "请输入开通数量:", 1, fromWxid);
|
// wxUtil.sendTextMessage(fromWxid, "请输入开通数量:", 1, fromWxid);
|
||||||
break;
|
// break;
|
||||||
|
|
||||||
case STEP_QUANTITY:
|
case STEP_QUANTITY:
|
||||||
if (!isValidQuantity(message)) {
|
if (!isValidQuantity(message)) {
|
||||||
@@ -1430,14 +1428,6 @@ public class JDUtil {
|
|||||||
updateLastInteractionTime();
|
updateLastInteractionTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 推荐使用枚举管理状态
|
|
||||||
public enum ProcessState {
|
|
||||||
INIT, GIFT_MONEY_FLOW, DISINFECTANT_CABINET
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum GiftMoneyStep {
|
|
||||||
STEP_PRODUCT_LINK, STEP_AMOUNT, STEP_QUANTITY
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user