Authored by chenchao

fix bug

... ... @@ -390,7 +390,7 @@
<select id="selectByUidStorageStatusGBBPSList" resultMap="BaseResultMap">
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"/>
</select>
</mapper>
\ No newline at end of file
... ...
... ... @@ -118,11 +118,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
// 待付款时,剩余时间
Integer leftTime = getLeftTime(tabType,buyerOrder.getUid(), buyerOrder.getOrderCode(), orderStatus.getCode(), buyerOrder.getCreateTime());
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())){
statusDetail.setExpressShow(true);
... ...