修改整个订单的状态

admin

2019-01-10 ed2c519540a927e8b10fd79b96ca8472e89fe47b

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

@@ -17,7 +17,6 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.order.CommonOrder;

@@ -82,15 +81,14 @@
   public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,

         Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)

         throws CommonOrderException {

      return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderState, orderNo, startTime,

            endTime, dateType);

      return commonOrderMapper.listUserOrder(start, count, uid, state, type, orderState, orderNo, startTime, endTime,

            dateType);

   }



   @Override

   public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,

         String startTime, String endTime, Integer dateType) throws CommonOrderException {

      return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime,

            dateType);

      return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType);

   }



   @Override

@@ -109,7 +107,7 @@
      }



      // 商品信息

      List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);

      List<CommonOrderVO> listGoods = commonOrderMapper.listOrderGoodsInfo(listOrder);

      // 订单商品为空

      if (listGoods == null || listGoods.size() == 0) {

         return listOrder;

@@ -122,18 +120,18 @@
   }



   @Override

   public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {

      return commonOrderMapper.countOrderByHongBaoType(uid, day);

   public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day) {

      return commonOrderMapper.countHistoryOrder(uid, day);

   }



   @Override

   public long countOrder(Long uid, Integer type, Integer day) {

      return commonOrderMapper.countBonusOrder(uid, type, day);

   public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime) {

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

   }



   @Override

   public BigDecimal countOrderMoney(Long uid, Integer type, Integer day) {

      return commonOrderMapper.countBonusOrderMoney(uid, type, day);

   public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {

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

   }



   @Override

@@ -184,9 +182,15 @@
                  commonGoodsVO.setGoodsTitle(titleMap);

               }



               // 购买数量

               commonGoodsVO.setActualCount(commonOrder.getTotalCount() + "件");

               String settlement = commonOrder.getTotalSettlement().setScale(2, BigDecimal.ROUND_DOWN).toString();

               commonGoodsVO.setActualPay("实付款：¥" + settlement);



               BigDecimal totalSettlement = commonOrder.getTotalSettlement();

               if (totalSettlement == null || totalSettlement.compareTo(new BigDecimal(0)) <= 0) {

                  totalSettlement = commonOrder.getTotalPayment();

               }

               // 实付款

               commonGoodsVO.setActualPay("实付款：¥" + totalSettlement);



               listOrderGoods.add(commonGoodsVO);



@@ -364,6 +368,23 @@
   @Override

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

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

      // 判断所有的订单状态

      int invalidCount = 0;

      for (TaoBaoOrder tb : taoBaoOrders) {

         if ("订单失效".equalsIgnoreCase(tb.getOrderState())) {

            invalidCount++;

         }

      }



      // 获取整体订单的状态

      int wholeOrderState = 0;

      if (taoBaoOrders.size() == invalidCount)

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_SHIXIAO;

      else if (invalidCount == 0)

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_YOUXIAO;

      else

         wholeOrderState = CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO;



      for (TaoBaoOrder taoBaoOrder : taoBaoOrders) {

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

               Constant.SOURCE_TYPE_TAOBAO, taoBaoOrder.getOrderBy());

@@ -373,6 +394,7 @@
            CommonOrderGoods goods = new CommonOrderGoods();

            goods.setGoodsId(taoBaoOrder.getAuctionId() + "");

            goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);



            // 商品是否已经插入

            List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper

                  .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());

@@ -395,6 +417,7 @@
            commonOrder.setCommonOrderGoods(goods);

            commonOrder.setUserInfo(new UserInfo(uid));

            commonOrder.setCreateTime(new Date());

            commonOrder.setStateWholeOrder(wholeOrderState);

            commonOrderMapper.insertSelective(commonOrder);



            commonOrderList.add(commonOrder);

@@ -413,6 +436,7 @@
            updateCommonOrder.setSettlement(newCommonOrder.getSettlement());

            updateCommonOrder.setSettleTime(newCommonOrder.getSettleTime());

            updateCommonOrder.setState(newCommonOrder.getState());

            updateCommonOrder.setStateWholeOrder(wholeOrderState);

            updateCommonOrder.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(updateCommonOrder);

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

@@ -420,12 +444,6 @@
         }

      }

      return commonOrderList;

   }



   @Override

   public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,

         String endTime, Integer day) {

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

   }



   @Override