Merge branch 'test6.8.3' into gray

@@ -390,7 +390,7 @@
 
 
   <select id="selectByUidStorageStatusGBBPSList" resultMap="BaseResultMap">
   <select id="selectByUidStorageStatusGBBPSList" resultMap="BaseResultMap">
     select <include refid="Base_Column_List" /> from seller_order_goods
     select <include refid="Base_Column_List" /> from seller_order_goods
-    where storage_id = #{storageId,jdbcType=INTEGER},
+    where storage_id = #{storageId,jdbcType=INTEGER}
     and <include refid="sql_where_4_select_UidStatusGBBNList"/>
     and <include refid="sql_where_4_select_UidStatusGBBNList"/>
   </select>
   </select>
 </mapper>
 </mapper>

@@ -118,11 +118,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
         // 待付款时，剩余时间
         // 待付款时，剩余时间
         Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
         Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
         statusDetail.setLeftTime(leftTime);
         statusDetail.setLeftTime(leftTime);
-        boolean isShowWaitingTime = OrderStatus.WAITING_RECEIVE.getCode() == orderStatus.getCode();
-        if(isShowWaitingTime){
-            int leftSeconds = BuyerConfirmHandler.DELAY_MINUTES_7_DAYS*60 - (DateUtil.getCurrentTimeSecond()-buyerOrder.getUpdateTime());
-            statusDetail.setDetailDesc(OrderDetailDescHelper.buildLeftTimeDesc(leftSeconds));
-        }
+        
 
 
         if(ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){
         if(ActionStatusHold.getBuyerShowExpressStatusList().contains(orderStatus.getCode())){
             statusDetail.setExpressShow(true);
             statusDetail.setExpressShow(true);