商品列表

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

@@ -36,6 +36,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         if (StringUtils.hasLength(dto.getName())) {
             criteria.andNameLike("%" + dto.getName() + "%");
         }
+        JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
         JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
         JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);

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

@@ -237,6 +237,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             searchDto.setIsOnSale(true);
             searchDto.setIsDeleted(false);
             searchDto.setIds(itemIds);
+            searchDto.setType(dto.getType());
             searchDto.setStock(0);//库存大于0
             searchDto.setPage(dto.getPage());
             searchDto.setLimit(dto.getLimit());

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -68,13 +68,13 @@ public class WxPayServiceTest {
         dto.setDistributionOrderId("DA2403041819516253740");
         wxPayServiceApi.closeOrder(dto);
         String prepayId = "wx04182022129559e96e5ef8653e13590000";*/
-        String orderId = "DA2403041819516253740";
+        String orderId = "DA2403051050136831424";
         DistributionOrderRequestDto dto2 = new DistributionOrderRequestDto();
         dto2.setDistributionOrderId(orderId);
         Result result = wxPayServiceApi.queryOrderBytOutTradeNo(dto2);
         logger.info("查询支付状态:{}", result);
 
-        String distributionOrderId = "DA2403041819516253740";
+        String distributionOrderId = "DA2403051050136831424";
         DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById("8991620b-5ae3-408c-b43f-5a76241ea208");
         SupplierItem supplierItem = supplierItemDao.findById(distributorShareRecord.getItemId());
         DistributionOrderRequestDto prePayDto = new DistributionOrderRequestDto();