From 6525d6dd483ec67d0d187c3cace7ab82accb341a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 27 十二月 2018 09:27:23 +0800
Subject: [PATCH] 订单接口调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 4ce1d0a..e945f6f 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
@@ -126,8 +126,9 @@
}
@Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime);
+ public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,
+ String endTime, Integer day) {
+ return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
}
public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
@@ -163,6 +164,16 @@
commonGoodsVO.setActualPay(commonOrder.getTotalSettlement());
listOrderGoods.add(commonGoodsVO);
+
+ Integer orderType = commonOrder.getOrderType();
+ if (orderType == null) {
+ String shopType = commonGoodsVO.getShopType();
+ if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(1);
+ } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(2);
+ }
+ }
break;
}
@@ -258,7 +269,6 @@
String hongBaoState_Str = "";
String hongbaoInfoFontColor = "#E5005C";
-
/* 绾㈠寘鐘舵�� 杞崲 */
String stateContent = "";
Integer orderHongBaoState = null;
@@ -267,7 +277,6 @@
orderHongBaoState = 1;
stateContent = "鏈埌璐�";
hongBaoState_Str = "棰勪及";
- hongbaoInfoFontColor = "#888888";
Date preAccountTime = order.getPreAccountTime();
if (preAccountTime != null) {
@@ -295,6 +304,7 @@
orderHongBaoState = 4;
stateContent = "宸插け鏁�";
hongBaoDate = " ";
+ hongbaoInfoFontColor = "#888888";
}
order.setHongBaoState(orderHongBaoState);
order.setAccountState(stateContent);
--
Gitblit v1.8.0