上架的团购商品才展示在首页

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysGroupPurchaseServiceImpl.java

@@ -72,7 +72,7 @@ public class SysGroupPurchaseServiceImpl implements SysGroupPurchaseService {
                 groupPurchaseConfig.setItemId(newItemId);
                 groupPurchaseConfig.setCreatorId(oldItem.getCreatorId());
                 groupPurchaseConfig.setState(GroupPurchaseEnum.ItemStateEnum.NOT_START.getCode());
-                groupPurchaseConfig.setIsValid(true);
+                groupPurchaseConfig.setIsValid(false);
                 groupPurchaseConfig.setIsDeal(false);
                 groupPurchaseConfig.setTargetNum(0);
                 //不限购

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -489,6 +489,12 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                     }
                     auctionConfigDao.setValid(dto.getId());
                 }
+            } else if (oldItem.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
+                //团购商品上架，需要修改配置表中is_valid字段为1,下架则is_valid=0
+                GroupPurchaseConfig groupPurchaseConfig = new GroupPurchaseConfig();
+                groupPurchaseConfig.setItemId(oldItem.getId());
+                groupPurchaseConfig.setIsValid(dto.getIsOnSale());
+                groupPurchaseConfigDao.updateByItemId(groupPurchaseConfig);
             }
             SupplierItem supplierItem = new SupplierItem();
             supplierItem.setId(dto.getId());

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

@@ -74,6 +74,7 @@ public class GroupPurchaseConfigDaoImpl implements GroupPurchaseConfigDao {
         JdbcHelper.ifPresent(dto.getState(), criteria:: andStateEqualTo);
         JdbcHelper.ifPresent(dto.getQueryStartTime(), criteria:: andEndTimeGreaterThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getQueryEndTime(), criteria:: andEndTimeLessThanOrEqualTo);
+        JdbcHelper.ifPresent(dto.getIsValid(), criteria:: andIsValidEqualTo);
         JdbcHelper.ifPresent(dto.getIsDeal(), criteria:: andIsDealEqualTo);
         example.setOrderByClause(" create_time desc");
         PageHelper.startPage(dto.getPage(), dto.getLimit());

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

@@ -95,6 +95,7 @@ public class GroupPurchaseServiceImpl implements GroupPurchaseService {
                 }
             }
             //查询进行中的团购
+            dto.setIsValid(true);
             dto.setState(GroupPurchaseEnum.ItemStateEnum.PROCESSING.getCode());
             List<GroupPurchaseConfig> groupPurchaseConfigs = groupPurchaseConfigDao.findList(dto);
             PageInfo<GroupPurchaseConfig> pageInfo = new PageInfo<>(groupPurchaseConfigs);

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

@@ -89,7 +89,7 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2408051039336454469", "DA2408051034105047546", "DA2408051029437697434");
+        List<String> list = Arrays.asList("DA2408051714332074170");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);