下架拍品逻辑修改

auc/src/main/java/cn/hobbystocks/auc/web/LotController.java

@@ -163,6 +163,8 @@ public class LotController extends AdminBaseController {
 		Lot dbLot = lotService.selectLotById(lot.getId());
 		if (Objects.equals(Constants.PUB_STATUS_NO_PUBLISHED, dbLot.getPubStatus()))
 			return AjaxResult.error("拍品未发布不能撤回");
+		if(!Objects.equals(dbLot.getStatus(),Constants.LOT_STATUS_WAITING))
+		    return AjaxResult.error("拍品已开始竞价，下架失败");
 		dbLot.setUpdateBy(getUsername());
 		lotService.cancelLot(dbLot);
 		return AjaxResult.success();

lot/src/main/java/cn/hobbystocks/auc/service/impl/OrderServiceImpl.java

@@ -48,6 +48,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper,Order> implements
             serviceTariff=auction.getServiceTariff();
         }
         if (payTimeLimit==null)
+            //中拍支付时限（小时）
             payTimeLimit=auction.getPayTimeLimit();
         //计算服务费
         long amount = order.getAmount();
@@ -56,7 +57,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper,Order> implements
         BigDecimal serviceExpense = serviceTariff.divide(BigDecimal.valueOf(100)).multiply(bigAmount);
         order.setServiceExpense(serviceExpense);
         //根据支付时限计算订单过期时间，
-        Date date = DateUtils.addDays(new Date(), payTimeLimit);
+        Date date = DateUtils.addHours(new Date(), payTimeLimit);
         order.setExpireTime(date);
         save(order);