Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

Merge remote-tracking branch 'origin/2.0' into 2.0

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java

@@ -84,7 +84,7 @@
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if (null != map) {
                String out_trade_no = map.get("out_trade_no");
                String transaction_id = map.get("transaction_id");
                String transaction_id = map.get("trade_no");
                TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>().eq(TPayHuimin::getCode, out_trade_no));
                if (one!=null){
                    if (one.getStatus()==2){

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -132,7 +132,6 @@
                case 2:
                    // 年内卡
                    Date date1 = new Date();

                    date1.setMonth(11);
                    date1.setDate(31);
                    date1.setHours(23);
@@ -167,6 +166,7 @@
        }
        return ResultUtil.success();
    }


    /**
     * 查看惠民卡详情
@@ -435,6 +435,15 @@
            return ResultUtil.success(new ArrayList<>());
        }
    }

    public static void main(String[] args) {
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        LocalDateTime localDateTime = LocalDateTime.now().plusDays(365);
        // 将LocalDateTime转换为Date类型
        Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
        String format = simpleDateFormat.format(date);
        System.err.println(format);
    }
    /**
     * 个人中心-我的惠民卡-查看详情
     */

 cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml

@@ -7,7 +7,8 @@
        select t1.* from t_huimin_card t1
        where
            find_in_set(#{storeId},t1.storeIds)

        and t1.startTime &lt;= now()
        and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc
@@ -18,7 +19,8 @@
        select t1.* from t_huimin_card t1
        where
            find_in_set(#{storeId},t1.storeIds)

          and t1.startTime &lt;= now()
          and t1.endTime >= now()

        and t1.status = 1
            order by t1.sort desc

 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">