ufo / yohoufo-fore · Commits

Go to a project

Authored by qinchao
Commit d4eb4654d3e43cd0b9872617b084c3cf523f680d 1 parent b7c91639

物流

Inline Side-by-side
Showing 1 changed file with 9 additions and 1 deletions
@@ -512,7 +512,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -512,7 +512,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
512 if(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(expressType)){ 512 if(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().equals(expressType)){
513 LOGGER.info("getExpressInfoListByStage out because of expressType is judge center ,orderCode = {} ,expressType = {} ",orderCode,expressType); 513 LOGGER.info("getExpressInfoListByStage out because of expressType is judge center ,orderCode = {} ,expressType = {} ",orderCode,expressType);
514 List<ExpressInfo> ls = expressInfoMapper.selectByOrderCodeAndExpressType(orderCode,expressType); 514 List<ExpressInfo> ls = expressInfoMapper.selectByOrderCodeAndExpressType(orderCode,expressType);
515 - if(actor!=null&&CollectionUtils.isNotEmpty(ls)){ 515 + if(CollectionUtils.isNotEmpty(ls)){
516 for(ExpressInfo info:ls){ 516 for(ExpressInfo info:ls){
517 if(info.getOperateTransferCode()==null){ 517 if(info.getOperateTransferCode()==null){
518 continue; 518 continue;
@@ -675,7 +675,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -675,7 +675,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
675 } 675 }
676 MiniFaultConfirm miniFaultConfirm=new MiniFaultConfirm(); 676 MiniFaultConfirm miniFaultConfirm=new MiniFaultConfirm();
677 miniFaultConfirm.setShowBtn(showBtn); 677 miniFaultConfirm.setShowBtn(showBtn);
  678 + miniFaultConfirm.setActor(TabType.BUY==actor?TabType.BUY.getValue():TabType.SELL.getValue());
678 miniFaultConfirm.setCreateTime(qualityCheck.getCreateTime()); 679 miniFaultConfirm.setCreateTime(qualityCheck.getCreateTime());
  680 + int leftTime = 0;
  681 + int expireTime = qualityCheck.getCreateTime() + 24 * 60 * 60 ;
  682 + int nowTs = DateUtil.getCurrentTimeSecond();
  683 + if(expireTime> nowTs){
  684 + leftTime = expireTime - nowTs;
  685 + }
  686 + miniFaultConfirm.setLeftTime(leftTime);
679 miniFaultConfirm.setText(qualityCheck.getCheckText()); 687 miniFaultConfirm.setText(qualityCheck.getCheckText());
680 miniFaultConfirm.setImageUrls(StringUtils.isEmpty(qualityCheck.getImageUrl())?new ArrayList<>():Arrays.asList(qualityCheck.getImageUrl().split(","))); 688 miniFaultConfirm.setImageUrls(StringUtils.isEmpty(qualityCheck.getImageUrl())?new ArrayList<>():Arrays.asList(qualityCheck.getImageUrl().split(",")));
681 expressInfoDetail.setMiniFaultConfirm(miniFaultConfirm); 689 expressInfoDetail.setMiniFaultConfirm(miniFaultConfirm);