From 86e46bc28e78b3a883132816e23dbcca37f9ca3a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 14:24:15 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java |   82 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
index dc05984..2434fd1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
@@ -1,13 +1,13 @@
 package com.yeshi.fanli.util.factory;
 
 import java.math.BigDecimal;
-import java.util.Map;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
+import com.yeshi.fanli.dto.HongBaoDTO;
 import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -16,61 +16,65 @@
 
 @Component
 public class HongBaoFactory {
-	
-	
+
 	@Resource
 	private HongBaoManageService hongBaoManageService;
-	
+
 	private static HongBaoFactory hongBaoFactory;
-	
+
 	@PostConstruct
-	public void init(){
+	public void init() {
 		hongBaoFactory = this;
 		hongBaoFactory.hongBaoManageService = this.hongBaoManageService;
 	}
-	
+
 	/**
 	 * 
-	 * @param money 閲戦
-	 * @param orderId 绯荤粺鐨勮鍗旾D
-	 * @param parent 
-	 * @param userInfo 
+	 * @param money
+	 *            閲戦
+	 * @param orderId
+	 *            绯荤粺鐨勮鍗旾D
+	 * @param parent
+	 * @param userInfo
 	 * @return
 	 */
-	public static HongBao createHongBao(BigDecimal money,Long orderId,HongBao parent,UserInfo userInfo,int type) {
-		return createHongBao(money, null,orderId, parent, userInfo, null, type,null,null);
+	public static HongBao createHongBao(BigDecimal money, Long orderId, HongBao parent, UserInfo userInfo, int type) {
+		return createHongBao(money, null, orderId, parent, userInfo, null, type, null, null);
 	}
-	
-	public static HongBao createHongBao(BigDecimal money,String param,Long orderId,HongBao parent,UserInfo userInfo,int type) {
-		return createHongBao(money, param,orderId, parent, userInfo, null, type,null,null);
+
+	public static HongBao createHongBao(BigDecimal money, String param, Long orderId, HongBao parent, UserInfo userInfo,
+			int type) {
+		return createHongBao(money, param, orderId, parent, userInfo, null, type, null, null);
 	}
-	
-	public static HongBao createHongBao(BigDecimal money,String param,Long orderId,HongBao parent,UserInfo userInfo,int type,BigDecimal payMoney,Long auctionId) {
-		return createHongBao(money, param,orderId, parent, userInfo, null, type,payMoney,auctionId);
+
+	public static HongBao createHongBao(BigDecimal money, String param, Long orderId, HongBao parent, UserInfo userInfo,
+			int type, BigDecimal payMoney, Long auctionId) {
+		return createHongBao(money, param, orderId, parent, userInfo, null, type, payMoney, auctionId);
 	}
-	
-	public static HongBao createHongBao(BigDecimal money,String param,Long orderId,HongBao parent,UserInfo userInfo,Long preGettime,int type,BigDecimal payMoney,Long auctionId) {
+
+	public static HongBao createHongBao(BigDecimal money, String param, Long orderId, HongBao parent, UserInfo userInfo,
+			Long preGettime, int type, BigDecimal payMoney, Long auctionId) {
 		HongBao hongBao = new HongBao();
 		long timeMillis = System.currentTimeMillis();
 		hongBao.setCreatetime(timeMillis);
 		hongBao.setMoney(money);
 		hongBao.setState(Constant.HB_NOTIME);
-		if(param==null){
-			param="{\"picture\":\"\"}";
+		if (param == null) {
+			param = "{\"picture\":\"\"}";
 		}
 		hongBao.setParam(param);
-		if(orderId != null){
+		if (orderId != null) {
 			Order order = new Order();
 			order.setId(orderId);
 			hongBao.setOrder(order);
 		}
 		hongBao.setParent(parent);
-//		if(preGettime==null){
-//			preGettime = preGettime(timeMillis,type);
-//		}
-//		if(timeMillis >= preGettime){
-//			hongBao.setState(Constant.HB_GET);
-//		}
+		// if(preGettime==null){
+		// preGettime = preGettime(timeMillis,type);
+		// }
+		// if(timeMillis >= preGettime){
+		// hongBao.setState(Constant.HB_GET);
+		// }
 		hongBao.setPreGettime(0L);
 		hongBao.setUrank(userInfo.getRank());
 		hongBao.setUserInfo(userInfo);
@@ -83,4 +87,22 @@
 		return hongBao;
 	}
 
+	public static HongBao createHongBao(HongBaoDTO hongBaoDTO) {
+		HongBao hongBao = new HongBao();
+		hongBao.setId(hongBaoDTO.getId());
+		hongBao.setOrderId(hongBaoDTO.getOrderId());
+
+		if (hongBaoDTO.getSettlement() != null)
+			hongBao.setPayMoney(hongBaoDTO.getSettlement());
+		else
+			hongBao.setPayMoney(hongBaoDTO.getPayMoney());
+
+		hongBao.setCreatetime(hongBaoDTO.getCreateTime().getTime());
+		hongBao.setMoney(hongBaoDTO.getMoney());
+		hongBao.setState(hongBaoDTO.getState());
+		hongBao.setType(hongBaoDTO.getType());
+		hongBao.setUserInfo(hongBaoDTO.getUserInfo());
+		return hongBao;
+	}
+
 }

--
Gitblit v1.8.0