1

luofl

2025-04-11 7a35a18730520836b4a1a40cbdaf9e6c45959946

1

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java

@@ -171,6 +171,12 @@
    private Long current;
    @TableField(exist = false)
    private Long size;

    /**
     * 已购数量
     */
    @TableField(exist = false)
    private Integer buyCount;
    /**
     * 惠民卡状态：1未开始 2已开始 3已结束
     */

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java

@@ -207,6 +207,8 @@
        Page<TSite> sitePage = tSiteService.page(page,
                new LambdaQueryWrapper<TSite>()
                        .eq(!StringUtils.isEmpty(query.getProvinceCode()), TSite::getProvinceCode, query.getProvinceCode())
                        .ne(TSite::getState,3)
                        .eq(TSite::getSign,0)
                        .eq(!StringUtils.isEmpty(query.getCityCode()), TSite::getCityCode, query.getCityCode())
                        .in(!storeIds.isEmpty(), TSite::getStoreId, storeIds));


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html

@@ -509,7 +509,7 @@
                    :page-sizes="[10, 50, 100, 200]"
                    :page-size="pageSiteSize"
                    layout="total, sizes, prev, pager, next, jumper"
                    :total="siteTotal">
                    :total="tableSiteTotal">
            </el-pagination>

            <span slot="footer" class="dialog-footer">