Authored by qinchao

fix:文案显示

... ... @@ -41,7 +41,6 @@ import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
... ... @@ -756,30 +755,49 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
miniFaultConfirm.setSuppleText(last_seller_un_accept);
}
}else{
//瑕疵待确认
}else if(qualityCheck.getType()!=null&&EnumQualityCheckType.MINI_FAULT.getCode().intValue()==qualityCheck.getType().intValue()){
//瑕疵,卖家还是买家
if(TabType.BUY==actor){
miniFaultConfirm.setPreText(pre_buyer);
miniFaultConfirm.setSuppleText(last_seller_un_accept);
}else if(TabType.SELL ==actor){
miniFaultConfirm.setPreText(pre_seller);
miniFaultConfirm.setSuppleText(last_seller_confirm);
}
}
//瑕疵待确认
if(qualityCheck.getStatus()!=null&&EnumQualityCheckStatus.WAIT_CONFIRM.getCode().intValue()==qualityCheck.getStatus().intValue()){
if(TabType.BUY==actor){
//倒计时大于零,才有按钮
if(leftTime>0){
showBtn=true;
//瑕疵
if(qualityCheck.getStatus()!=null){
if(EnumQualityCheckStatus.WAIT_CONFIRM.getCode().intValue()==qualityCheck.getStatus().intValue()){
if(TabType.BUY==actor){
//倒计时大于零,才有按钮
if(leftTime>0){
showBtn=true;
}
//
miniFaultConfirm.setSuppleText("");//后续由app添加倒计时
}else{
miniFaultConfirm.setSuppleText(last_seller_confirm);
}
}else if(EnumQualityCheckStatus.PASS.getCode().intValue()==qualityCheck.getStatus().intValue()){
//接收,后续不需要添加文案
if(TabType.BUY==actor){
miniFaultConfirm.setSuppleText("");
}else if(TabType.SELL ==actor){
miniFaultConfirm.setSuppleText("");
}
}else if(EnumQualityCheckStatus.REJECT_BY_BUYER.getCode().intValue()==qualityCheck.getStatus().intValue()
||EnumQualityCheckStatus.REJECT_BY_OUTER_TIME.getCode().intValue()==qualityCheck.getStatus().intValue()){
//不接受,后续不需要添加文案
if(TabType.BUY==actor){
miniFaultConfirm.setSuppleText("");
}else if(TabType.SELL ==actor){
miniFaultConfirm.setSuppleText("");
}
}
//
miniFaultConfirm.setSuppleText("");//后续由app添加倒计时
}
}
miniFaultConfirm.setShowBtn(showBtn);
miniFaultConfirm.setActor(TabType.BUY==actor?TabType.BUY.getValue():TabType.SELL.getValue());
miniFaultConfirm.setCreateTime(qualityCheck.getCreateTime());
... ...