From 1fd4540bed907ece1e04ccf538e6655812df24f6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:46:25 +0800
Subject: [PATCH] 测
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index af52a02..a92d9d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -45,6 +45,7 @@
import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
+import com.yeshi.fanli.entity.order.SourceTypeEnum;
import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.suning.SuningOrderInfo;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
@@ -1268,7 +1269,7 @@
{
SuningGoodsInfo pddGoods = null;
// TODO 闇�瑕佽幏鍙�
- pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), "00000000");
+ pddGoods = SuningApiUtil.getGoodsDetail(suningOrderInfo.getGoodsNum(), suningOrderInfo.getSellerCode());
if (pddGoods != null) {
cog = CommonOrderGoodsFactory.create(pddGoods);
}
@@ -2107,6 +2108,21 @@
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
order.setOrderType(4);
}
+
+ // 瀛愭潵婧愮被鍨�
+ ClientTextStyleVO shopStyleVO = new ClientTextStyleVO();
+ SourceTypeEnum typeEnum = SourceTypeEnum.getByDesc(order.getChildSourceType());
+ if (typeEnum == null) {
+ shopStyleVO.setContent("鍏朵粬");
+ shopStyleVO.setColor("#FF5000");
+ shopStyleVO.setBorderColor("#FF5000");
+ } else {
+ shopStyleVO.setContent(typeEnum.getDescShow());
+ shopStyleVO.setColor(typeEnum.getFontColor());
+ shopStyleVO.setBorderColor(typeEnum.getBorderColor());
+ }
+ order.setShopType(shopStyleVO);
+
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
--
Gitblit v1.8.0