提交

admin-hanhai-vue/src/views/CityJd/CityJdList.vue

@@ -0,0 +1,204 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('景点列表')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-jd-modal ref="modalForm" @ok="modalFormOk"></city-jd-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityJdModal from './modules/CityJdModal'
+
+  export default {
+    name: 'CityJdList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityJdModal
+    },
+    data () {
+      return {
+        description: '景点列表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'景点名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'景点位置',
+            align:"center",
+            dataIndex: 'address'
+          },
+          {
+            title:'经度',
+            align:"center",
+            dataIndex: 'longitude'
+          },
+          {
+            title:'纬度',
+            align:"center",
+            dataIndex: 'latitude'
+          },
+          {
+            title:'图片',
+            align:"center",
+            dataIndex: 'images',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'主图',
+            align:"center",
+            dataIndex: 'titleImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityJd/cityJd/list",
+          delete: "/cityJd/cityJd/delete",
+          deleteBatch: "/cityJd/cityJd/deleteBatch",
+          exportXlsUrl: "/cityJd/cityJd/exportXls",
+          importExcelUrl: "cityJd/cityJd/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'景点名称',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'景点位置',dictCode:''})
+        fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
+        fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'Text',value:'images',text:'图片',dictCode:''})
+        fieldList.push({type:'Text',value:'titleImage',text:'主图',dictCode:''})
+        fieldList.push({type:'Text',value:'details',text:'介绍',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

han-hai-module-pay/src/main/resources/pay_weixin.properties

@@ -5,10 +5,10 @@
 #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify
 #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify
 
-pay.mchId=1673516176
-pay.appId=wxa4d29e67e8a58d38
-pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK
-pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify
-pay.notifyUrlDev=http://h5.xzaiyp.top/api/order/payNotify
+#pay.mchId=1673516176
+#pay.appId=wxa4d29e67e8a58d38
+#pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK
+#pay.keyPath=
+#pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify
+#pay.notifyUrlDev=
 

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/controller/CityIntgerWaterController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.cityIntgerWater.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 积分流水表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Api(tags="积分流水表")
+@RestController
+@RequestMapping("/cityIntgerWater/cityIntgerWater")
+@Slf4j
+public class CityIntgerWaterController extends JeecgController<CityIntgerWater, ICityIntgerWaterService> {
+	@Autowired
+	private ICityIntgerWaterService cityIntgerWaterService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param cityIntgerWater
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "积分流水表-分页列表查询")
+	@ApiOperation(value="积分流水表-分页列表查询", notes="积分流水表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CityIntgerWater>> queryPageList(CityIntgerWater cityIntgerWater,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CityIntgerWater> queryWrapper = QueryGenerator.initQueryWrapper(cityIntgerWater, req.getParameterMap());
+		Page<CityIntgerWater> page = new Page<CityIntgerWater>(pageNo, pageSize);
+		IPage<CityIntgerWater> pageList = cityIntgerWaterService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param cityIntgerWater
+	 * @return
+	 */
+	@AutoLog(value = "积分流水表-添加")
+	@ApiOperation(value="积分流水表-添加", notes="积分流水表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CityIntgerWater cityIntgerWater) {
+		cityIntgerWaterService.save(cityIntgerWater);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param cityIntgerWater
+	 * @return
+	 */
+	@AutoLog(value = "积分流水表-编辑")
+	@ApiOperation(value="积分流水表-编辑", notes="积分流水表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CityIntgerWater cityIntgerWater) {
+		cityIntgerWaterService.updateById(cityIntgerWater);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "积分流水表-通过id删除")
+	@ApiOperation(value="积分流水表-通过id删除", notes="积分流水表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		cityIntgerWaterService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "积分流水表-批量删除")
+	@ApiOperation(value="积分流水表-批量删除", notes="积分流水表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.cityIntgerWaterService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "积分流水表-通过id查询")
+	@ApiOperation(value="积分流水表-通过id查询", notes="积分流水表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CityIntgerWater> queryById(@RequestParam(name="id",required=true) String id) {
+		CityIntgerWater cityIntgerWater = cityIntgerWaterService.getById(id);
+		if(cityIntgerWater==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cityIntgerWater);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param cityIntgerWater
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CityIntgerWater cityIntgerWater) {
+        return super.exportXls(request, cityIntgerWater, CityIntgerWater.class, "积分流水表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CityIntgerWater.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/entity/CityIntgerWater.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.cityIntgerWater.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 积分流水表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_intger_water")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_intger_water对象", description="积分流水表")
+public class CityIntgerWater implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**积分*/
+	@Excel(name = "积分", width = 15)
+    @ApiModelProperty(value = "积分")
+    private java.math.BigDecimal intger;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
+	/**类型0获得1消耗*/
+	@Excel(name = "类型0获得1消耗", width = 15)
+    @ApiModelProperty(value = "类型0获得1消耗")
+    private java.lang.Integer type;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String title;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/CityIntgerWaterMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.cityIntgerWater.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 积分流水表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+public interface CityIntgerWaterMapper extends BaseMapper<CityIntgerWater> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/mapper/xml/CityIntgerWaterMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.cityIntgerWater.mapper.CityIntgerWaterMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/ICityIntgerWaterService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.cityIntgerWater.service;
+
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 积分流水表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+public interface ICityIntgerWaterService extends IService<CityIntgerWater> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/service/impl/CityIntgerWaterServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.cityIntgerWater.service.impl;
+
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import org.jeecg.modules.cityIntgerWater.mapper.CityIntgerWaterMapper;
+import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 积分流水表
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Service
+public class CityIntgerWaterServiceImpl extends ServiceImpl<CityIntgerWaterMapper, CityIntgerWater> implements ICityIntgerWaterService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/CityIntgerWaterList.vue

@@ -0,0 +1,189 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('积分流水表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-intger-water-modal ref="modalForm" @ok="modalFormOk"></city-intger-water-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CityIntgerWaterModal from './modules/CityIntgerWaterModal'
+
+  export default {
+    name: 'CityIntgerWaterList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CityIntgerWaterModal
+    },
+    data () {
+      return {
+        description: '积分流水表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'积分',
+            align:"center",
+            dataIndex: 'intger'
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId'
+          },
+          {
+            title:'类型0获得1消耗',
+            align:"center",
+            dataIndex: 'type'
+          },
+          {
+            title:'名称',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/cityIntgerWater/cityIntgerWater/list",
+          delete: "/cityIntgerWater/cityIntgerWater/delete",
+          deleteBatch: "/cityIntgerWater/cityIntgerWater/deleteBatch",
+          exportXlsUrl: "/cityIntgerWater/cityIntgerWater/exportXls",
+          importExcelUrl: "cityIntgerWater/cityIntgerWater/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'BigDecimal',value:'intger',text:'积分',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户',dictCode:''})
+        fieldList.push({type:'int',value:'type',text:'类型0获得1消耗',dictCode:''})
+        fieldList.push({type:'string',value:'title',text:'名称',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterForm.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="intger">
+              <a-input-number v-model="model.intger" placeholder="请输入积分" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="类型0获得1消耗" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+              <a-input-number v-model="model.type" placeholder="请输入类型0获得1消耗" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityIntgerWaterForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityIntgerWater/cityIntgerWater/add",
+          edit: "/cityIntgerWater/cityIntgerWater/edit",
+          queryById: "/cityIntgerWater/cityIntgerWater/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-intger-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-intger-water-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityIntgerWaterForm from './CityIntgerWaterForm'
+
+  export default {
+    name: 'CityIntgerWaterModal',
+    components: {
+      CityIntgerWaterForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue/modules/CityIntgerWaterModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-intger-water-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-intger-water-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityIntgerWaterForm from './CityIntgerWaterForm'
+  export default {
+    name: 'CityIntgerWaterModal',
+    components: {
+      CityIntgerWaterForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/cityIntgerWater/cityIntgerWater/list',
+  save='/cityIntgerWater/cityIntgerWater/add',
+  edit='/cityIntgerWater/cityIntgerWater/edit',
+  deleteOne = '/cityIntgerWater/cityIntgerWater/delete',
+  deleteBatch = '/cityIntgerWater/cityIntgerWater/deleteBatch',
+  importExcel = '/cityIntgerWater/cityIntgerWater/importExcel',
+  exportXls = '/cityIntgerWater/cityIntgerWater/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWater.data.ts

@@ -0,0 +1,53 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '积分',
+    align:"center",
+    dataIndex: 'intger'
+   },
+   {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId'
+   },
+   {
+    title: '类型0获得1消耗',
+    align:"center",
+    dataIndex: 'type'
+   },
+   {
+    title: '名称',
+    align:"center",
+    dataIndex: 'title'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '积分',
+    field: 'intger',
+    component: 'InputNumber',
+  },
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'Input',
+  },
+  {
+    label: '类型0获得1消耗',
+    field: 'type',
+    component: 'InputNumber',
+  },
+  {
+    label: '名称',
+    field: 'title',
+    component: 'Input',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/CityIntgerWaterList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CityIntgerWaterModal @register="registerModal" @success="handleSuccess"></CityIntgerWaterModal>
+  </div>
+</template>
+
+<script lang="ts" name="cityIntgerWater-cityIntgerWater" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CityIntgerWaterModal from './components/CityIntgerWaterModal.vue'
+  import {columns, searchFormSchema} from './cityIntgerWater.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './cityIntgerWater.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '积分流水表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"积分流水表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityIntgerWater/vue3/components/CityIntgerWaterModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../cityIntgerWater.data';
+    import {saveOrUpdate} from '../cityIntgerWater.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue/CityJdList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/CityJdList.vue

@@ -153,12 +153,6 @@
             dataIndex: 'titleImage',
             scopedSlots: {customRender: 'imgSlot'}
           },
-          {
-            title:'介绍',
-            align:"center",
-            dataIndex: 'details',
-            scopedSlots: {customRender: 'htmlSlot'}
-          },
           {
             title: '操作',
             dataIndex: 'action',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="景点名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入景点名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="景点位置" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入景点位置"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="经度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="longitude">
+              <a-input v-model="model.longitude" placeholder="请输入经度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
+              <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="images">
+              <j-image-upload isMultiple  v-model="model.images" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="主图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="titleImage">
+              <j-image-upload isMultiple  v-model="model.titleImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="介绍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="details">
+              <j-editor v-model="model.details" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CityJdForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/cityJd/cityJd/add",
+          edit: "/cityJd/cityJd/edit",
+          queryById: "/cityJd/cityJd/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-jd-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-jd-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CityJdForm from './CityJdForm'
+
+  export default {
+    name: 'CityJdModal',
+    components: {
+      CityJdForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/CityJd/modules/CityJdModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-jd-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-jd-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CityJdForm from './CityJdForm'
+  export default {
+    name: 'CityJdModal',
+    components: {
+      CityJdForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/controller/CityJdController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 景点列表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-11-24
  * @Version: V1.0
  */
 @Api(tags="景点列表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/entity/CityJd.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 景点列表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-11-24
  * @Version: V1.0
  */
 @Data

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/mapper/CityJdMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 景点列表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-11-24
  * @Version: V1.0
  */
 public interface CityJdMapper extends BaseMapper<CityJd> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/ICityJdService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 景点列表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-11-24
  * @Version: V1.0
  */
 public interface ICityJdService extends IService<CityJd> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/service/impl/CityJdServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 景点列表
  * @Author: jeecg-boot
- * @Date:   2024-10-31
+ * @Date:   2024-11-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityJd/vue3/CityJd.data.ts

@@ -36,12 +36,6 @@ export const columns: BasicColumn[] = [
     dataIndex: 'titleImage',
     customRender:render.renderAvatar,
    },
-   {
-    title: '介绍',
-    align:"center",
-    dataIndex: 'details',
-    slots: { customRender: 'htmlSlot' },
-   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/controller/CityShopController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商铺信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Api(tags="商铺信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/entity/CityShop.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商铺信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Data
@@ -103,4 +103,8 @@ public class CityShop implements Serializable {
 	@Excel(name = "纬度", width = 15)
     @ApiModelProperty(value = "纬度")
     private java.lang.String latitude;
+	/**是否营业*/
+	@Excel(name = "是否营业", width = 15)
+    @ApiModelProperty(value = "是否营业")
+    private java.lang.String isOpen;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/mapper/CityShopMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商铺信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 public interface CityShopMapper extends BaseMapper<CityShop> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/ICityShopService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商铺信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 public interface ICityShopService extends IService<CityShop> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/service/impl/CityShopServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商铺信息表
  * @Author: jeecg-boot
- * @Date:   2024-10-29
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/CityShopList.vue

@@ -220,6 +220,11 @@
             align:"center",
             dataIndex: 'latitude'
           },
+          {
+            title:'是否营业',
+            align:"center",
+            dataIndex: 'isOpen'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -269,6 +274,7 @@
         fieldList.push({type:'int',value:'isComment',text:'评论量',dictCode:''})
         fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
+        fieldList.push({type:'string',value:'isOpen',text:'是否营业',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue/modules/CityShopForm.vue

@@ -73,6 +73,11 @@
               <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否营业" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isOpen">
+              <a-input v-model="model.isOpen" placeholder="请输入是否营业"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShop/vue3/CityShop.data.ts

@@ -83,6 +83,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'latitude'
    },
+   {
+    title: '是否营业',
+    align:"center",
+    dataIndex: 'isOpen'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -177,4 +182,9 @@ export const formSchema: FormSchema[] = [
     field: 'latitude',
     component: 'Input',
   },
+  {
+    label: '是否营业',
+    field: 'isOpen',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/controller/CityShoppingController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商城表
  * @Author: jeecg-boot
- * @Date:   2024-11-08
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Api(tags="商城表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/entity/CityShopping.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商城表
  * @Author: jeecg-boot
- * @Date:   2024-11-08
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Data
@@ -99,4 +99,9 @@ public class CityShopping implements Serializable {
 	@Dict(dictTable = "city_shop", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "关联店铺")
     private java.lang.String shopId;
+	/**商品类型*/
+	@Excel(name = "商品类型", width = 15, dicCode = "class_name_no")
+	@Dict(dicCode = "class_name_no")
+    @ApiModelProperty(value = "商品类型")
+    private java.lang.Integer className;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/mapper/CityShoppingMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商城表
  * @Author: jeecg-boot
- * @Date:   2024-11-08
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 public interface CityShoppingMapper extends BaseMapper<CityShopping> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/ICityShoppingService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商城表
  * @Author: jeecg-boot
- * @Date:   2024-11-08
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 public interface ICityShoppingService extends IService<CityShopping> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/service/impl/CityShoppingServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商城表
  * @Author: jeecg-boot
- * @Date:   2024-11-08
+ * @Date:   2024-11-25
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/CityShoppingList.vue

@@ -4,6 +4,21 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品类型">
+              <j-dict-select-tag placeholder="请选择商品类型" v-model="queryParam.className" dictCode="class_name_no"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -197,6 +212,11 @@
             align:"center",
             dataIndex: 'shopId_dictText'
           },
+          {
+            title:'商品类型',
+            align:"center",
+            dataIndex: 'className_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -246,6 +266,7 @@
         fieldList.push({type:'int',value:'num',text:'库存',dictCode:''})
         fieldList.push({type:'switch',value:'isOpen',text:'是否上架'})
         fieldList.push({type:'sel_search',value:'shopId',text:'关联店铺',dictTable:"city_shop", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'int',value:'className',text:'商品类型',dictCode:'class_name_no'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue/modules/CityShoppingForm.vue

@@ -63,6 +63,11 @@
               <j-search-select-tag v-model="model.shopId" dict="city_shop,title,id"  />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="className">
+              <j-dict-select-tag type="list" v-model="model.className" dictCode="class_name_no" placeholder="请选择商品类型" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cityShopping/vue3/CityShopping.data.ts

@@ -81,9 +81,23 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'shopId_dictText'
    },
+   {
+    title: '商品类型',
+    align:"center",
+    dataIndex: 'className_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
+	{
+      label: "商品类型",
+      field: "className",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"class_name_no"
+      },
+      colProps: {span: 6},
+ 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -156,4 +170,12 @@ export const formSchema: FormSchema[] = [
        dict:"city_shop,title,id"
     },
   },
+  {
+    label: '商品类型',
+    field: 'className',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"class_name_no"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/controller/CitySignLogController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.citySignLog.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.citySignLog.entity.CitySignLog;
+import org.jeecg.modules.citySignLog.service.ICitySignLogService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 签到记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Api(tags="签到记录")
+@RestController
+@RequestMapping("/citySignLog/citySignLog")
+@Slf4j
+public class CitySignLogController extends JeecgController<CitySignLog, ICitySignLogService> {
+	@Autowired
+	private ICitySignLogService citySignLogService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param citySignLog
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "签到记录-分页列表查询")
+	@ApiOperation(value="签到记录-分页列表查询", notes="签到记录-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CitySignLog>> queryPageList(CitySignLog citySignLog,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CitySignLog> queryWrapper = QueryGenerator.initQueryWrapper(citySignLog, req.getParameterMap());
+		Page<CitySignLog> page = new Page<CitySignLog>(pageNo, pageSize);
+		IPage<CitySignLog> pageList = citySignLogService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param citySignLog
+	 * @return
+	 */
+	@AutoLog(value = "签到记录-添加")
+	@ApiOperation(value="签到记录-添加", notes="签到记录-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CitySignLog citySignLog) {
+		citySignLogService.save(citySignLog);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param citySignLog
+	 * @return
+	 */
+	@AutoLog(value = "签到记录-编辑")
+	@ApiOperation(value="签到记录-编辑", notes="签到记录-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CitySignLog citySignLog) {
+		citySignLogService.updateById(citySignLog);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "签到记录-通过id删除")
+	@ApiOperation(value="签到记录-通过id删除", notes="签到记录-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		citySignLogService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "签到记录-批量删除")
+	@ApiOperation(value="签到记录-批量删除", notes="签到记录-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.citySignLogService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "签到记录-通过id查询")
+	@ApiOperation(value="签到记录-通过id查询", notes="签到记录-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CitySignLog> queryById(@RequestParam(name="id",required=true) String id) {
+		CitySignLog citySignLog = citySignLogService.getById(id);
+		if(citySignLog==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(citySignLog);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param citySignLog
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CitySignLog citySignLog) {
+        return super.exportXls(request, citySignLog, CitySignLog.class, "签到记录");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CitySignLog.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/entity/CitySignLog.java

@@ -0,0 +1,59 @@
+package org.jeecg.modules.citySignLog.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 签到记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("city_sign_log")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="city_sign_log对象", description="签到记录")
+public class CitySignLog implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**用户*/
+	@Excel(name = "用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
+	/**获得积分*/
+	@Excel(name = "获得积分", width = 15)
+    @ApiModelProperty(value = "获得积分")
+    private java.math.BigDecimal intger;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/CitySignLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.citySignLog.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.citySignLog.entity.CitySignLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 签到记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+public interface CitySignLogMapper extends BaseMapper<CitySignLog> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/mapper/xml/CitySignLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.citySignLog.mapper.CitySignLogMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/ICitySignLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.citySignLog.service;
+
+import org.jeecg.modules.citySignLog.entity.CitySignLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 签到记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+public interface ICitySignLogService extends IService<CitySignLog> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/service/impl/CitySignLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.citySignLog.service.impl;
+
+import org.jeecg.modules.citySignLog.entity.CitySignLog;
+import org.jeecg.modules.citySignLog.mapper.CitySignLogMapper;
+import org.jeecg.modules.citySignLog.service.ICitySignLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 签到记录
+ * @Author: jeecg-boot
+ * @Date:   2024-11-25
+ * @Version: V1.0
+ */
+@Service
+public class CitySignLogServiceImpl extends ServiceImpl<CitySignLogMapper, CitySignLog> implements ICitySignLogService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/CitySignLogList.vue

@@ -0,0 +1,178 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('签到记录')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <city-sign-log-modal ref="modalForm" @ok="modalFormOk"></city-sign-log-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CitySignLogModal from './modules/CitySignLogModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CitySignLogList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CitySignLogModal
+    },
+    data () {
+      return {
+        description: '签到记录管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'获得积分',
+            align:"center",
+            dataIndex: 'intger'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/citySignLog/citySignLog/list",
+          delete: "/citySignLog/citySignLog/delete",
+          deleteBatch: "/citySignLog/citySignLog/deleteBatch",
+          exportXlsUrl: "/citySignLog/citySignLog/exportXls",
+          importExcelUrl: "citySignLog/citySignLog/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'BigDecimal',value:'intger',text:'获得积分',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="获得积分" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="intger">
+              <a-input-number v-model="model.intger" placeholder="请输入获得积分" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CitySignLogForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/citySignLog/citySignLog/add",
+          edit: "/citySignLog/citySignLog/edit",
+          queryById: "/citySignLog/citySignLog/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <city-sign-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></city-sign-log-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CitySignLogForm from './CitySignLogForm'
+
+  export default {
+    name: 'CitySignLogModal',
+    components: {
+      CitySignLogForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue/modules/CitySignLogModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <city-sign-log-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></city-sign-log-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CitySignLogForm from './CitySignLogForm'
+  export default {
+    name: 'CitySignLogModal',
+    components: {
+      CitySignLogForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/citySignLog/citySignLog/list',
+  save='/citySignLog/citySignLog/add',
+  edit='/citySignLog/citySignLog/edit',
+  deleteOne = '/citySignLog/citySignLog/delete',
+  deleteBatch = '/citySignLog/citySignLog/deleteBatch',
+  importExcel = '/citySignLog/citySignLog/importExcel',
+  exportXls = '/citySignLog/citySignLog/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLog.data.ts

@@ -0,0 +1,36 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+   {
+    title: '获得积分',
+    align:"center",
+    dataIndex: 'intger'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+  {
+    label: '获得积分',
+    field: 'intger',
+    component: 'InputNumber',
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/CitySignLogList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CitySignLogModal @register="registerModal" @success="handleSuccess"></CitySignLogModal>
+  </div>
+</template>
+
+<script lang="ts" name="citySignLog-citySignLog" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CitySignLogModal from './components/CitySignLogModal.vue'
+  import {columns, searchFormSchema} from './citySignLog.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './citySignLog.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '签到记录',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"签到记录",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/citySignLog/vue3/components/CitySignLogModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../citySignLog.data';
+    import {saveOrUpdate} from '../citySignLog.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java

@@ -10,6 +10,8 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.bean.HttpConf;
 import org.jeecg.modules.bean.LoginReq;
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.service.AppletLoginService;
@@ -18,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +42,9 @@ public class AppletLoginServiceImpl implements AppletLoginService {
     @Resource
     private IHanHaiMemberService memberService;
 
+    @Resource
+    private ICityIntgerWaterService cityIntgerWaterService;
+
     @Resource
     private RedisUtil redisUtil;
     @Resource
@@ -87,7 +93,39 @@ public class AppletLoginServiceImpl implements AppletLoginService {
             member.setHeadImage(loginReq.getHeadimgurl());
             member.setShareId(loginReq.getShareId());
             member.setVtime(new Date());
-            member.setVid(loginReq.getVid());
+//            member.setVid(loginReq.getVid());
+
+            //如果邀请者标识不为空，则设置邀请者标识
+            if (StringUtils.isNotBlank(loginReq.getShareId())) {
+                member.setShareId(loginReq.getShareId());
+
+
+
+
+                //根据邀请者标识查询邀请者用户
+                HanHaiMember hanHaiMember = memberService.lambdaQuery().eq(HanHaiMember::getId,loginReq.getShareId()).one();
+                //用户不能为空
+                if (hanHaiMember != null) {
+                    //增加流水记录
+                    CityIntgerWater cityMoneyLog = new CityIntgerWater();
+                    cityMoneyLog.setCreateTime(new Date());
+                    cityMoneyLog.setIntger(new BigDecimal(5));
+                    cityMoneyLog.setType(1);
+                    cityMoneyLog.setUserId(loginReq.getShareId());
+                    cityMoneyLog.setTitle("邀请好友");
+                    cityIntgerWaterService.save(cityMoneyLog);
+                }
+
+                //修改用户积分
+                hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(5)));
+                memberService.updateById(hanHaiMember);
+            }
+
+
+
+
+
+
             // 生成token返回给小程序端
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
             memberService.save(member);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuApiService.java

@@ -193,5 +193,21 @@ public interface YaoDuApiService {
     //删除地址信息
     Result<?> deleteAddress(String token,String addressId);
 
+    //获取今日是否签到
+    Result<?> getTodaySign(String token);
+
+    //点击签到
+    Result<?> sign(String token);
+
+    //查看积分流水
+    Result<?> getPointsFlow(String token,PageBean pageBean);
+
+    //查看签到记录
+    Result<?> getSignRecord(String token,PageBean pageBean);
+
+    //查看钱包流水
+    Result<?> getWalletFlow(String token,PageBean pageBean);
+
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java

@@ -20,4 +20,8 @@ public interface YaoDuOrderService {
 
     //商城-支付回调
     Result<?> payNotify(String requestBody);
+
+
+    //开通万能墙会员
+    Result<?> openMember(String token,Integer type);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -19,6 +19,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.api.bean.HttpClientUtil;
@@ -55,6 +56,8 @@ import org.jeecg.modules.cityHome.entity.CityHome;
 import org.jeecg.modules.cityHome.service.ICityHomeService;
 import org.jeecg.modules.cityIcon.entity.CityIcon;
 import org.jeecg.modules.cityIcon.service.ICityIconService;
+import org.jeecg.modules.cityIntgerWater.entity.CityIntgerWater;
+import org.jeecg.modules.cityIntgerWater.service.ICityIntgerWaterService;
 import org.jeecg.modules.cityJd.entity.CityJd;
 import org.jeecg.modules.cityJd.service.ICityJdService;
 import org.jeecg.modules.cityJob.entity.CityJob;
@@ -66,6 +69,8 @@ import org.jeecg.modules.cityShop.entity.CityShop;
 import org.jeecg.modules.cityShop.service.ICityShopService;
 import org.jeecg.modules.cityShopping.entity.CityShopping;
 import org.jeecg.modules.cityShopping.service.ICityShoppingService;
+import org.jeecg.modules.citySignLog.entity.CitySignLog;
+import org.jeecg.modules.citySignLog.service.ICitySignLogService;
 import org.jeecg.modules.cityTrends.entity.CityTrends;
 import org.jeecg.modules.cityTrends.service.ICityTrendsService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -82,10 +87,14 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.annotation.Resource;
 import java.io.*;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.*;
 
 @Service
@@ -156,6 +165,12 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     //获取景点信息
     @Resource
     private ICityJdService cityJdService;
+    //签到流水
+    @Resource
+    private ICitySignLogService citySignLogService;
+    //流水记录
+    @Resource
+    private ICityIntgerWaterService cityIntgerWaterService;
     @Value("${wechat.mpAppId}")
     private String appid;
     @Value("${wechat.mpAppSecret}")
@@ -261,6 +276,28 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         map.put("activityNum",cityActivityService.lambdaQuery().count());
         //景点信息数量
         map.put("jdNum",cityJdService.lambdaQuery().count());
+
+
+        //获取积分获取规则
+        CityConf integral = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "intger_user").one();
+        map.put("integralDetails",integral.getKeyDetails());
+        map.put("integral",10);
+
+        //背景
+        CityConf bg = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "bg").one();
+        map.put("bg",bg.getKeyImage());
+
+        //vip
+        CityConf vip = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "vip").one();
+        map.put("vip",vip);
+        //vip2
+        CityConf vipBig = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "vipBig").one();
+        map.put("vipBig",vipBig);
+
+
+
+        CityConf notice = cityConfService.lambdaQuery().eq(CityConf::getKeyIcon, "notice").one();
+        map.put("notice",notice.getKeyDetails());
         return Result.OK(map);
     }
 
@@ -331,8 +368,8 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             }
             newRecords.add(cityTrends);
         }
-//        //随机排序帖子列表数据，每次刷新展示的数据不同
-//        Collections.shuffle(newRecords);
+        //随机排序帖子列表数据，每次刷新展示的数据不同
+        Collections.shuffle(newRecords);
         page1.setRecords(newRecords);
 
         return Result.OK(page1);
@@ -432,7 +469,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         Page<CityShop> page = new Page<CityShop>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityShop> page1 = cityShopService
                 .lambdaQuery()
-                .orderByDesc(CityShop::getCreateTime)
+                .orderByDesc(CityShop::getSort)
                 .page(page);
         return Result.OK(page1);
     }
@@ -592,6 +629,44 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         cityTrends.setYearDate(hanHaiMember.getYearDate());
         cityTrends.setIsState(0);
         cityTrendsService.saveOrUpdate(cityTrends);
+
+
+        // 获取当前日期，时间部分设为00:00:00
+        LocalDate today = LocalDate.now();
+        LocalDateTime startOfDay = today.atStartOfDay();
+        LocalDateTime endOfDay = today.atTime(LocalTime.MAX); // 23:59:59.999999999
+
+        // 转换为Date对象，这里假设数据库和服务器在同一时区，或者已经进行了时区转换
+        Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+        Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+
+        CityIntgerWater one = cityIntgerWaterService.lambdaQuery()
+                .eq(CityIntgerWater::getUserId, hanHaiMember.getId())
+                .eq(CityIntgerWater::getTitle, "发布帖子")
+                .between(CityIntgerWater::getCreateTime, startDate, endDate)
+                .one();
+
+
+        //查询今日是否已经发布
+       if(one == null){
+           //增加流水记录
+           CityIntgerWater cityMoneyLog = new CityIntgerWater();
+           cityMoneyLog.setCreateTime(new Date());
+           cityMoneyLog.setIntger(new BigDecimal(3));
+           cityMoneyLog.setType(1);
+           cityMoneyLog.setUserId(hanHaiMember.getId());
+           cityMoneyLog.setTitle("发布帖子");
+           cityIntgerWaterService.save(cityMoneyLog);
+
+           //修改用户积分
+           hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(3)));
+           hanHaiMemberService.updateById(hanHaiMember);
+       }
+
+
+
+
         return Result.OK("编辑成功");
     }
 
@@ -747,13 +822,13 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
             trial= "develop";
         }
 
-        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
-        if(o!=null){
-
-
-            o.setName("瑶都万能墙欢迎您的加入");
-            return Result.OK(o);
-        }
+//        WxQrCodeVo o = (WxQrCodeVo)redisUtil.get("CodeImage::" + trial+ member.getId());
+//        if(o!=null){
+//
+//
+//            o.setName("瑶都万能墙欢迎您的加入");
+//            return Result.OK(o);
+//        }
 
         Map<String, Object> param = new HashMap<>();
 
@@ -845,7 +920,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
             wxCodeVo.setName("瑶都万能墙欢迎您的加入");
 
-            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
+//            redisUtil.set("CodeImage::"+trial+member.getId(),wxCodeVo);
             return Result.OK(wxCodeVo);
 
         } catch (Exception e) {
@@ -946,6 +1021,23 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         cityComment.setUserHead(hanHaiMember.getHeadImage());
         cityComment.setCreateTime(new Date());
         cityCommentService.save(cityComment);
+
+
+
+
+//        //增加流水记录
+//        CityIntgerWater cityMoneyLog = new CityIntgerWater();
+//        cityMoneyLog.setCreateTime(new Date());
+//        cityMoneyLog.setIntger(new BigDecimal(1));
+//        cityMoneyLog.setType(1);
+//        cityMoneyLog.setUserId(hanHaiMember.getId());
+//        cityMoneyLog.setTitle("评论获得积分");
+//        cityIntgerWaterService.save(cityMoneyLog);
+//
+//
+//        //修改用户积分
+//        hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(1)));
+//        hanHaiMemberService.updateById(hanHaiMember);
         return Result.OK("评论成功");
     }
 
@@ -1233,6 +1325,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
     public Result<?> getShopPingPage(PageBean pageBean){
         Page<CityShopping> page = new Page<CityShopping>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityShopping> page1 = cityShoppingService.lambdaQuery()
+                .orderByDesc(CityShopping::getCreateTime)
                 .page(page);
         //获取列表数据循环替换数据
         List<CityShopping> records = page1.getRecords();
@@ -1290,4 +1383,101 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
         cityAddressService.removeById(id);
         return Result.OK();
     }
+
+
+    //获取今日是否签到
+    @Override
+    public Result<?> getTodaySign(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        // 获取当前日期，时间部分设为00:00:00
+        LocalDate today = LocalDate.now();
+        LocalDateTime startOfDay = today.atStartOfDay();
+        LocalDateTime endOfDay = today.atTime(LocalTime.MAX); // 23:59:59.999999999
+
+// 转换为Date对象，这里假设数据库和服务器在同一时区，或者已经进行了时区转换
+        Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
+        Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+
+        CitySignLog one = citySignLogService.lambdaQuery()
+                .eq(CitySignLog::getUserId, hanHaiMember.getId())
+                .between(CitySignLog::getCreateTime, startDate, endDate)
+                .one();
+        if(one==null){
+            return Result.OK(true);
+        }
+        return Result.OK(false);
+    }
+
+    //点击签到
+    @Override
+    public Result<?> sign(String token){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //查询今日是否有签到记录
+        CitySignLog one = citySignLogService.lambdaQuery()
+                .eq(CitySignLog::getUserId, hanHaiMember.getId())
+                .eq(CitySignLog::getCreateTime, new Date())
+                .one();
+        if(one==null){
+            //增加签到记录
+            CitySignLog citySignLog = new CitySignLog();
+            citySignLog.setUserId(hanHaiMember.getId());
+            citySignLog.setCreateTime(new Date());
+            citySignLogService.save(citySignLog);
+
+            //增加流水记录
+            CityIntgerWater cityMoneyLog = new CityIntgerWater();
+            cityMoneyLog.setCreateTime(new Date());
+            cityMoneyLog.setIntger(new BigDecimal(2));
+            cityMoneyLog.setType(1);
+            cityMoneyLog.setUserId(hanHaiMember.getId());
+            cityMoneyLog.setTitle("每日签到");
+            cityIntgerWaterService.save(cityMoneyLog);
+
+
+            //修改用户积分
+            hanHaiMember.setIntegerPrice(hanHaiMember.getIntegerPrice().add(new BigDecimal(2)));
+            hanHaiMemberService.updateById(hanHaiMember);
+            return Result.OK("签到成功");
+        }
+        return Result.OK("签到成功");
+    }
+
+
+
+
+    //查看积分流水
+    @Override
+    public Result<?> getPointsFlow(String token,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CityIntgerWater> page = new Page<CityIntgerWater>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityIntgerWater> page1 = cityIntgerWaterService.lambdaQuery()
+                .eq(CityIntgerWater::getUserId, hanHaiMember.getId())
+                .orderByDesc(CityIntgerWater::getCreateTime)
+                .page(page);
+        return Result.OK(page1);
+    }
+
+    //查看签到记录
+    @Override
+    public Result<?> getSignRecord(String token,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CityIntgerWater> page = new Page<CityIntgerWater>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityIntgerWater> page1 = cityIntgerWaterService.lambdaQuery()
+                .eq(CityIntgerWater::getUserId, hanHaiMember.getId())
+                .orderByDesc(CityIntgerWater::getCreateTime)
+                .page(page);
+        return Result.OK(page1);
+    }
+
+    //查看钱包流水
+    @Override
+    public Result<?> getWalletFlow(String token,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<CityIntgerWater> page = new Page<CityIntgerWater>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<CityIntgerWater> page1 = cityIntgerWaterService.lambdaQuery()
+                .eq(CityIntgerWater::getUserId, hanHaiMember.getId())
+                .orderByDesc(CityIntgerWater::getCreateTime)
+                .page(page);
+        return Result.OK(page1);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java

@@ -53,7 +53,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
     public Result<?> createPointsOrder(String token,String shopId,Integer num,String addressId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //商品标识不能为空
-        if(StringUtils.isNotBlank(shopId)){
+        if(StringUtils.isBlank(shopId)){
             return Result.error("商品标识不能为空");
         }
         //商品数量不能为空，并且不能小于零
@@ -61,7 +61,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
             return Result.error("商品数量不能小于零");
         }
         //用户地址不能为空
-        if(StringUtils.isNotBlank(addressId)){
+        if(StringUtils.isBlank(addressId)){
             return Result.error("请选择收货地址");
         }
         //根据商品标识查询商品是否存在
@@ -102,7 +102,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         }
 
         //积分不足
-        return Result.error("积分不足");
+        return Result.OK("兑换成功");
     }
 
     //商城-立即购买商品
@@ -110,7 +110,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
     public Result<?> createOrder(String token,String shopId,Integer num,String addressId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //商品标识不能为空
-        if(StringUtils.isNotBlank(shopId)){
+        if(StringUtils.isBlank(shopId)){
             return Result.error("商品标识不能为空");
         }
         //商品数量不能为空，并且不能小于零
@@ -118,7 +118,7 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
             return Result.error("商品数量不能小于零");
         }
         //用户地址不能为空
-        if(StringUtils.isNotBlank(addressId)){
+        if(StringUtils.isBlank(addressId)){
             return Result.error("请选择收货地址");
         }
         //根据商品标识查询商品是否存在
@@ -174,6 +174,8 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<CityOrder> page = new Page<CityOrder>(bean.getPageNo(), bean.getPageSize());
         Page<CityOrder> page1 = cityOrderService.lambdaQuery()
+                .eq(CityOrder::getUserId,hanHaiMember.getId())
+                .orderByDesc(CityOrder::getCreateTime)
                 .page(page);
         return Result.OK(page1);
     }
@@ -197,4 +199,24 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
         return null;
     }
 
+
+    //开通万能墙会员
+    @Override
+    public Result<?> openMember(String token,Integer type){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //吊起微信支付
+        String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+        Object appOrder = mpWxPayService.createOrderGo(
+                "购买会员" ,
+                "127.0.0.1",
+                System.currentTimeMillis()+"",
+                i1,
+                System.currentTimeMillis()+"",
+                hanHaiMember.getAppletOpenid(),
+                "{}");
+
+        return Result.OK("支付成功",appOrder);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuApiTokenController.java

@@ -209,7 +209,56 @@ public class YaoDuApiTokenController {
 
 
 
+    //获取今日是否签到
+    @ApiOperation(value="获取今日是否签到")
+    @GetMapping("/getTodaySign")
+    public Result<?> getTodaySign(@RequestHeader("X-Access-Token") String token)
+    {
+        return yaoDuApiService.getTodaySign(token);
+    }
+    
+    //点击签到
+    @ApiOperation(value="点击签到")
+    @PostMapping("/sign")
+    public Result<?> sign(@RequestHeader("X-Access-Token") String token)
+    {
+        return yaoDuApiService.sign(token);
+    }
+
+
+    //查询会员是否过期
+    @ApiOperation(value="查询会员是否过期")
+    @GetMapping("/checkMember")
+    public Result<?> checkMember(@RequestHeader("X-Access-Token") String token)
+    {
+        return Result.OK(true);
+    }
+
 
 
+    //查看积分流水
+    @ApiOperation(value="查看积分流水")
+    @GetMapping("/getPointsFlow")
+    public Result<?> getPointsFlow(@RequestHeader("X-Access-Token") String token, PageBean pageBean)
+    {
+        return yaoDuApiService.getPointsFlow(token,pageBean);
+    }
+
+    //查看签到记录
+    @ApiOperation(value="查看签到记录")
+    @GetMapping("/getSignRecord")
+    public Result<?> getSignRecord(@RequestHeader("X-Access-Token") String token, PageBean pageBean)
+    {
+        return yaoDuApiService.getSignRecord(token,pageBean);
+    }
+
+    //查看钱包流水
+    @ApiOperation(value="查看钱包流水")
+    @GetMapping("/getWalletFlow")
+    public Result<?> getWalletFlow(@RequestHeader("X-Access-Token") String token, PageBean pageBean)
+    {
+        return yaoDuApiService.getWalletFlow(token,pageBean);
+    }
+
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java

@@ -33,7 +33,7 @@ public class YaoDuOrderController {
 
 
     //商城-立即购买商品
-    @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品")
+    @ApiOperation(value="商城-立即购买商品", notes="商城-立即购买商品")
     @PostMapping("/createOrder")
     public Result<?> createOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num,String addressId){
         return yaoDuOrderService.createOrder(token,shopId,num,addressId);
@@ -41,7 +41,7 @@ public class YaoDuOrderController {
 
     //商城-订单列表
     @ApiOperation(value="商城-订单列表", notes="商城-订单列表")
-    @PostMapping("/getOrderList")
+    @GetMapping("/getOrderList")
     public Result<?> getOrderList(@RequestHeader("X-Access-Token") String token, YaoDuOrderBean bean){
         return yaoDuOrderService.getOrderList(token,bean);
     }
@@ -61,5 +61,11 @@ public class YaoDuOrderController {
     }
 
 
+    //开通万能墙会员
+    @ApiOperation(value="开通万能墙会员", notes="开通万能墙会员")
+    @PostMapping("/openMember")
+    public Result<?> openMember(@RequestHeader("X-Access-Token") String token,Integer type){
+        return yaoDuOrderService.openMember(token,type);
+    }
 
 }

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8000
   tomcat:
     max-swallow-size: -1
   error:

jeecg-boot-module-system/src/main/resources/pay_weixin.properties

@@ -1,8 +1,6 @@
-pay.mchId=1684003236
-pay.appId=wxe337e285c449abfc
-pay.mchKey=0fdb77429ffdf206c151af76a663041c
-pay.keyPath=classpath:apiclient_cert.pem
-pay.notifyUrl=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify
-pay.notifyUrlDev=http://h5.xzaiyp.top/cheer-admin/cheer/info/notify
-
-
+pay.mchId=1673516176
+pay.appId=wxa4d29e67e8a58d38
+pay.mchKey=GVIP1008611ABCDEFGGGGJKHLOSJFLGK
+pay.keyPath=
+pay.notifyUrl=https://admin.hhlm1688.com/api/order/payNotify
+pay.notifyUrlDev=https://admin.hhlm1688.com/api/order/payNotify