1
This commit is contained in:
+38
-7
@@ -78,7 +78,7 @@ public class InstructionServiceImpl implements IInstructionService {
|
|||||||
private static final int EXTERNAL_LOGISTICS_LIST_LIMIT = 35;
|
private static final int EXTERNAL_LOGISTICS_LIST_LIMIT = 35;
|
||||||
|
|
||||||
// 录单模板(与 jd/JDUtil 中 WENAN_D 保持一致)
|
// 录单模板(与 jd/JDUtil 中 WENAN_D 保持一致)
|
||||||
private static final String WENAN_D = "单:\n" + "{单号} \n" + "分销标记:{分销标记}\n" + "第三方单号:{第三方单号}\n" + "—————————\n" + "下单链接(必须用这个):\n" + "{链接}\n" + "下单地址(注意带分机):\n" + "{地址}\n" + "—————————\n" + "型号:{型号}\n" + "\n" + "下单人(需填):\n" + "\n" + "下单付款(注意核对):\n" + "\n" + "后返金额(注意核对):\n" + "\n" + "订单号(需填):\n" + "\n" + "物流链接(需填):\n" + "\n" + "物流单号(无链接时填):\n" + "\n" + "备注(下单号码有变动/没法带分机号的写这里):\n" + "{单的备注}\n" + "—————————\n" + "京粉实际价格:不用填";
|
private static final String WENAN_D = "单:\n" + "{单号} \n" + "分销标记:{分销标记}\n" + "第三方单号:{第三方单号}\n" + "—————————\n" + "下单链接(必须用这个):\n" + "{链接}\n" + "下单地址(注意带分机):\n" + "{地址}\n" + "—————————\n" + "型号:{型号}\n" + "\n" + "下单人(需填):\n" + "\n" + "下单付款(注意核对):\n" + "\n" + "后返金额(注意核对):\n" + "\n" + "成本价(注意核对):\n" + "\n" + "订单号(需填):\n" + "\n" + "物流链接(需填):\n" + "\n" + "物流单号(无链接时填):\n" + "\n" + "备注(下单号码有变动/没法带分机号的写这里):\n" + "{单的备注}\n" + "—————————\n" + "京粉实际价格:不用填";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> execute(String command) {
|
public List<String> execute(String command) {
|
||||||
@@ -1801,6 +1801,16 @@ public class InstructionServiceImpl implements IInstructionService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 成本价 = 下单付款 − 后返金额。付款为空时不写。 */
|
||||||
|
private static String formatCostPrice(Double payment, Double rebate) {
|
||||||
|
if (payment == null) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
java.math.BigDecimal pay = java.math.BigDecimal.valueOf(payment);
|
||||||
|
java.math.BigDecimal reb = rebate != null ? java.math.BigDecimal.valueOf(rebate) : java.math.BigDecimal.ZERO;
|
||||||
|
return pay.subtract(reb).setScale(2, java.math.RoundingMode.HALF_UP).toPlainString();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 格式化订单为新模板格式
|
* 格式化订单为新模板格式
|
||||||
*/
|
*/
|
||||||
@@ -1828,6 +1838,8 @@ public class InstructionServiceImpl implements IInstructionService {
|
|||||||
sb.append(order.getPaymentAmount() != null ? order.getPaymentAmount().toString() : "").append("\n");
|
sb.append(order.getPaymentAmount() != null ? order.getPaymentAmount().toString() : "").append("\n");
|
||||||
sb.append("后返金额(注意核对):\n");
|
sb.append("后返金额(注意核对):\n");
|
||||||
sb.append(order.getRebateAmount() != null ? order.getRebateAmount().toString() : "").append("\n");
|
sb.append(order.getRebateAmount() != null ? order.getRebateAmount().toString() : "").append("\n");
|
||||||
|
sb.append("成本价(注意核对):\n");
|
||||||
|
sb.append(formatCostPrice(order.getPaymentAmount(), order.getRebateAmount())).append("\n");
|
||||||
sb.append("订单号(需填):\n");
|
sb.append("订单号(需填):\n");
|
||||||
sb.append(order.getOrderId() != null ? order.getOrderId() : "").append("\n");
|
sb.append(order.getOrderId() != null ? order.getOrderId() : "").append("\n");
|
||||||
sb.append("物流链接(需填):\n");
|
sb.append("物流链接(需填):\n");
|
||||||
@@ -2024,19 +2036,33 @@ public class InstructionServiceImpl implements IInstructionService {
|
|||||||
}
|
}
|
||||||
System.out.println("下单付款: " + order.getPaymentAmount());
|
System.out.println("下单付款: " + order.getPaymentAmount());
|
||||||
|
|
||||||
// 后返金额(新格式)或后返金额(旧格式)
|
// 后返金额(新格式)或后返金额(旧格式)。显式填写的 0 要落库;字段缺失时不把默认 0 当成已填。
|
||||||
String rebateStr = fields.getOrDefault("后返金额(注意核对)", null);
|
String rebateStr = fields.get("后返金额(注意核对)");
|
||||||
if (rebateStr == null) {
|
if (rebateStr == null) {
|
||||||
rebateStr = fields.getOrDefault("后返金额", "0");
|
rebateStr = fields.get("后返金额");
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
rebateStr = rebateStr.trim();
|
if (rebateStr != null && !rebateStr.trim().isEmpty()) {
|
||||||
if (!rebateStr.isEmpty() && !rebateStr.equals("0")) {
|
order.setRebateAmount(Double.parseDouble(rebateStr.trim()));
|
||||||
order.setRebateAmount(Double.parseDouble(rebateStr));
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.out.println("解析后返金额失败: " + rebateStr + ", error: " + e.getMessage());
|
System.out.println("解析后返金额失败: " + rebateStr + ", error: " + e.getMessage());
|
||||||
}
|
}
|
||||||
|
if (order.getRebateAmount() == null && order.getPaymentAmount() != null) {
|
||||||
|
String costStr = fields.get("成本价(注意核对)");
|
||||||
|
if (costStr == null) {
|
||||||
|
costStr = fields.get("成本价");
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
if (costStr != null && !costStr.trim().isEmpty()) {
|
||||||
|
java.math.BigDecimal pay = java.math.BigDecimal.valueOf(order.getPaymentAmount());
|
||||||
|
java.math.BigDecimal cost = new java.math.BigDecimal(costStr.trim());
|
||||||
|
order.setRebateAmount(pay.subtract(cost).setScale(2, java.math.RoundingMode.HALF_UP).doubleValue());
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
System.out.println("解析成本价失败: " + costStr + ", error: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
System.out.println("后返金额: " + order.getRebateAmount());
|
System.out.println("后返金额: " + order.getRebateAmount());
|
||||||
|
|
||||||
// 下单地址(新格式)或地址(旧格式)
|
// 下单地址(新格式)或地址(旧格式)
|
||||||
@@ -2119,7 +2145,12 @@ public class InstructionServiceImpl implements IInstructionService {
|
|||||||
extractFieldWithSeparator(input, fields, "型号:", "下单人(需填):");
|
extractFieldWithSeparator(input, fields, "型号:", "下单人(需填):");
|
||||||
extractFieldWithSeparator(input, fields, "下单人(需填):", "下单付款(注意核对):");
|
extractFieldWithSeparator(input, fields, "下单人(需填):", "下单付款(注意核对):");
|
||||||
extractFieldWithSeparator(input, fields, "下单付款(注意核对):", "后返金额(注意核对):");
|
extractFieldWithSeparator(input, fields, "下单付款(注意核对):", "后返金额(注意核对):");
|
||||||
|
if (input.contains("成本价(注意核对):")) {
|
||||||
|
extractFieldWithSeparator(input, fields, "后返金额(注意核对):", "成本价(注意核对):");
|
||||||
|
extractFieldWithSeparator(input, fields, "成本价(注意核对):", "订单号(需填):");
|
||||||
|
} else {
|
||||||
extractFieldWithSeparator(input, fields, "后返金额(注意核对):", "订单号(需填):");
|
extractFieldWithSeparator(input, fields, "后返金额(注意核对):", "订单号(需填):");
|
||||||
|
}
|
||||||
extractFieldWithSeparator(input, fields, "订单号(需填):", "物流链接(需填):");
|
extractFieldWithSeparator(input, fields, "订单号(需填):", "物流链接(需填):");
|
||||||
if (input.contains("物流单号(无链接时填):") || input.contains("物流单号:")) {
|
if (input.contains("物流单号(无链接时填):") || input.contains("物流单号:")) {
|
||||||
String waybillLabel = input.contains("物流单号(无链接时填):") ? "物流单号(无链接时填):" : "物流单号:";
|
String waybillLabel = input.contains("物流单号(无链接时填):") ? "物流单号(无链接时填):" : "物流单号:";
|
||||||
|
|||||||
Reference in New Issue
Block a user