From 7e3d4837b8464c32c4c25f40eb01222a8759eeb9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 10:57:56 +0800
Subject: [PATCH] 删除PidOrder相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 233 ----------------------------------------------------------
1 files changed, 1 insertions(+), 232 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index d8312b1..d0b324c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -2,8 +2,6 @@
import java.math.BigDecimal;
import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -18,7 +16,6 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
-import com.yeshi.fanli.dao.mybatis.PidOrderMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
@@ -37,9 +34,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
-import com.yeshi.fanli.entity.taobao.PidOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.HongBaoException;
import com.yeshi.fanli.exception.order.ShareGoodsActivityOrderException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -61,7 +56,6 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Service
public class HongBaoV2ServiceImpl implements HongBaoV2Service {
@@ -102,8 +96,6 @@
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
- @Resource
- private PidOrderMapper pidOrderMapper;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -162,229 +154,6 @@
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
- private HongBaoV2 getHongBaoV2(HongBao hb) {
- int type = hb.getType().intValue();
- HongBaoV2 v2 = new HongBaoV2(hb.getId());
- v2.setCreateTime(new Date(hb.getCreatetime()));
- if (hb.getGetTime() == null || hb.getGetTime() == 0)
- v2.setGetTime(null);
- else
- v2.setGetTime(new Date(hb.getGetTime()));
-
- v2.setMoney(hb.getMoney());
- if (hb.getParent() != null)
- v2.setParent(new HongBaoV2(hb.getParent().getId()));
-
- if (hb.getType() == HongBao.TYPE_SHARE_GOODS) {
- if (hb.getBalanceTime() != null)
- v2.setPreGetTime(new Date(hb.getPreGettime()));
- else
- v2.setPreGetTime(null);
- } else {
- if (hb.getPreGettime() == null || hb.getPreGettime() == 0)
- v2.setPreGetTime(null);
- else
- v2.setPreGetTime(new Date(hb.getPreGettime()));
- }
-
- v2.setState(hb.getState());
- if (hb.getState() == 1 && hb.getBalanceTime() != null) {
- v2.setState(HongBaoV2.STATE_KELINGQU);
- }
- v2.setType(type);
- v2.setUpdateTime(new Date(hb.getCreatetime()));
- v2.setUrank(hb.getUrank());
- v2.setUserInfo(hb.getUserInfo());
- v2.setVersion(hb.getVersion());
- return v2;
- }
-
- @Transactional
- @Override
- public void convert(HongBao hb) {
- if (hb == null || hb.getParent() != null)
- return;
-
- int type = hb.getType().intValue();
- if (type == HongBao.TYPE_TAOBAO || type == HongBao.TYPE_SHARE_GOODS) {// 鑷喘涓庡垎浜禋闇�瑕佹煡璇㈠嚭鎵�鏈夌殑璁㈠崟
- // 灞炰簬杩斿埄璁㈠崟
- String orderId = "";
- if (hb.getOrder() != null) {
- orderId = hb.getOrder().getOrderId();
- // 鏌ヨ鍚屼竴璁㈠崟鍙风殑闈炲瓙绾㈠寘
- } else
- orderId = hb.getOrderId();
-
- int count = commonOrderMapper.countByOrderNOAndOrderType(orderId, Constant.SOURCE_TYPE_TAOBAO);
-
- // 宸茬粡鎻掑叆璁㈠崟
- if (count > 0)
- return;
-
- //
-
- if (hb.getVersion() == 1) {// 寰堣�佺増鏈殑澶勭悊鏂瑰紡,宸瞙ongbao涓轰富
- if (hongBaoV2Mapper.selectByPrimaryKey(hb.getId()) != null)
- return;
- HongBaoV2 hongBaoV2 = getHongBaoV2(hb);
- hongBaoV2.setBeizhu("璁㈠崟鍙�:" + orderId);
- hongBaoV2Mapper.insert(hongBaoV2);
-
- if (hb.getHasChild())// 瀛樺湪瀛愮孩鍖�
- {
- List<HongBao> children = hongBaoMapper.selectChildHongBaoByPid(hb.getId());
- if (children != null)
- for (HongBao hongBao : children) {
- HongBaoV2 child = getHongBaoV2(hongBao);
- hongBaoV2Mapper.insert(child);
- }
- }
-
- } else {// 鏂扮増鏈鐞嗘柟寮�
-
- List<HongBao> list = hongBaoMapper.selectByOrderId(orderId);
-
- if (list.size() == 0)
- list = hongBaoMapper.selectByOid(hb.getOrder().getId());
- if (list != null)
- // 鍒犻櫎瀛愮孩鍖�
- for (int i = 0; i < list.size(); i++) {
- if (list.get(i).getParent() != null) {
- list.remove(i);
- i--;
- }
-
- }
-
- if (list.size() <= 0)
- return;
- if (list.get(0).getType() == 20)
- for (HongBao hb1 : list) {
- PidOrder pidOrder = pidOrderMapper.getPidOrderByHongBaoId(hb1.getId());
- if (pidOrder != null)
- hb1.setAuctionId(pidOrder.getAuctionId());
-
- }
-
- List<TaoBaoOrder> orderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);
-
- if (orderList == null || orderList.size() < list.size()) {
- System.out.println("绾㈠寘鏁颁笌璁㈠崟鏁颁笉瀵瑰簲");
- return;
- }
-
- // 鍔犲叆鎺掑簭鍊�
- for (int i = 0; i < orderList.size(); i++) {
- orderList.get(i).setOrderBy(i + 1);
- }
-
- // 鎸夌収auctionId,payMoney鎺掑簭
- Comparator<HongBao> cm = new Comparator<HongBao>() {
- @Override
- public int compare(HongBao o1, HongBao o2) {
- if (o1.getAuctionId().longValue() < o2.getAuctionId().longValue())
- return -3;
- else if (o1.getAuctionId().longValue() > o2.getAuctionId().longValue()) {
- return 3;
- } else {
- if (o1.getState() - o2.getState() > 0)
- return 2;
- else if (o1.getState() - o2.getState() < 0)
- return -2;
- else {
- if (o1.getPayMoney().compareTo(o2.getPayMoney()) >= 0)
- return 1;
- else
- return -1;
- }
- }
- }
- };
-
- Collections.sort(list, cm);
-
- Comparator<TaoBaoOrder> cmOrder = new Comparator<TaoBaoOrder>() {
-
- @Override
- public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
-
- if (o1.getAuctionId().longValue() < o2.getAuctionId().longValue())
- return -3;
- else if (o1.getAuctionId().longValue() > o2.getAuctionId().longValue()) {
- return 3;
- } else {
- if (o1.getPayment().compareTo(o2.getPayment()) < 0)
- return 2;
- else
- return -2;
- }
- }
- };
-
- Collections.sort(orderList, cmOrder);
-
- for (TaoBaoOrder t : orderList)
- System.out.println(t.getAuctionId());
-
- for (int i = 0; i < list.size(); i++) {
- CommonOrder commonOrder = TaoBaoOrderUtil.convert(orderList.get(i));
- CommonOrderGoods goods = new CommonOrderGoods();
- goods.setGoodsId(orderList.get(i).getAuctionId() + "");
- goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- // 鍟嗗搧鏄惁宸茬粡鎻掑叆
- List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
- .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
- if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
- commonOrderGoodsMapper.insertSelective(goods);
- else
- goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());
- commonOrder.setCommonOrderGoods(goods);
-
- commonOrder.setUserInfo(list.get(i).getUserInfo());
- commonOrder.setCreateTime(new Date(list.get(i).getCreatetime()));
-
- // TODO 缁存潈鍒ゆ柇
- List<TaoBaoWeiQuanOrder> weiQuanList = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(orderId,
- "缁存潈鎴愬姛");
- if (weiQuanList != null && weiQuanList.size() > 0)
- commonOrder.setState(CommonOrder.STATE_WQ);
-
- commonOrderMapper.insertSelective(commonOrder);
-
- // 鎻掑叆绾㈠寘
- HongBaoV2 hongBaoV2 = getHongBaoV2(list.get(i));
- hongBaoV2.setId(list.get(i).getId());
- hongBaoV2Mapper.insert(hongBaoV2);
-
- HongBaoOrder ho = new HongBaoOrder();
- ho.setCommonOrder(commonOrder);
- ho.setCreateTime(new Date());
- ho.setHongBaoV2(hongBaoV2);
- hongBaoOrderMapper.insertSelective(ho);
-
- if (list.get(i).getHasChild())// 瀛樺湪瀛愮孩鍖�
- {
- List<HongBao> children = hongBaoMapper.selectChildHongBaoByPid(list.get(i).getId());
- if (children != null)
- for (HongBao hongBao : children) {
- HongBaoV2 child = getHongBaoV2(hongBao);
- hongBaoV2Mapper.insert(child);
- }
- }
- }
- }
-
- } else {// 鐩存帴鎻掑叆
-
- if (type != HongBao.TYPE_ERJI && type != HongBao.TYPE_YIJI && type != HongBao.TYPE_SHARE_YIJI
- && type != HongBao.TYPE_SHARE_ERJI) {
- if (hongBaoV2Mapper.selectByPrimaryKey(hb.getId()) == null)
- hongBaoV2Mapper.insert(getHongBaoV2(hb));
- }
-
- }
-
- }
@Transactional
@Override
@@ -542,7 +311,7 @@
hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
if (mianDan)
hongBao.setMoney(commonOrder.getSettlement().compareTo(commonOrder.getPayment()) <= 0
- ? commonOrder.getSettlement() : commonOrder.getPayment());//杩斿埄缁撶畻涓庝粯娆捐緝灏忕殑閲戦
+ ? commonOrder.getSettlement() : commonOrder.getPayment());// 杩斿埄缁撶畻涓庝粯娆捐緝灏忕殑閲戦
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
--
Gitblit v1.8.0