From 585b487cc71d06b2f76883f6f3b7247d1378874e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 13 五月 2020 11:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
index 1224e9b..97c9d02 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -68,6 +68,7 @@
commonOrder.setThirdCreateTime(new Date(order.getOrderCreateTime() * 1000));
commonOrder.setUpdateTime(new Date());
commonOrder.setTradeId(order.getOrderId());
+ commonOrder.setChildSourceType("鎷煎澶�");
return commonOrder;
}
@@ -123,6 +124,7 @@
commonOrder.setUpdateTime(new Date());
commonOrder.setTradeId(order.getTradeId());
commonOrder.setEstimate(order.getEstimateFee());
+ commonOrder.setChildSourceType("浜笢");
return commonOrder;
}
--
Gitblit v1.8.0