Authored by tanling

no message

package com.yohoufo.order.service.impl;
import com.yohobuy.ufo.model.order.common.AppraiseOrderAttributes;
import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus;
import com.yohobuy.ufo.model.order.common.OrderStatus;
import com.yohobuy.ufo.model.order.common.TabType;
import com.yohobuy.ufo.model.order.common.OrderAttributes;
import com.yohoufo.dal.order.model.AppraiseOrder;
import com.yohoufo.dal.order.model.BuyerOrder;
import com.yohoufo.order.utils.BuyerOrderUtils;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.util.Objects;
import java.util.function.Predicate;
@Setter
@Accessors(fluent = true)
... ... @@ -56,7 +51,7 @@ public class AppraiseExpressStageBuilder {
int status = appraiseOrder.getStatus();
if(appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){
if(appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()){
// 父订单
if (Objects.isNull(appraiseOrder.getParentOrderCode())){
... ...
... ... @@ -578,7 +578,7 @@ public class AppraiseService {
//发送消息
// 付费鉴定的场合,发货需要消息
if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){
if (appraiseOrder.getAttributes() == OrderAttributes.APPRAISE.getCode()){
List<AppraiseOrderGoods> appraiseOrderGoods = appraiseOrderGoodsMapper.selectByOrderCode(orderCode);
if (CollectionUtils.isEmpty(appraiseOrderGoods)){
... ... @@ -593,7 +593,7 @@ public class AppraiseService {
wayBillCode);
}
if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()) { // 鉴定寄存的订单,需要同步修改寄存表的状态
if (appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()) { // 鉴定寄存的订单,需要同步修改寄存表的状态
setDepositStatus(orderCode);
}
... ...
... ... @@ -587,7 +587,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
// 付费寄存 无点亮信息,只根据状态展示对应的物流信息
if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){
if (appraiseOrder.getAttributes() == OrderAttributes.APPRAISE.getCode()){
// 用户发货, 待用户收货 只有这两个状态展示物流
throwServiceExceptionIf(!expressInfoStatus.contains(appraiseOrder.getStatus()),
... ... @@ -610,7 +610,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
return expressInfoRespBo;
}else if(appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){
}else if(appraiseOrder.getAttributes() == OrderAttributes.DEPOSITE.getCode()){
// 子订单的场合,点亮信息 + 物流信息(不区分阶段)
// 父订单的场合,点亮信息 + 物流信息(区分阶段)
... ... @@ -780,7 +780,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
Integer status = appraiseOrder.getStatus();
// 现货鉴定
if (attribute == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){
if (attribute == OrderAttributes.APPRAISE.getCode()){
// 用户发货
if(status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){
return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
... ... @@ -794,7 +794,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
}
}
// 现货寄存
else if(attribute == AppraiseOrderAttributes.PAID_DEPOSIT.getCode()){
else if(attribute == OrderAttributes.DEPOSITE.getCode()){
boolean isSubOrder = Objects.nonNull(appraiseOrder.getParentOrderCode()) ? true : false;
// 子订单 寄回物流
... ...