订单bug，分享爆款自购修改

admin

2019-07-11 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9

 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";

@@ -783,7 +788,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 +1170,38 @@
      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);

   }



}