From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 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 560b505..88b1c6d 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,76 +1,80 @@
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.entity.bus.user.HongBao;
+import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.HongBaoDTO;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.Constant;
@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);
@@ -82,27 +86,23 @@
hongBao.setHasChild(false);
return hongBao;
}
-
- /**
- * 鑾峰彇绾㈠寘鍙墦寮�鏃堕棿
- * @param timeMillis
- * @param type 绾㈠寘绫诲瀷
- * @return
- */
- private static long preGettime(long timeMillis,int type){
- Map<String, String> map = hongBaoFactory.hongBaoManageService.convertMap();
- String day = null;
- String hour = null;
- if(type != Constant.HB_NEWUSER){
- day = map.get("hongbao_goods_unlock_day");
- hour = map.get("hongbao_goods_unlock_hour");
- }else{
- day = map.get("hongbao_new_user_unlock_day");
- hour = map.get("hongbao_new_user_unlock_hour");
- }
- long dayms =(long) (Double.parseDouble(day) * Constant.DAYMS);
- long hourms =(long)(Double.parseDouble(hour) * Constant.HOURMS);
- return timeMillis+dayms+hourms;
+
+ public static HongBao createHongBao(HongBaoDTO hongBaoDTO) {
+ HongBao hongBao = new HongBao();
+ hongBao.setId(hongBaoDTO.getId());
+ hongBao.setOrderId(hongBaoDTO.getOrderId());
+
+ if (hongBaoDTO.getSettlement() != null&&hongBaoDTO.getSettlement().compareTo(new BigDecimal(0))>0)
+ 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