限时放漏

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

@@ -248,6 +248,10 @@ public class ExchangeServiceImpl implements ExchangeService {
             if (orderNum > 0) {
                 return Result.failed("可直接换的商品每人限换一单");
             }
+            //限换一件
+            if (dto.getExchangeItemNum() != null && dto.getExchangeItemNum() > 1) {
+                return Result.failed("可直接换的商品每人只能换一件");
+            }
 
             if (dto.getIsMultiple()) {
                 //多商品场景在受理方订单中出现，别人用多件商品换受理方的一件商品，对于受理方而言等于是一个订单买了多件商品，
@@ -265,7 +269,6 @@ public class ExchangeServiceImpl implements ExchangeService {
                     logger.info("商品id:{}, 库存不足", exchangeItemId);
                     return Result.failed("库存不足");
                 }
-
             }
             List<ItemSimpleDto> itemSimpleDtoList = dto.getItemList();
             //查询用户藏品的价值

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

@@ -390,9 +390,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
         try {
             Map<String, Object> map = new HashMap<>();
             SupplierItemRequestDto searchDto = new SupplierItemRequestDto();
-            searchDto.setType(DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode());
-            searchDto.setIsDeleted(false);
-            searchDto.setIsOnSale(true);
+            searchDto.setIds(Arrays.asList(328960426L, 328960421L, 328960422L, 328960423L, 328960424L, 328959739L,
+                    328960425L, 328960419L, 328960418L, 328960417L, 328960416L, 328960415L, 328960414L, 328960413L));
             List<SupplierItem> supplierItemList = supplierItemDao.findList(searchDto);
             PageInfo pageInfo = new PageInfo(supplierItemList);
             List<SupplierItemVo> supplierItemVoList = new ArrayList<>();
@@ -409,7 +408,6 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 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);