Authored by tanling

no message

1 package com.yohoufo.order.service.impl; 1 package com.yohoufo.order.service.impl;
2 2
3 -import com.yohobuy.ufo.model.order.common.AppraiseOrderAttributes;  
4 import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus; 3 import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus;
5 -import com.yohobuy.ufo.model.order.common.OrderStatus;  
6 -import com.yohobuy.ufo.model.order.common.TabType; 4 +import com.yohobuy.ufo.model.order.common.OrderAttributes;
7 import com.yohoufo.dal.order.model.AppraiseOrder; 5 import com.yohoufo.dal.order.model.AppraiseOrder;
8 -import com.yohoufo.dal.order.model.BuyerOrder;  
9 -import com.yohoufo.order.utils.BuyerOrderUtils;  
10 import lombok.Setter; 6 import lombok.Setter;
11 import lombok.experimental.Accessors; 7 import lombok.experimental.Accessors;
12 8
13 import java.util.Objects; 9 import java.util.Objects;
14 -import java.util.function.Predicate;  
15 10
16 @Setter 11 @Setter
17 @Accessors(fluent = true) 12 @Accessors(fluent = true)
@@ -56,7 +51,7 @@ public class AppraiseExpressStageBuilder { @@ -56,7 +51,7 @@ public class AppraiseExpressStageBuilder {
56 51
57 int status = appraiseOrder.getStatus(); 52 int status = appraiseOrder.getStatus();
58 53
59 - if(appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){ 54 + if(appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()){
60 55
61 // 父订单 56 // 父订单
62 if (Objects.isNull(appraiseOrder.getParentOrderCode())){ 57 if (Objects.isNull(appraiseOrder.getParentOrderCode())){
@@ -578,7 +578,7 @@ public class AppraiseService { @@ -578,7 +578,7 @@ public class AppraiseService {
578 578
579 //发送消息 579 //发送消息
580 // 付费鉴定的场合,发货需要消息 580 // 付费鉴定的场合,发货需要消息
581 - if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){ 581 + if (appraiseOrder.getAttributes() == OrderAttributes.APPRAISE.getCode()){
582 582
583 List<AppraiseOrderGoods> appraiseOrderGoods = appraiseOrderGoodsMapper.selectByOrderCode(orderCode); 583 List<AppraiseOrderGoods> appraiseOrderGoods = appraiseOrderGoodsMapper.selectByOrderCode(orderCode);
584 if (CollectionUtils.isEmpty(appraiseOrderGoods)){ 584 if (CollectionUtils.isEmpty(appraiseOrderGoods)){
@@ -593,7 +593,7 @@ public class AppraiseService { @@ -593,7 +593,7 @@ public class AppraiseService {
593 wayBillCode); 593 wayBillCode);
594 } 594 }
595 595
596 - if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()) { // 鉴定寄存的订单,需要同步修改寄存表的状态 596 + if (appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()) { // 鉴定寄存的订单,需要同步修改寄存表的状态
597 setDepositStatus(orderCode); 597 setDepositStatus(orderCode);
598 } 598 }
599 599
@@ -587,7 +587,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -587,7 +587,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
587 587
588 588
589 // 付费寄存 无点亮信息,只根据状态展示对应的物流信息 589 // 付费寄存 无点亮信息,只根据状态展示对应的物流信息
590 - if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){ 590 + if (appraiseOrder.getAttributes() == OrderAttributes.APPRAISE.getCode()){
591 591
592 // 用户发货, 待用户收货 只有这两个状态展示物流 592 // 用户发货, 待用户收货 只有这两个状态展示物流
593 throwServiceExceptionIf(!expressInfoStatus.contains(appraiseOrder.getStatus()), 593 throwServiceExceptionIf(!expressInfoStatus.contains(appraiseOrder.getStatus()),
@@ -610,7 +610,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -610,7 +610,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
610 610
611 return expressInfoRespBo; 611 return expressInfoRespBo;
612 612
613 - }else if(appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){ 613 + }else if(appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()){
614 614
615 // 子订单的场合,点亮信息 + 物流信息(不区分阶段) 615 // 子订单的场合,点亮信息 + 物流信息(不区分阶段)
616 // 父订单的场合,点亮信息 + 物流信息(区分阶段) 616 // 父订单的场合,点亮信息 + 物流信息(区分阶段)
@@ -780,7 +780,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -780,7 +780,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
780 Integer status = appraiseOrder.getStatus(); 780 Integer status = appraiseOrder.getStatus();
781 781
782 // 现货鉴定 782 // 现货鉴定
783 - if (attribute == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){ 783 + if (attribute == OrderAttributes.APPRAISE.getCode()){
784 // 用户发货 784 // 用户发货
785 if(status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){ 785 if(status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){
786 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()); 786 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
@@ -794,7 +794,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -794,7 +794,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
794 } 794 }
795 } 795 }
796 // 现货寄存 796 // 现货寄存
797 - else if(attribute == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){ 797 + else if(attribute == OrderAttributes.DEPOSITE.getCode()){
798 798
799 boolean isSubOrder = Objects.nonNull(appraiseOrder.getParentOrderCode()) ? true : false; 799 boolean isSubOrder = Objects.nonNull(appraiseOrder.getParentOrderCode()) ? true : false;
800 // 子订单 寄回物流 800 // 子订单 寄回物流