时间修改以及图片补充

bid/src/main/java/cn/hobbystocks/auc/web/DepositOrderController.java

@@ -102,6 +102,7 @@ public class DepositOrderController {
         depositOrderLambdaQueryWrapper.eq(DepositOrder::getOrderNo, depositOrderNo);
         depositOrderLambdaQueryWrapper.eq(DepositOrder::getUserId, userId);
         DepositOrder depositOrder = orderService.getOne(depositOrderLambdaQueryWrapper);
+        fillDepositOrderImg(depositOrder);
         return AjaxResult.success(depositOrder);
     }
 

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

@@ -930,10 +930,12 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
         BigDecimal startPrice = Objects.isNull(rule) ? null : rule.getStartPrice();
         BigDecimal markupAmount = Objects.isNull(rule) ? null : rule.getDefaultOnceAddPrice();
         Long depositAmount = lot.getDeposit();
+        BigDecimal serviceTariff = lot.getServiceTariff();;
         String depositType = "LOT";
         if (Objects.isNull(depositAmount)) {
             depositAmount = auction.getDeposit();
             depositType = "AUCTION";
+            serviceTariff = auction.getServiceTariff();
         }
         LotDetailResponse response = new LotDetailResponse();
         response.setLotId(lot.getId());
@@ -946,18 +948,15 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
         response.setImgs(lot.getImgs());
         response.setCarouselImgs(lot.getCarouselImgs());
         response.setStatus(lot.getStatus());
-        Date startTime = toBeijingTime(lot.getStartTime());
-        Date endTime = toBeijingTime(lot.getEndTime());
-        Date realEndTime = toBeijingTime(lot.getRealEndTime());
-        response.setStartTime(startTime);
-        response.setEndTime(endTime);
-        response.setRealEndTime(realEndTime);
+        response.setStartTime(lot.getStartTime());
+        response.setEndTime(lot.getEndTime());
+        response.setRealEndTime(lot.getRealEndTime());
         response.setStartPrice(startPrice);
         response.setCurrentPrice(Objects.nonNull(lot.getLastPrice()) ? lot.getLastPrice() : startPrice);
         response.setBidCount(lot.getBidCount());
         response.setDepositAmount(depositAmount);
         response.setDepositType(depositType);
-        response.setServiceTariff(lot.getServiceTariff());
+        response.setServiceTariff(serviceTariff);
         response.setRuleType(lot.getRuleType());
         response.setMarkupAmount(markupAmount);
         response.setDetail(lot.getDetail());
@@ -965,19 +964,19 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
         response.setIsFans(Boolean.FALSE);
         response.setHasDeposit(Boolean.FALSE);
         response.setPayTimeLimit(lot.getPayTimeLimit());
-        if (Objects.equals("Waiting", lot.getStatus()) && Objects.nonNull(startTime)) {
-            response.setTimestamp(startTime.getTime() - System.currentTimeMillis());
-        } else if (Objects.equals("Bidding", lot.getStatus()) && Objects.nonNull(endTime)) {
-            response.setTimestamp(endTime.getTime() - System.currentTimeMillis());
+        if (Objects.equals("Waiting", lot.getStatus()) && Objects.nonNull(lot.getStartTime())) {
+            response.setTimestamp(lot.getStartTime().getTime() - System.currentTimeMillis());
+        } else if (Objects.equals("Bidding", lot.getStatus()) && Objects.nonNull(lot.getEndTime())) {
+            response.setTimestamp(lot.getEndTime().getTime() - System.currentTimeMillis());
         }
         //TODO 成交用户暂时无
         fillUserFlags(lot, response, depositType);
         return response;
     }
 
-    private Date toBeijingTime(Date date) {
-        return Objects.isNull(date) ? null : DateUtils.addHours(date, 8);
-    }
+//    private Date toBeijingTime(Date date) {
+//        return Objects.isNull(date) ? null : DateUtils.addHours(date, 8);
+//    }
 
     private void fillUserFlags(Lot lot, LotDetailResponse response, String depositType) {
         UserInfo userInfo = UserUtils.getSimpleUserInfo();