折扣品截止日期

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -30,6 +30,7 @@ import com.wwdz.ch.wx.service.distribution.CollectionItemsRelationService;
 import com.wwdz.ch.wx.service.distribution.DistributionOrderService;
 import com.wwdz.ch.wx.service.distribution.SupplierItemService;
 import com.xxdxxs.utils.*;
+import javafx.beans.binding.ObjectExpression;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
@@ -277,6 +278,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     @Override
     public Result findDiscountList(SupplierItemRequestDto dto) {
         try {
+            Map<String, Object> map = new HashMap<>();
             SupplierItemRequestDto searchDto = new SupplierItemRequestDto();
             searchDto.setType(DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode());
             searchDto.setIsDeleted(false);
@@ -293,13 +295,26 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVoList.add(supplierItemVo);
             });
-            return Result.success(PageSearchResult.of(pageInfo, supplierItemVoList));
+            if (!CollectionUtils.isEmpty(supplierItemList)) {
+                Date startTime = supplierItemList.get(0).getCreateTime();
+                Calendar calendar = Calendar.getInstance();
+                calendar.setTime(startTime);
+                calendar.add(Calendar.DAY_OF_YEAR, 5);
+                calendar.set(Calendar.HOUR_OF_DAY,23);
+                calendar.set(Calendar.MINUTE,59);
+                calendar.set(Calendar.SECOND,59);
+                Date endTime = calendar.getTime();
+                map.put("endTime", endTime);
+            }
+            map.put("dataList", PageSearchResult.of(pageInfo, supplierItemVoList));
+            return Result.success(map);
         } catch (Exception e) {
             logger.error("查询首页促销商品列表失败 error : {}", e);
         }
         return Result.failed();
     }
 
+
     @Override
     public Result reduceStock(long itemId, int stock) {
         String itemIdKey = String.valueOf(itemId);