推广红包-不在收回

yujian

2019-07-23 c76ad0e79b95c0bceed8a0234211f2c7f0168b14

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

@@ -775,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)// 新增

      {

@@ -1204,4 +1210,11 @@
      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);

   }



}