From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
index 9f76f36..2005ab8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
@@ -125,6 +125,10 @@
 			record.setState(0);
 			record.setTradeId(order.getOrderItemId());
 			record.setUid(hongBaoOrder.getHongBaoV2().getUserInfo().getId());
+
+			if (record.getMoney().compareTo(hongBaoOrder.getHongBaoV2().getMoney()) > 0)
+				record.setMoney(hongBaoOrder.getHongBaoV2().getMoney());
+
 			userOrderWeiQuanRecordMapper.insertSelective(record);
 		}
 		List<HongBaoV2> children = hongBaoV2Service.listChildrenById(mainHongBao.getId());
@@ -139,9 +143,32 @@
 				record.setState(0);
 				record.setTradeId(order.getOrderItemId());
 				record.setUid(v2.getUserInfo().getId());
+
+				if (record.getMoney().compareTo(v2.getMoney()) > 0)
+					record.setMoney(v2.getMoney());
+
 				userOrderWeiQuanRecordMapper.insertSelective(record);
 			}
 		}
 	}
 
+	@Override
+	public UserOrderWeiQuanRecord selectByOrderInfoAndUid(Long uid, String tradeId, int sourceType) {
+		UserOrderWeiQuanRecord record = userOrderWeiQuanRecordMapper.selectByOrderInfoAndUid(uid, tradeId, sourceType);
+
+		return record;
+	}
+
+	
+	@Override
+	public Integer countWeiQaunOrderNumberByDate(String preDay) {
+		return  userOrderWeiQuanRecordMapper.countWeiQaunOrderNumberByDate(preDay);
+	}
+	
+	
+	
+	@Override
+	public BigDecimal countWeiQaunOrderMoneyByDate(String preDay) {
+		return  userOrderWeiQuanRecordMapper.countWeiQaunOrderMoneyByDate(preDay);
+	}
 }

--
Gitblit v1.8.0