Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

2025-04-03 02b3d183f55ed5366421fe4104b93d021da86ee9

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

# Conflicts:
#	cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_detail.html

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

@@ -92,6 +92,7 @@

    @PostMapping("/updateById")
    public R<?> updateById(@RequestBody THuiminCard tHuiminCard) {
        String unUseTimes = tHuiminCard.getUnUseTimes();
        tHuiminCardService.updateById(tHuiminCard);
        return R.ok("");
    }

 cloud-server-communityWorldCup/src/main/resources/sharding-jdbc.properties

@@ -14,9 +14,9 @@
datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_community_world_cup?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=123456
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5

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

@@ -118,8 +118,8 @@
//    /**
//     *不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
//     */
//    @TableField("unUseTimes")
//    private String unUseTimes;
    @TableField("unUseTimes")
    private String unUseTimes;


    /**

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/a.json

New file
@@ -0,0 +1,105 @@
{
  "banner": "https://we-park-life.oss-cn-beijing.aliyuncs.com/img/11c35a59f3d542779c4c73f859fdc8ca.jfif,https://we-park-life.oss-cn-beijing.aliyuncs.com/img/3bb99d4259464cb2abeb5c622e044664.jfif,https://we-park-life.oss-cn-beijing.aliyuncs.com/img/909740c743044518a859b86851051364.jfif",
  "buyCover": "https://we-park-life.oss-cn-beijing.aliyuncs.com/img/1e78721acbdf4cbb91d559e371cf79fe.jfif",
  "buyRemark": "12512",
  "endTime": 1747152000000,
  "endTimeStr": "2025-05-14 00:00:00",
  "grantCount": 152125,
  "huiMinName": "2151",
  "huiMinType": "1",
  "id": 13,
  "introduce": "<p>12512</p>",
  "limitCount": 1251,
  "salesMoney": 125.0000,
  "sort": "12",
  "startTime": 1743566400000,
  "startTimeStr": "2025-04-02 12:00:00",
  "status": 1,
  "unBuyCover": "https://we-park-life.oss-cn-beijing.aliyuncs.com/img/a56dc495d479480a8cedef08d5259311.jfif",
  "unBuyRemark": "125125",
  "unUseTimes": "",
  "useIds": "9948,9947,9942,9941,9919,9920,2010,1001,2024",
  "useScope": "1",
  "useTimes": "",
  "useWeeks": "[{"
  days
  ":[{"
  value
  ":"
  1
  ","
  label
  ":"
  星期一
  ","
  checked
  ":true},{"
  value
  ":"
  2
  ","
  label
  ":"
  星期二
  ","
  checked
  ":true},{"
  value
  ":"
  3
  ","
  label
  ":"
  星期三
  ","
  checked
  ":true},{"
  value
  ":"
  4
  ","
  label
  ":"
  星期四
  ","
  checked
  ":false},{"
  value
  ":"
  5
  ","
  label
  ":"
  星期五
  ","
  checked
  ":false},{"
  value
  ":"
  6
  ","
  label
  ":"
  星期六
  ","
  checked
  ":false},{"
  value
  ":"
  7
  ","
  label
  ":"
  星期日
  ","
  checked
  ":false}],"
  startTime
  ":"
  01: 00
  ","
  endTime
  ":"
  04: 00
  "}]"
}

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

@@ -91,17 +91,17 @@
                    <el-table-column prop="sort" label="排序"></el-table-column>
                    <el-table-column prop="flag" label="活动状态" >
                        <template slot-scope="scope">
                            <span v-if="scope.row.flag === '1'">未开始</span>
                            <span v-else-if="scope.row.flag === '2'">已开始</span>
                            <span v-else-if="scope.row.flag === '3'">已结束</span>
                            <span v-if="scope.row.flag === 1">未开始</span>
                            <span v-else-if="scope.row.flag === 2">已开始</span>
                            <span v-else-if="scope.row.flag === 3">已结束</span>
                            <span v-else>未知类型</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="status" label="可售状态">
                        <template slot-scope="scope">
                            <span v-if="scope.row.status === '1'">已上架</span>
                            <span v-else-if="scope.row.status === '2'">已下架</span>
                            <span v-else-if="scope.row.status === '3'">已删除</span>
                            <span v-if="scope.row.status === 1">已上架</span>
                            <span v-else-if="scope.row.status === 2">已下架</span>
                            <span v-else-if="scope.row.status === 3">已删除</span>
                            <span v-else>未知类型</span>
                        </template>
                    </el-table-column>

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

@@ -203,7 +203,7 @@
        <!-- 不可用时间 -->
        <el-form-item label="不可用时间" prop="unUseTimes">
            <el-button type="text" v-on:click="addUnUseTime()">添加</el-button>
            <div v-for="(item, dayIndex) in huiminCard.unUseTimes"
            <div v-for="(item, dayIndex) in unUseTimes"
                 :key="dayIndex"
                 class="date-picker-item mb-2">
                <el-date-picker
@@ -647,6 +647,9 @@
                introduces: null,
                multipleSelection1: [],
                multipleSelection2: [],
                unUseTimes: [
                    {}
                ],
                huiminCard: {
                    id: null,
                    huiMinName: null,
@@ -663,9 +666,6 @@
                    useWeeks: null,
                    useTimes: null,
                    introduce: null,
                    unUseTimes: [
                        {}
                    ],
                    useScope: '1',
                    useIds: null,
                    sort: null,
@@ -853,10 +853,10 @@
                console.log(this.weeks)
            },
            addUnUseTime() {
                this.huiminCard.unUseTimes.push({});
                this.unUseTimes.push({});
            },
            removeUnUseTime(index) {
                this.huiminCard.unUseTimes.splice(index, 1);
                this.unUseTimes.splice(index, 1);
            },
            storeList() {
                this.tableStoreLoading = true;
@@ -963,8 +963,10 @@
                            data.startTime = this.periodOfValidity[0];
                            data.endTime = this.periodOfValidity[1];
                        }
                        console.log(data.startTime)
                        console.log(data.endTime)

                        if (this.unUseTimes){
                            data.unUseTimes = JSON.stringify(this.unUseTimes)
                        }

                        let vm = this;
                        let ajax = new $ax(Feng.ctxPath + "/tHuiminCard/add",

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

@@ -206,8 +206,8 @@

        <!-- 不可用时间 -->
        <el-form-item label="不可用时间" prop="unUseTimes">
            <el-button type="text" v-on:click="addUnUseTime()">添加2</el-button>
            <div v-for="(item, dayIndex) in huiminCard.unUseTimes"
            <el-button type="text" v-on:click="addUnUseTime()">添加</el-button>
            <div v-for="(item, dayIndex) in unUseTimes"
                 :key="dayIndex"
                 class="date-picker-item mb-2">
                <el-date-picker
@@ -663,6 +663,9 @@
                introduces: null,
                multipleSelection1: [],
                multipleSelection2: [],
                unUseTimes: [
                    {}
                ],
                huiminCard: {
                    id: null,
                    huiMinName: null,
@@ -679,9 +682,6 @@
                    useWeeks: null,
                    useTimes: null,
                    introduce: null,
                    unUseTimes: [
                        {}
                    ],
                    useScope: '1',
                    useIds: null,
                    sort: null,
@@ -869,10 +869,10 @@
                console.log(this.weeks)
            },
            addUnUseTime() {
                this.huiminCard.unUseTimes.push({date:null});
                this.unUseTimes.push({});
            },
            removeUnUseTime(index) {
                this.huiminCard.unUseTimes.splice(index, 1);
                this.unUseTimes.splice(index, 1);
            },
            storeList() {
                this.tableStoreLoading = true;
@@ -973,6 +973,9 @@
                        let data = this.huiminCard;
                        let weeks = this.weeks;
                        data.useWeeks = JSON.stringify(weeks)
                        if (this.unUseTimes){
                            data.unUseTimes = JSON.stringify(this.unUseTimes)
                        }
                        data.introduce = UE.getEditor('editor_1').getContent();
                        //data
                        if (this.periodOfValidity) {
@@ -1022,6 +1025,7 @@

                        this.huiminCard = {
                            ...data,
                            unUseTimes: data.unUseTimes == null? {}: JSON.parse(data.unUseTimes),
                            huiMinType: Number(data.huiMinType),
                            startTime: data.startTimeStr,
                            endTime: data.endTimeStr,