From 8618015e4fa4b4c8bd3e0a4c35b97d9af7852700 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 18:00:55 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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..a2f065d 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;
@@ -103,6 +104,7 @@
@Service
public class CommonOrderServiceImpl implements CommonOrderService {
+
@Resource
private CommonOrderMapper commonOrderMapper;
@@ -1268,7 +1270,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);
}
@@ -1942,12 +1944,12 @@
@Override
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception {
+ List<Integer> listSource) throws CommonOrderException, Exception {
int pageSize = Constant.PAGE_SIZE;
List<CommonOrderVO> listOrder = commonOrderMapper.getOrderList((page - 1) * pageSize, pageSize, uid, state,
- type, orderState, orderNo, startTime, endTime, dateType, listSource, notBackSuVip);
+ type, orderState, orderNo, startTime, endTime, dateType, listSource);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -1969,10 +1971,10 @@
@Override
public long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip)
+ String startTime, String endTime, Integer dateType, List<Integer> listSource)
throws CommonOrderException {
return commonOrderMapper.countOrderList(uid, state, type, orderState, orderNo, startTime, endTime, dateType,
- listSource, notBackSuVip);
+ listSource);
}
/**
@@ -2107,6 +2109,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