From 695c32b9958ab902b697dcdb88f71683b9c2c3d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 15:08:53 +0800
Subject: [PATCH] 拼多多推广链接
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 de252c8..493a847 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
@@ -201,8 +201,8 @@
@Override
public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
- String endTime) {
- return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
+ String endTime, Integer source) {
+ return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);
}
@Override
@@ -298,9 +298,7 @@
}
// 瀹炰粯娆�
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
-
- listOrderGoods.add(commonGoodsVO);
-
+
Integer orderType = order.getOrderType();
if (orderType == null) {
String shopType = commonGoodsVO.getShopType();
@@ -309,14 +307,8 @@
} else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
order.setOrderType(2);
}
-
- if (Constant.SOURCE_TYPE_JD == sourceType2) {
- order.setOrderType(3);
- } else if (Constant.SOURCE_TYPE_PDD == sourceType2) {
- order.setOrderType(4);
- }
}
-
+ listOrderGoods.add(commonGoodsVO);
break;
}
}
@@ -341,6 +333,18 @@
if (settleTime != null) {
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
}
+
+ Integer sourceType2 = order.getSourceType();
+ if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {
+ Integer orderType = order.getOrderType();
+ if (orderType == null) {
+ order.setOrderType(1);
+ }
+ } else if (sourceType2 == Constant.SOURCE_TYPE_JD) {
+ order.setOrderType(3);
+ } else if (sourceType2 == Constant.SOURCE_TYPE_PDD) {
+ order.setOrderType(4);
+ }
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
String orderStateContent = "";
--
Gitblit v1.8.0