Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -31,6 +31,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;

@@ -45,12 +46,12 @@
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;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;

import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

@@ -99,6 +100,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";

@@ -791,7 +795,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一致才修改

@@ -915,6 +920,14 @@
      if (list.size() == 0) {

         return list;

      }

		
      List<String> listNo = new ArrayList<String>();

      for (CommonOrderVO commonOrderVO : list) {

         listNo.add(commonOrderVO.getOrderNo());

      }

      // 已经使用券订单

      List<UserSystemCouponRecord> couponRecordList = userSystemCouponRecordService.getRecordByOrderNoList(listNo);





      SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");

      for (CommonOrderVO order : list) {

@@ -992,6 +1005,28 @@
               }

            }

         }

			
         // 奖励订单、免单 使用记录

         if (couponRecordList != null && couponRecordList.size() > 0) {

            for (UserSystemCouponRecord couponRecord : couponRecordList) {

               // 订单号匹配

               if (order.getOrderNo().equals(couponRecord.getOrderNo())) {



                  String systemCouponType = couponRecord.getCouponType();

                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                  }



                  break;

               }

            }

         }





      }



@@ -1139,4 +1174,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);

   }



}