交换商品后扣减库存

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/ExchangeOrderSnapshotDao.java

@@ -11,4 +11,6 @@ public interface ExchangeOrderSnapshotDao {
     boolean update(ExchangeOrderSnapshot exchangeOrderSnapshot);
 
     List<ExchangeOrderSnapshot> findByOrderId(String orderId);
+
+    List<ExchangeOrderSnapshot> findByUserId(long userId);
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/ExchangeOrderSnapshotDaoImpl.java

@@ -34,6 +34,16 @@ public class ExchangeOrderSnapshotDaoImpl implements ExchangeOrderSnapshotDao {
         ExchangeOrderSnapshotExample example = new ExchangeOrderSnapshotExample();
         ExchangeOrderSnapshotExample.Criteria criteria = example.createCriteria();
         criteria.andDistributionOrderIdEqualTo(orderId);
+        criteria.andIsValidEqualTo(true);
+        return exchangeOrderSnapshotMapper.selectByExampleWithBLOBs(example);
+    }
+
+    @Override
+    public List<ExchangeOrderSnapshot> findByUserId(long userId) {
+        ExchangeOrderSnapshotExample example = new ExchangeOrderSnapshotExample();
+        ExchangeOrderSnapshotExample.Criteria criteria = example.createCriteria();
+        criteria.andCreatorIdEqualTo(userId);
+        criteria.andIsValidEqualTo(true);
         return exchangeOrderSnapshotMapper.selectByExampleWithBLOBs(example);
     }
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -33,6 +33,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
         JdbcHelper.ifPresent(dto.getId(), criteria::andIdEqualTo);
         JdbcHelper.ifPresent(dto.getIds(), criteria::andIdIn);
+        JdbcHelper.ifPresent(dto.getFilterIds(), criteria::andIdNotIn);
         if (StringUtils.hasLength(dto.getName())) {
             criteria.andNameLike("%" + dto.getName() + "%");
         }

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

@@ -17,6 +17,7 @@ import com.wwdz.ch.wx.constant.CollectionBookConstants;
 import com.wwdz.ch.wx.entity.request.ExchangeRequestDto;
 import com.wwdz.ch.wx.entity.request.ItemSimpleDto;
 import com.wwdz.ch.wx.service.distribution.ExchangeService;
+import com.wwdz.ch.wx.service.distribution.SupplierItemService;
 import com.xxdxxs.utils.EntityMapper;
 import com.xxdxxs.utils.StringUtils;
 import org.junit.Test;
@@ -54,6 +55,9 @@ public class ExchangeServiceImpl implements ExchangeService {
     @Autowired
     ExchangeOrderSnapshotDao exchangeOrderSnapshotDao;
 
+    @Autowired
+    SupplierItemService supplierItemService;
+
     @Override
     public Result checkEnoughItem(ExchangeRequestDto dto) {
         try {
@@ -87,8 +91,9 @@ public class ExchangeServiceImpl implements ExchangeService {
             Long targetUserId = dto.getUserId();
 
             //查询用户已经交换的商品，在列表中去除
-         //   List<ExchangeOrderSnapshot> exchangeOrderSnapshotList = exchangeOrderSnapshotDao.findByOrderId();
-
+            List<ExchangeOrderSnapshot> exchangeOrderSnapshotList = exchangeOrderSnapshotDao.findByUserId(dto.getUserId());
+            List<Long> filterItemList = exchangeOrderSnapshotList.stream().map(ExchangeOrderSnapshot::getItemId).distinct().collect(Collectors.toList());
+            supplierItemRequestDto.setFilterIds(filterItemList);
 
             //标签id为空则查询所有的藏品
             if (dto.getCollectionBookId() == null) {
@@ -218,6 +223,9 @@ public class ExchangeServiceImpl implements ExchangeService {
             long exchangeItemId = dto.getExchangeItemId();
             //查询交换的商品价值
             SupplierItem supplierItem = supplierItemDao.findById(exchangeItemId);
+            if (supplierItem.getStock() < dto.getExchangeItemNum()) {
+                return Result.failed("库存不足");
+            }
             long exchangeItemPrice = supplierItem.getOfficialEstimatedPrice() * dto.getExchangeItemNum();
             List<ItemSimpleDto> itemSimpleDtoList = dto.getItemList();
             //查询用户藏品的价值
@@ -266,6 +274,9 @@ public class ExchangeServiceImpl implements ExchangeService {
                 exchangeOrderSnapshot.setUpdateTime(new Date());
                 exchangeOrderSnapshotDao.insert(exchangeOrderSnapshot);
             }
+            //减少库存
+            supplierItemService.reduceStock(exchangeItemId, dto.getExchangeItemNum());
+
             Map<String, Object> map = new HashMap<>();
             map.put("distributionOrderId", distributionOrderId);
             return Result.success(map);

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

@@ -212,6 +212,12 @@ public class SupplierItemServiceImpl implements SupplierItemService {
     public Result findItemList(SupplierItemRequestDto dto) {
         try {
             List<SupplierItemVo> supplierItemVos = new ArrayList<>();
+            if (dto.getType() != null && dto.getType() == DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()) {
+                //库存要大于0
+                dto.setStock(0);
+                //必须要有官方估价才能展示在交换列表
+                dto.setOfficialEstimatedPriceNotNull(true);
+            }
             List<SupplierItem> supplierItemList = supplierItemDao.findListForSort(dto);
             PageInfo pageInfo = new PageInfo(supplierItemList);
             for (SupplierItem supplierItem : supplierItemList) {