Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanOrderServiceImpl.java

@@ -8,13 +8,24 @@
import org.springframework.stereotype.Service;



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

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

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

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;



@Service

public class TaoBaoWeiQuanOrderServiceImpl implements TaoBaoWeiQuanOrderService {

   @Resource

   private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;



   @Resource

   private UserOrderMsgNotificationService userOrderMsgNotificationService;



   @Resource

   private MsgOrderDetailService msgOrderDetailService;



   @Override

   public void addWeiQuanOrder(TaoBaoWeiQuanOrder order) {

@@ -25,8 +36,7 @@
            .selectByOrderIdAndOrderItemId(order.getOrderId(), order.getOrderItemId());

      if (taoBaoWeiQuanOrder != null) {

         // 已经是最新的状态了

         if (taoBaoWeiQuanOrder.getState().equalsIgnoreCase("维权成功")

               || taoBaoWeiQuanOrder.getState().equalsIgnoreCase("维权失败"))

         if (taoBaoWeiQuanOrder.getState().contains("维权成功") || taoBaoWeiQuanOrder.getState().contains("维权失败"))

            return;

         // 更新金额，状态与时间

         TaoBaoWeiQuanOrder update = new TaoBaoWeiQuanOrder();

@@ -38,6 +48,26 @@
         update.setUpdateTime(new Date());

         update.setWeiQuanFinishTime(order.getWeiQuanFinishTime());

         taoBaoWeiQuanOrderMapper.updateByPrimaryKeySelective(update);



         try {

            if (order.getState().contains("维权成功")) {

               List<MsgOrderDetail> msgList = msgOrderDetailService.listMsgOrderByOrderId(order.getOrderId());

               for (MsgOrderDetail msg : msgList) {

                  if (msg.getType() == MsgTypeOrderTypeEnum.fanli) {

                     userOrderMsgNotificationService.orderFanLiStateChanged(msg.getUser().getId(),

                           order.getOrderId(), null, null, CommonOrder.STATE_WQ);

                  } else if (msg.getType() == MsgTypeOrderTypeEnum.invite) {

                     userOrderMsgNotificationService.orderInviteStateChanged(msg.getUser().getId(),

                           order.getOrderId(), null, null, CommonOrder.STATE_WQ);

                  } else if (msg.getType() == MsgTypeOrderTypeEnum.share) {

                     userOrderMsgNotificationService.orderShareStateChanged(msg.getUser().getId(),

                           order.getOrderId(), null, null, CommonOrder.STATE_WQ);

                  }

               }

            }

         } catch (Exception e) {



         }

      } else {

         order.setCreateTime(new Date());

         order.setUpdateTime(new Date());

@@ -50,4 +80,29 @@
      return taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(orderId, "维权成功");

   }



   @Override

   public TaoBaoWeiQuanOrder listByorderItemId(String tradeId) {

      return taoBaoWeiQuanOrderMapper.selectByOrderItemId(tradeId);

   }



   @Override

   public List<TaoBaoWeiQuanOrder> listByState(String state, int page, int pageSize) {

      return taoBaoWeiQuanOrderMapper.listByState(state, (page - 1) * pageSize, pageSize);

   }



   @Override

   public long countByState(String state) {

      return taoBaoWeiQuanOrderMapper.countByState(state);

   }



   @Override

   public List<TaoBaoWeiQuanOrder> listByOrderId(String orderId) {

      return taoBaoWeiQuanOrderMapper.listByOrderId(orderId);

   }



   @Override

   public TaoBaoWeiQuanOrder selectByTradeId(String tradeId) {

      return taoBaoWeiQuanOrderMapper.selectByOrderItem(tradeId);

   }



}