|
...
|
...
|
@@ -512,7 +512,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
|
if(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(expressType)){
|
|
|
|
LOGGER.info("getExpressInfoListByStage out because of expressType is judge center ,orderCode = {} ,expressType = {} ",orderCode,expressType);
|
|
|
|
List<ExpressInfo> ls = expressInfoMapper.selectByOrderCodeAndExpressType(orderCode,expressType);
|
|
|
|
if(actor!=null&&CollectionUtils.isNotEmpty(ls)){
|
|
|
|
if(CollectionUtils.isNotEmpty(ls)){
|
|
|
|
for(ExpressInfo info:ls){
|
|
|
|
if(info.getOperateTransferCode()==null){
|
|
|
|
continue;
|
|
...
|
...
|
@@ -675,7 +675,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { |
|
|
|
}
|
|
|
|
MiniFaultConfirm miniFaultConfirm=new MiniFaultConfirm();
|
|
|
|
miniFaultConfirm.setShowBtn(showBtn);
|
|
|
|
miniFaultConfirm.setActor(TabType.BUY==actor?TabType.BUY.getValue():TabType.SELL.getValue());
|
|
|
|
miniFaultConfirm.setCreateTime(qualityCheck.getCreateTime());
|
|
|
|
int leftTime = 0;
|
|
|
|
int expireTime = qualityCheck.getCreateTime() + 24 * 60 * 60 ;
|
|
|
|
int nowTs = DateUtil.getCurrentTimeSecond();
|
|
|
|
if(expireTime> nowTs){
|
|
|
|
leftTime = expireTime - nowTs;
|
|
|
|
}
|
|
|
|
miniFaultConfirm.setLeftTime(leftTime);
|
|
|
|
miniFaultConfirm.setText(qualityCheck.getCheckText());
|
|
|
|
miniFaultConfirm.setImageUrls(StringUtils.isEmpty(qualityCheck.getImageUrl())?new ArrayList<>():Arrays.asList(qualityCheck.getImageUrl().split(",")));
|
|
|
|
expressInfoDetail.setMiniFaultConfirm(miniFaultConfirm);
|
...
|
...
|
|
