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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cc
2024-11-13 23:02:17 +08:00
parent 010a3ddd2d f17ccd428a
commit ad57aff5db
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/cn/van/business/util/JDUtils.java
View File

@@ -476,20 +476,22 @@ public class JDUtils {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
ValidCodeConverter converter = new ValidCodeConverter();
String orderInfo =
//+ "订单+sku：" + orderRow.getId() + "\r"
"订单号：" + orderRow.getOrderId() + "(" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
"最新订单状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" +
"商品名称：" + orderRow.getSkuName() + "\r"
+ "订单+sku：" + orderRow.getId() + "\r"
+ "订单号：" + orderRow.getOrderId() + "(" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r"
+ "佣金比例：" + orderRow.getCommissionRate() + "%\r\r"
+ "商品单价：" + orderRow.getPrice() + "\r"
+ "商品数量：" + orderRow.getSkuNum() + "\r"
+ "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
+ "订单总价：" + (orderRow.getActualCosPrice() * orderRow.getSkuNum()) + "\r"
+ "预估计佣金额：" + orderRow.getEstimateCosPrice() + "\n"
+ "佣金比例：" + orderRow.getCommissionRate() + "%\r\r"
+ "推客的预估佣金：" + orderRow.getEstimateFee() + "\r"
+ "实际计算佣金的金额：" + orderRow.getActualCosPrice() + "\r"
+ "下单时间：" + formatter.format(orderRow.getOrderTime()) + "\r"
+ "完成时间：" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r\n"
+ "最新订单状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r";
+ "完成时间：" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r\n";
if (oldValidCode != -100) {
orderInfo = "订单状态从 ：" + (converter.getCodeDescription(oldValidCode)) + " --变成-- " +
(converter.getCodeDescription(orderRow.getValidCode())) + "\r" + orderInfo;
@@ -601,7 +603,7 @@ public class JDUtils {
}
// 拉取历史订单 2880 次请求
@Scheduled(cron = "0 0 8,12,20,0 * * ?")
@Scheduled(cron = "0 0 * * * ?")
public void fetchHistoricalOrders() throws Exception {
// 从设定的开始日期到昨天的同一时间
System.out.println("开始拉取历史订单");