From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java
index e5a87b9..98f9cb3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java
@@ -1,5 +1,7 @@
 package com.yeshi.fanli.service.impl.order;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
@@ -7,14 +9,13 @@
 import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
 import com.yeshi.fanli.entity.order.HongBaoOrder;
 import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
-
+import com.yeshi.fanli.util.Constant;
 
 @Service
 public class HongBaoOrderServiceImpl implements HongBaoOrderService {
-	
+
 	@Resource
 	private HongBaoOrderMapper hongBaoOrderMapper;
-
 
 	@Override
 	public int insert(HongBaoOrder record) {
@@ -46,4 +47,25 @@
 		return hongBaoOrderMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<HongBaoOrder> listFanLiOrder(Long uid, int page, int pageSize) {
+		return hongBaoOrderMapper.listFanLiOrder(uid, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long countFanLiOrder(Long uid) {
+		Long count = hongBaoOrderMapper.countFanLiOrder(uid);
+		return count == null ? 0 : count;
+	}
+
+	@Override
+	public long countByOrderNoAndHongBaoType(String orderNo, int type) {
+		return hongBaoOrderMapper.countByOrderNoAndHongBaoType(orderNo, type, Constant.SOURCE_TYPE_TAOBAO);
+	}
+
+	@Override
+	public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId) {
+		return hongBaoOrderMapper.selectByCommonOrderId(commonOrderId);
+	}
+
 }

--
Gitblit v1.8.0