Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

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

@@ -15,6 +15,7 @@
import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

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

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

import com.yeshi.fanli.util.Constant;



@Service

public class TaoBaoWeiQuanOrderServiceImpl implements TaoBaoWeiQuanOrderService {

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

      if (taoBaoWeiQuanOrder != null) {

         // 已经是最新的状态了

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

         if (taoBaoWeiQuanOrder.getState() != null && (taoBaoWeiQuanOrder.getState().contains("维权成功")

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

            return;

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

         TaoBaoWeiQuanOrder update = new TaoBaoWeiQuanOrder();

@@ -55,13 +57,13 @@
               for (MsgOrderDetail msg : msgList) {

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

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

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

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

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

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

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

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

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

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

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

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

                  }

               }

            }