From 26e7a03ee4be4b8de0cbfe55d6ef6a63122b2336 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 16:00:33 +0800
Subject: [PATCH] 暂不到账拼多多/京东
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index df59aaf..a8c6ff9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -299,6 +299,13 @@
return;
}
+ // 鐏板害娴嬭瘯涓紝浜笢/鎷煎澶氫笉杩斿埄
+ if (hongBaoOrder.getCommonOrder() == null
+ || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD
+ || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD) {
+ return;
+ }
+
if (hongBaoOrder.getCommonOrder() != null
&& hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {
// 缁存潈涓殑涓嶈繑鍒�
@@ -554,6 +561,25 @@
types.add(HongBaoV2.TYPE_YIJI);
types.add(HongBaoV2.TYPE_ERJI);
List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);
+ // 鐏板害娴嬭瘯涓紝浜笢/鎷煎澶氳鍗曞垎浜�/閭�璇疯鍗曚笉杩斿埄
+ for (int i = 0; i < hongBaoList.size(); i++) {
+ HongBaoV2 item = hongBaoList.get(i);
+ if (item.getType() == HongBaoV2.TYPE_SHARE_GOODS) {
+ } else {
+ item = item.getParent();
+ }
+ if (item != null) {
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(item.getId());
+ if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {
+ CommonOrder co = hongBaoOrder.getCommonOrder();
+ if (co.getSourceType() == Constant.SOURCE_TYPE_JD
+ || co.getSourceType() == Constant.SOURCE_TYPE_PDD) {
+ hongBaoList.remove(i);
+ i--;
+ }
+ }
+ }
+ }
List<Long> hbIdList = new ArrayList<>();
@@ -736,9 +762,12 @@
Date minDate = new Date(TimeUtil
.convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));
- long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);
- long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);
- long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);
+ long validCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,
+ minDate, maxDate);
+ long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,
+ minDate, maxDate);
+ long invalidCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,
+ minDate, maxDate);
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
(int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());
@@ -951,6 +980,7 @@
/**
* 澶勭悊浜笢杩斿埄璁㈠崟
+ *
* @param jdOrder
* @param uid
*/
@@ -1023,6 +1053,7 @@
/**
* 澶勭悊浜笢鍒嗕韩璁㈠崟
+ *
* @param order
* @param uid
*/
@@ -1073,6 +1104,7 @@
/**
* 澶勭悊鎷煎澶氳嚜璐繑鍒╄鍗�
+ *
* @param pddOrder
* @param uid
*/
@@ -1135,9 +1167,9 @@
}
}
-
/**
* 澶勭悊鎷煎澶氬垎浜鍗�
+ *
* @param order
* @param uid
*/
--
Gitblit v1.8.0