From c76ad0e79b95c0bceed8a0234211f2c7f0168b14 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 23 七月 2019 16:53:12 +0800 Subject: [PATCH] 推广红包-不在收回 --- fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java index 208c811..ade2bea 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java @@ -30,6 +30,7 @@ import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.order.CommonOrderGoods; import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap; +import com.yeshi.fanli.entity.order.HongBaoOrder; import com.yeshi.fanli.entity.pdd.PDDOrder; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -44,6 +45,7 @@ import com.yeshi.fanli.service.inter.goods.CommonGoodsService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.order.CommonOrderService; +import com.yeshi.fanli.service.inter.order.HongBaoOrderService; import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService; import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.util.Constant; @@ -97,6 +99,9 @@ @Resource private CommonGoodsService commonGoodsService; + + @Resource + private HongBaoOrderService hongBaoOrderService; // 濂栧姳璁㈠崟鍥剧墖 public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png"; @@ -770,8 +775,14 @@ commonOrder.setCommonOrderGoods(goods); } - CommonOrder oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(), - commonOrder.getSourceType(), commonOrder.getOrderBy()); + CommonOrder oldCommonOrder = null; + + if (!StringUtil.isNullOrEmpty(commonOrder.getTradeId())) + oldCommonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(commonOrder.getSourceType(), + commonOrder.getTradeId()); + else + oldCommonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(commonOrder.getOrderNo(), + commonOrder.getSourceType(), commonOrder.getOrderBy()); if (oldCommonOrder == null)// 鏂板 { @@ -783,7 +794,8 @@ return commonOrder; } else {// 淇敼 // 宸茬粡缁撶畻鎴栬�呭凡缁忓け鏁堢殑璁㈠崟涓嶅鐞� - if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX) { + if (oldCommonOrder.getState() == CommonOrder.STATE_JS + || oldCommonOrder.getState() == CommonOrder.STATE_SX) { return oldCommonOrder; } // 浜ゆ槗ID涓�鑷存墠淇敼 @@ -1164,4 +1176,45 @@ return commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId); } + @Transactional + @Override + public void deleteErrorCommonOrder(Long coId) { + // 鏌ヨ鏄惁杩斿埄鍒拌处 + HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(coId); + if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU) + return; + List<HongBaoV2> hongBaoList = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId()); + boolean canDelete = true; + for (HongBaoV2 child : hongBaoList) + if (child.getState() == HongBaoV2.STATE_YILINGQU) { + canDelete = false; + break; + } + // 涓嶈兘鍒犻櫎 + if (!canDelete) + return; + + // 鍒犻櫎child + for (HongBaoV2 child : hongBaoList) + hongBaoV2Service.deleteByPrimaryKey(child.getId()); + // 鍒犻櫎涓荤孩鍖� + hongBaoV2Service.deleteByPrimaryKey(hongBaoOrder.getHongBaoV2().getId()); + // 鍒犻櫎hongbaoOrder + hongBaoOrderService.deleteByPrimaryKey(hongBaoOrder.getId()); + // 鍒犻櫎CommonOrder + commonOrderMapper.deleteByPrimaryKey(hongBaoOrder.getCommonOrder().getId()); + } + + @Override + public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId) { + return commonOrderMapper.listBySourceTypeAndTradeId(sourceType, tradeId); + } + + @Override + public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + Long maxTime, int page, int pageSize) { + return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime, + (page - 1) * pageSize, pageSize); + } + } -- Gitblit v1.8.0