Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -241,8 +241,8 @@
            orderStateContent = "已维权";



            /* 订单维权 判断是否全部维权 */

            List<TaoBaoWeiQuanOrder> listWQ = 
                  taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");

            List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

                  .selectListByOrderIdAndState(order.getOrderNo(), "维权成功");



            boolean isPart = false;// 默认失效



@@ -362,7 +362,9 @@


   @Transactional

   @Override

   public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException {

   public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrders, Long uid) throws CommonOrderException {

      List<CommonOrder> commonOrderList = new ArrayList<>();

      for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {

      CommonOrder commonOrder = commonOrderMapper.selectByOrderNoAndOrderTypeAndOrderBy(taoBaoOrder.getOrderId(),

            Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

      if (commonOrder == null)// 新增

@@ -395,12 +397,14 @@
         commonOrder.setCreateTime(new Date());

         commonOrderMapper.insertSelective(commonOrder);

         



         return commonOrder;

            commonOrderList.add(commonOrder);

            continue;

      } else {// 修改

         // 已经结算或者已经失效的订单不处理

         if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX)

            return commonOrder;

            if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_SX) {

               commonOrderList.add(commonOrder);

               continue;

            }

         CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);

         CommonOrder updateCommonOrder = new CommonOrder(commonOrder.getId());

         updateCommonOrder.seteIncome(newCommonOrder.geteIncome());

@@ -411,8 +415,11 @@
         updateCommonOrder.setState(newCommonOrder.getState());

         updateCommonOrder.setUpdateTime(new Date());

         commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

         return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());

            commonOrderList.add(commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId()));

            continue;

      }

      }

      return commonOrderList;

   }



   @Override

@@ -420,4 +427,10 @@
         String endTime, Integer day) {

      return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);

   }



   @Override

   public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {



      return commonOrderMapper.countByUidAndOrderStateWithOrderBalanceTime(uid, state, minDate, maxDate);

   }

}