diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java index ebae30a..191f75e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java @@ -1156,34 +1156,68 @@ private String handleTF(String input) { // 仅提示 } + // 根据订单号查询order_rows,获取京粉实际价格 + if (!isEmpty(order.getOrderId())) { + try { + OrderRows orderRow = orderRowsService.selectOrderRowsByOrderId(order.getOrderId()); + if (orderRow != null && orderRow.getEstimateCosPrice() != null) { + order.setJingfenActualPrice(orderRow.getEstimateCosPrice()); + } + } catch (Exception e) { + // 查询失败不影响主流程,继续执行 + } + } + // 按 remark 判断新增/更新 JDOrder exists = jdOrderService.selectJDOrderByRemark(order.getRemark()); - String info; if (exists != null) { order.setId(exists.getId()); jdOrderService.updateJDOrder(order); - info = "更新成功"; } else { jdOrderService.insertJDOrder(order); - info = "新增成功"; } - StringBuilder sb = new StringBuilder(); - String distributionMark2 = ""; - if (!isEmpty(order.getDistributionMark())) { - if (order.getDistributionMark().startsWith("H")) distributionMark2 = "鸿"; - else if (order.getDistributionMark().startsWith("F")) distributionMark2 = "凡"; - } - java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd"); - sb.append(order.getRemark()).append('\t').append(order.getOrderId()).append('\t').append(sdf.format(order.getOrderTime())).append('\t').append(order.getModelNumber()).append('\t').append(order.getAddress()).append('\t').append(order.getLogisticsLink()).append('\t').append('\t').append(order.getBuyer()).append('\t').append(nvl(order.getPaymentAmount())).append('\t').append(nvl(order.getRebateAmount())).append('\t').append(distributionMark2); - - return info + "\n" + sb; + // 返回完整的表单格式 + return formatOrderForm(order); } private boolean isEmpty(String s) { return s == null || s.isEmpty(); } + /** + * 格式化订单为完整表单格式 + */ + private String formatOrderForm(JDOrder order) { + StringBuilder sb = new StringBuilder(); + + sb.append("单:\n"); + sb.append(order.getRemark() != null ? order.getRemark() : "").append("\n"); + sb.append("备注:").append(order.getStatus() != null ? order.getStatus() : "").append("\n"); + sb.append("分销标记:").append(order.getDistributionMark() != null ? order.getDistributionMark() : "").append("\n"); + sb.append("第三方单号:").append(order.getThirdPartyOrderNo() != null ? order.getThirdPartyOrderNo() : "").append("\n"); + sb.append("型号:\n"); + sb.append(order.getModelNumber() != null ? order.getModelNumber() : "").append("\n"); + sb.append("链接:\n"); + sb.append(order.getLink() != null ? order.getLink() : "").append("\n"); + sb.append("下单付款:\n"); + sb.append(order.getPaymentAmount() != null ? order.getPaymentAmount().toString() : "").append("\n"); + sb.append("后返金额:\n"); + sb.append(order.getRebateAmount() != null ? order.getRebateAmount().toString() : "").append("\n"); + sb.append("地址:\n"); + sb.append(order.getAddress() != null ? order.getAddress() : "").append("\n"); + sb.append("物流链接:\n"); + sb.append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "").append("\n"); + sb.append("订单号:\n"); + sb.append(order.getOrderId() != null ? order.getOrderId() : "").append("\n"); + sb.append("下单人:\n"); + sb.append(order.getBuyer() != null ? order.getBuyer() : "").append("\n"); + sb.append("京粉实际价格:\n"); + sb.append(order.getJingfenActualPrice() != null ? order.getJingfenActualPrice().toString() : "").append("\n"); + + return sb.toString(); + } + // 参照 JDUtil.parseOrderFromText private JDOrder parseOrderFromText(String input) { input = input.replaceAll("\\s+", " ").trim();