Merge branch 'test6.8.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.5

@@ -122,6 +122,7 @@ public class OrderCacheService {
             String uncompressHashValue = SnappyZipUtils.uncompress(hashVal);
 
             if (StringUtils.isNotEmpty(uncompressHashValue)) {
+                logger.info("in order list req {}, uncompressHashValue {}", req, uncompressHashValue);
                 return JSON.parseObject(uncompressHashValue, OrderListVo.class);
             } else {
                 return null;
@@ -157,6 +158,8 @@ public class OrderCacheService {
         logger.info("hit OrderDetail cache ,uid {} orderCode {} actor {}", uid, orderCode, actor);
         RedisKeyBuilder kb = CacheKeyBuilder.orderDetailKey(uid, actor.getValue(), orderCode);
         OrderDetailInfo orderDetailInfo = cacheClient.get(kb.getKey(), OrderDetailInfo.class);
+        logger.info("hit OrderDetail cache ,uid {} orderCode {} actor {} orderDetailInfo {}",
+                uid, orderCode, actor, orderDetailInfo);
         return orderDetailInfo;
     }
 

@@ -739,6 +739,13 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                     QualityCheck qualityCheck = expressInfo.getQualityCheck();
                     boolean showBtn=false;
                     int leftTime = 0;
+                    //倒计时
+                    int expireTime = qualityCheck.getCreateTime() + 24 * 60 * 60 ;
+                    int nowTs = DateUtil.getCurrentTimeSecond();
+                    if(expireTime> nowTs){
+                        leftTime = expireTime - nowTs;
+                    }
+
                     MiniFaultConfirm miniFaultConfirm=new MiniFaultConfirm();
                     //质检不通过，只有卖家显示
                     if(qualityCheck.getType()!=null&&EnumQualityCheckType.CHECK_NOT_PASS.getCode().intValue()==qualityCheck.getType().intValue()){
@@ -761,15 +768,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                     //瑕疵待确认
                     if(qualityCheck.getStatus()!=null&&EnumQualityCheckStatus.WAIT_CONFIRM.getCode().intValue()==qualityCheck.getStatus().intValue()){
                         if(TabType.BUY==actor){
-                            showBtn=true;
-
-                            //显示按钮的情况下，才有倒计时
-                            int expireTime = qualityCheck.getCreateTime() + 24 * 60 * 60 ;
-                            int nowTs = DateUtil.getCurrentTimeSecond();
-                            if(expireTime> nowTs){
-                                leftTime = expireTime - nowTs;
+                            //倒计时大于零，才有按钮
+                            if(leftTime>0){
+                                showBtn=true;
                             }
-
                             //
                             miniFaultConfirm.setSuppleText("");//后续由app添加倒计时
                         }