CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-04-01 17:58:40 +08:00
parent fb59f1e065
commit a6682ad2bf
1 changed files with 242 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
src/main/java/cn/van/business/util/JDUtil.java
View File

@@ -69,7 +69,6 @@ public class JDUtil {
private static final String LL_SECRET_KEY_DG = "3ceddff403e544a8a2eacc727cf05dab"; private static final String LL_SECRET_KEY_DG = "3ceddff403e544a8a2eacc727cf05dab";
private static final String SERVER_URL = "https://api.jd.com/routerjson"; private static final String SERVER_URL = "https://api.jd.com/routerjson";
//accessToken //accessToken
private static final String ACCESS_TOKEN = ""; private static final String ACCESS_TOKEN = "";
@@ -88,8 +87,6 @@ public class JDUtil {
private final ObjectMapper objectMapper = new ObjectMapper(); private final ObjectMapper objectMapper = new ObjectMapper();
// 构造函数中注入StringRedisTemplate // 构造函数中注入StringRedisTemplate
@Autowired @Autowired
public JDUtil(StringRedisTemplate redisTemplate, ProductOrderRepository productOrderRepository, OrderRowRepository orderRowRepository, WXUtil wxUtil, OrderUtil orderUtil) { public JDUtil(StringRedisTemplate redisTemplate, ProductOrderRepository productOrderRepository, OrderRowRepository orderRowRepository, WXUtil wxUtil, OrderUtil orderUtil) {
@@ -131,32 +128,24 @@ public class JDUtil {
return new OrderStats(orders.size(), orders.size() - canceled, paid, orders.stream().filter(o -> o.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum(), pending, orders.stream().filter(o -> o.getValidCode() == 15).mapToDouble(OrderRow::getEstimateFee).sum(), canceled, completed, orders.stream().filter(o -> o.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum(), getStreamForWeiGui(orders).count(), getStreamForWeiGui(orders).mapToDouble(o -> o.getEstimateCosPrice() * o.getCommissionRate() * 0.01).sum()); return new OrderStats(orders.size(), orders.size() - canceled, paid, orders.stream().filter(o -> o.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum(), pending, orders.stream().filter(o -> o.getValidCode() == 15).mapToDouble(OrderRow::getEstimateFee).sum(), canceled, completed, orders.stream().filter(o -> o.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum(), getStreamForWeiGui(orders).count(), getStreamForWeiGui(orders).mapToDouble(o -> o.getEstimateCosPrice() * o.getCommissionRate() * 0.01).sum());
} }
private StringBuilder buildStatsContent(String title, OrderStats stats) { private StringBuilder buildStatsContent(String title, OrderStats stats) {
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder();
content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色] content//[爱心][Wow][Packet][Party][Broken][心碎][亲亲][色]
.append("* ").append(title).append(" *\n") .append("* ").append(title).append(" *\n").append("━━━━━━━━━━━━\n").append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件]
.append("━━━━━━━━━━━━\n")
.append("[爱心] 订单总数：").append(stats.getTotalOrders()).append("\n") // [文件]
.append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK] .append("[Party] 有效订单：").append(stats.getValidOrders()).append("\n") // [OK]
.append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止] .append("[心碎]已取消：").append(stats.getCanceledOrders()).append("\n") // [禁止]
.append("────────────\n") .append("────────────\n").append("[爱心]已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋]
.append("[爱心]已付款：").append(stats.getPaidOrders()).append("\n") // [钱袋]
.append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票] .append("[Packet] 已付款佣金：").append(String.format("%.2f", stats.getPaidCommission())).append("\n") // [钞票]
.append("────────────\n") .append("────────────\n").append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟]
.append("[Wow] 待付款：").append(stats.getPendingOrders()).append("\n") // [时钟]
.append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n") // [钱] .append("[Packet] 待付款佣金：").append(String.format("%.2f", stats.getPendingCommission())).append("\n") // [钱]
.append("────────────\n") .append("────────────\n").append("[亲亲] 已完成：").append(stats.getCompletedOrders()).append("\n") // [旗帜]
.append("[亲亲] 已完成：").append(stats.getCompletedOrders()).append("\n") // [旗帜]
.append("[Packet] 已完成佣金：").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡] .append("[Packet] 已完成佣金：").append(String.format("%.2f", stats.getCompletedCommission())).append("\n") // [信用卡]
.append("────────────\n") .append("────────────\n").append("[Emm] 违规订单：").append(stats.getViolations()).append("\n") // [警告]
.append("[Emm] 违规订单：").append(stats.getViolations()).append("\n") // [警告]
.append("[Broken] 违规佣金：").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹] .append("[Broken] 违规佣金：").append(String.format("%.2f", stats.getViolationCommission())).append("\n") // [炸弹]
.append("━━━━━━━━━━━━"); .append("━━━━━━━━━━━━");
return content; return content;
} }
/** /**
@@ -669,7 +658,12 @@ private StringBuilder buildStatsContent(String title, OrderStats stats) {
} }
// 新增礼金流程处理方法 // 新增礼金流程处理方法
private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractionState state) { private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractionState state) {
if (state.getCurrentStep() == null) {
state.setCurrentStep(STEP_PRODUCT_LINK);
wxUtil.sendTextMessage(fromWxid, "流程异常，已重置。请输入商品链接：", 1, fromWxid);
return;
}
if ("礼金".equals(message)) { if ("礼金".equals(message)) {
state.reset(); state.reset();
logger.debug("用户 {} 重置礼金流程", fromWxid); // 新增 logger.debug("用户 {} 重置礼金流程", fromWxid); // 新增
@@ -705,35 +699,31 @@ private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractio
//logger.debug("商品信息已收集：SKU={}, Owner={}, WDIS={}", skuId, owner, productInfo.getBaseBigFieldInfo().getWdis()); // 新增 //logger.debug("商品信息已收集：SKU={}, Owner={}, WDIS={}", skuId, owner, productInfo.getBaseBigFieldInfo().getWdis()); // 新增
String productInfo = skuId; String productInfo = skuId;
state.setCurrentStep(STEP_AMOUNT); state.setCurrentStep(STEP_AMOUNT);
String prompt = String.format("商品信息：\n%s请输入开通金额（元）：", String prompt = String.format("商品SKU：\n %s\n 请输入开通金额（元）：", productInfo);
productInfo);
wxUtil.sendTextMessage(fromWxid, prompt, 1, fromWxid); wxUtil.sendTextMessage(fromWxid, prompt, 1, fromWxid);
break; break;
case STEP_AMOUNT: case STEP_AMOUNT:
logger.debug("用户 {} 输入金额：{}", fromWxid, message); logger.debug("用户 {} 输入金额：{}", fromWxid, message);
// 新增：先检查 message 是否为 null 或空字符串 // 强制检查空值
if (message == null || message.trim().isEmpty()) { if (message == null || message.trim().isEmpty()) {
wxUtil.sendTextMessage(fromWxid, "❌ 金额不能为空，请输入数字", 1, fromWxid); wxUtil.sendTextMessage(fromWxid, "❌ 金额不能为空，请输入数字（如：100.00）", 1, fromWxid);
return; return;
} }
// 校验格式
if (!isValidAmount(message)) { if (!isValidAmount(message)) {
wxUtil.sendTextMessage(fromWxid, "❌ 金额格式错误，请输入数字（如：100.00）", 1, fromWxid); wxUtil.sendTextMessage(fromWxid, "❌ 金额格式错误，请输入数字（如：100.00）", 1, fromWxid);
return; return;
} }
// 转换并保留两位小数
amount = Double.parseDouble(message); amount = Double.parseDouble(message);
// 格式化后输出日志
String formattedAmount = String.format("%.2f", amount); String formattedAmount = String.format("%.2f", amount);
logger.debug("校验金额：{} 元（商品价格的80%：{}）", formattedAmount, 0.8 * Double.parseDouble(state.getCollectedFields().get("price"))); // 新增
if (amount < 1 || amount > 0.8 * Double.parseDouble(state.getCollectedFields().get("price"))) {
wxUtil.sendTextMessage(fromWxid, "❌ 金额需≥1元且≤商品价格的80%", 1, fromWxid);
return;
}
state.getCollectedFields().put("amount", formattedAmount); state.getCollectedFields().put("amount", formattedAmount);
state.setCurrentStep(STEP_QUANTITY); state.setCurrentStep(STEP_QUANTITY);
wxUtil.sendTextMessage(fromWxid, "请输入数量（1-1000）：", 1, fromWxid);
break; break;
case STEP_QUANTITY: case STEP_QUANTITY:
logger.debug("用户 {} 输入数量：{}", fromWxid, message); // 新增 logger.debug("用户 {} 输入数量：{}", fromWxid, message); // 新增
if (!isValidQuantity(message)) { if (!isValidQuantity(message)) {
@@ -747,23 +737,17 @@ private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractio
return; return;
} }
logger.debug("礼金参数准备完成：SKU={}，金额={}元，数量={}，Owner={}", logger.debug("礼金参数准备完成：SKU={}，金额={}元，数量={}，Owner={}", state.getCollectedFields().get("skuId"), amount, quantity, state.getCollectedFields().get("owner")); // 新增
state.getCollectedFields().get("skuId"),
amount,
quantity,
state.getCollectedFields().get("owner")); // 新增
String giftKey = createGiftCoupon(skuId, amount, quantity, owner); String giftKey = createGiftCoupon(skuId, amount, quantity, owner);
if (giftKey == null) { if (giftKey == null) {
logger.error("用户 {} 礼金创建失败：SKU={}, 金额={}, 数量={}, Owner={}", logger.error("用户 {} 礼金创建失败：SKU={}, 金额={}, 数量={}, Owner={}", fromWxid, skuId, amount, quantity, owner); // 新增
fromWxid, skuId, amount, quantity, owner); // 新增
wxUtil.sendTextMessage(fromWxid, "❌ 礼金创建失败，请检查商品是否符合要求", 1, fromWxid); wxUtil.sendTextMessage(fromWxid, "❌ 礼金创建失败，请检查商品是否符合要求", 1, fromWxid);
state.reset(); state.reset();
return; return;
} }
logger.info("用户 {} 礼金创建成功：批次ID={}, 参数：SKU={}, 金额={}元，数量={}, Owner={}", logger.info("用户 {} 礼金创建成功：批次ID={}, 参数：SKU={}, 金额={}元，数量={}, Owner={}", fromWxid, giftKey, skuId, amount, quantity, owner); // 新增关键成功日志
fromWxid, giftKey, skuId, amount, quantity, owner); // 新增关键成功日志
state.getCollectedFields().put("giftKey", giftKey); state.getCollectedFields().put("giftKey", giftKey);
break; break;
} }
@@ -772,10 +756,10 @@ private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractio
wxUtil.sendTextMessage(fromWxid, "❌ 系统异常，请稍后重试", 1, fromWxid); wxUtil.sendTextMessage(fromWxid, "❌ 系统异常，请稍后重试", 1, fromWxid);
state.reset(); state.reset();
} }
} }
// 在JDUtil类中新增方法实现商品详情查询接口 // 在JDUtil类中新增方法实现商品详情查询接口
public UnionOpenGoodsBigfieldQueryResponse getUnionOpenGoodsBigfieldQueryResponse(String skuId) throws Exception { public UnionOpenGoodsBigfieldQueryResponse getUnionOpenGoodsBigfieldQueryResponse(String skuId) throws Exception {
JdClient client = new DefaultJdClient(SERVER_URL, ACCESS_TOKEN, LPF_APP_KEY_WZ, LPF_APP_KEY_WZ); JdClient client = new DefaultJdClient(SERVER_URL, ACCESS_TOKEN, LPF_APP_KEY_WZ, LPF_APP_KEY_WZ);
UnionOpenGoodsBigfieldQueryRequest request = new UnionOpenGoodsBigfieldQueryRequest(); UnionOpenGoodsBigfieldQueryRequest request = new UnionOpenGoodsBigfieldQueryRequest();
@@ -794,15 +778,15 @@ public UnionOpenGoodsBigfieldQueryResponse getUnionOpenGoodsBigfieldQueryRespons
request.setTimestamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); request.setTimestamp(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
return client.execute(request); return client.execute(request);
} }
// 修改parseSkuFromUrl方法提取SKU // 修改parseSkuFromUrl方法提取SKU
private String parseSkuFromUrl(String url) { private String parseSkuFromUrl(String url) {
Matcher m = Pattern.compile("item.jd.com/(\\d+).html").matcher(url); Matcher m = Pattern.compile("item.jd.com/(\\d+).html").matcher(url);
return m.find() ? m.group(1) : null; return m.find() ? m.group(1) : null;
} }
public BigfieldQueryResult queryProductInfo(String skuId) throws Exception { public BigfieldQueryResult queryProductInfo(String skuId) throws Exception {
UnionOpenGoodsBigfieldQueryResponse response = getUnionOpenGoodsBigfieldQueryResponse(skuId); UnionOpenGoodsBigfieldQueryResponse response = getUnionOpenGoodsBigfieldQueryResponse(skuId);
if (response == null || response.getQueryResult() == null) { if (response == null || response.getQueryResult() == null) {
return null; return null;
@@ -813,11 +797,11 @@ public BigfieldQueryResult queryProductInfo(String skuId) throws Exception {
} }
return queryResult; return queryResult;
} }
// 新增礼金创建方法 // 新增礼金创建方法
public String createGiftCoupon(String skuId, double amount, int quantity,String owner) throws Exception { public String createGiftCoupon(String skuId, double amount, int quantity, String owner) throws Exception {
logger.debug("准备创建礼金：SKU={}, 金额={}元，数量={}, Owner={}", skuId, amount, quantity, owner); // 新增 logger.debug("准备创建礼金：SKU={}, 金额={}元，数量={}, Owner={}", skuId, amount, quantity, owner); // 新增
@@ -832,7 +816,7 @@ public String createGiftCoupon(String skuId, double amount, int quantity,String
// 自营的只能设置一天，pop的只能设置7天，默认为自营 // 自营的只能设置一天，pop的只能设置7天，默认为自营
String startTime; String startTime;
String endTime; String endTime;
if ("pop".equals(owner)){ if ("pop".equals(owner)) {
startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH")); startTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"));
endTime = LocalDateTime.now().plusDays(6).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH")); endTime = LocalDateTime.now().plusDays(6).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"));
} else { } else {
@@ -867,12 +851,12 @@ public String createGiftCoupon(String skuId, double amount, int quantity,String
logger.error("礼金创建失败：错误码={}, 错误信息={}", response.getCode(), response.getMsg()); // 新增 logger.error("礼金创建失败：错误码={}, 错误信息={}", response.getCode(), response.getMsg()); // 新增
} }
return null; return null;
} }
// 修改activateGiftMoney方法调用真实接口 // 修改activateGiftMoney方法调用真实接口
private boolean activateGiftMoney(String skuId, double amount, int quantity,String owner) { private boolean activateGiftMoney(String skuId, double amount, int quantity, String owner) {
try { try {
String giftKey = createGiftCoupon(skuId, amount, quantity,owner); String giftKey = createGiftCoupon(skuId, amount, quantity, owner);
if (giftKey != null) { if (giftKey != null) {
// 可在此处保存礼金批次ID到用户状态 // 可在此处保存礼金批次ID到用户状态
return true; return true;
@@ -881,10 +865,10 @@ private boolean activateGiftMoney(String skuId, double amount, int quantity,Stri
logger.error("礼金创建失败", e); logger.error("礼金创建失败", e);
} }
return false; return false;
} }
// 新增礼金停止方法（可选） // 新增礼金停止方法（可选）
public boolean stopGiftCoupon(String giftKey) throws Exception { public boolean stopGiftCoupon(String giftKey) throws Exception {
JdClient client = new DefaultJdClient(SERVER_URL, ACCESS_TOKEN, LPF_APP_KEY_WZ, LPF_APP_KEY_WZ); JdClient client = new DefaultJdClient(SERVER_URL, ACCESS_TOKEN, LPF_APP_KEY_WZ, LPF_APP_KEY_WZ);
@@ -899,26 +883,21 @@ public boolean stopGiftCoupon(String giftKey) throws Exception {
UnionOpenCouponGiftStopResponse response = client.execute(request); UnionOpenCouponGiftStopResponse response = client.execute(request);
return "200".equals(response.getCode()); return "200".equals(response.getCode());
} }
private boolean isValidAmount(String input) {
private boolean isValidAmount(String input) { // 新增：直接处理 null 或空字符串
if (Util.isNotEmpty(input)) { if (input == null || input.trim().isEmpty()) {
return false;
}
try { try {
double amount = Double.parseDouble(input); double amount = Double.parseDouble(input);
// 校验是否为两位小数（可选） return amount > 1 && amount <= 50;
BigDecimal bd = new BigDecimal(input);
if (bd.scale() > 2) return false; // 精度超过两位返回 false
return amount >= 1 && amount <= 50;
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return false; return false;
} }
} }
return false;
}
private boolean isValidQuantity(String input) { private boolean isValidQuantity(String input) {
@@ -1027,6 +1006,7 @@ private boolean isValidAmount(String input) {
private Map<String, String> collectedFields; // 用于存储收集到的字段值 private Map<String, String> collectedFields; // 用于存储收集到的字段值
private String currentField; // 当前正在询问的字段 private String currentField; // 当前正在询问的字段
private ProductOrderStep currentProductOrderStep; private ProductOrderStep currentProductOrderStep;
public UserInteractionState() { public UserInteractionState() {
this.lastInteractionTime = LocalDateTime.now().format(DATE_TIME_FORMATTER); this.lastInteractionTime = LocalDateTime.now().format(DATE_TIME_FORMATTER);
this.currentState = INIT; this.currentState = INIT;
@@ -1039,14 +1019,15 @@ private boolean isValidAmount(String input) {
this.lastInteractionTime = LocalDateTime.now().format(DATE_TIME_FORMATTER); this.lastInteractionTime = LocalDateTime.now().format(DATE_TIME_FORMATTER);
} }
// UserInteractionState类缺少reset方法
public void reset() { public void reset() {
this.currentState = INIT; this.currentState = INIT;
this.collectedFields.clear(); this.collectedFields.clear();
this.currentStep = null; this.currentStep = STEP_PRODUCT_LINK; // 明确重置步骤
this.currentProductOrderStep = null;
updateLastInteractionTime(); updateLastInteractionTime();
} }
// 推荐使用枚举管理状态 // 推荐使用枚举管理状态
public enum ProcessState { public enum ProcessState {
INIT, GIFT_MONEY_FLOW, DISINFECTANT_CABINET, PRODUCT_ORDER_REGISTRATION INIT, GIFT_MONEY_FLOW, DISINFECTANT_CABINET, PRODUCT_ORDER_REGISTRATION
@@ -1058,11 +1039,7 @@ private boolean isValidAmount(String input) {
// 在UserInteractionState类中新增步骤枚举 // 在UserInteractionState类中新增步骤枚举
public enum ProductOrderStep { public enum ProductOrderStep {
STEP_ORDER_ID, STEP_ORDER_ID, STEP_PRODUCT_INFO, STEP_RECIPIENT_INFO, STEP_REVIEW_CONFIRM, STEP_CASHBACK_TRACK
STEP_PRODUCT_INFO,
STEP_RECIPIENT_INFO,
STEP_REVIEW_CONFIRM,
STEP_CASHBACK_TRACK
} }