1、合伙人模块

2、勋章模块

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java

@@ -37,12 +37,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 用户表
+ * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
-@Api(tags="用户表")
+@Api(tags="han_hai_member")
 @RestController
 @RequestMapping("/hanHaiMember/hanHaiMember")
 @Slf4j
@@ -59,8 +59,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "用户表-分页列表查询")
-	@ApiOperation(value="用户表-分页列表查询", notes="用户表-分页列表查询")
+	//@AutoLog(value = "han_hai_member-分页列表查询")
+	@ApiOperation(value="han_hai_member-分页列表查询", notes="han_hai_member-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<HanHaiMember>> queryPageList(HanHaiMember hanHaiMember,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "用户表-添加")
-	@ApiOperation(value="用户表-添加", notes="用户表-添加")
+	@AutoLog(value = "han_hai_member-添加")
+	@ApiOperation(value="han_hai_member-添加", notes="han_hai_member-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.save(hanHaiMember);
@@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param hanHaiMember
 	 * @return
 	 */
-	@AutoLog(value = "用户表-编辑")
-	@ApiOperation(value="用户表-编辑", notes="用户表-编辑")
+	@AutoLog(value = "han_hai_member-编辑")
+	@ApiOperation(value="han_hai_member-编辑", notes="han_hai_member-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody HanHaiMember hanHaiMember) {
 		hanHaiMemberService.updateById(hanHaiMember);
@@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "用户表-通过id删除")
-	@ApiOperation(value="用户表-通过id删除", notes="用户表-通过id删除")
+	@AutoLog(value = "han_hai_member-通过id删除")
+	@ApiOperation(value="han_hai_member-通过id删除", notes="han_hai_member-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		hanHaiMemberService.removeById(id);
@@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "用户表-批量删除")
-	@ApiOperation(value="用户表-批量删除", notes="用户表-批量删除")
+	@AutoLog(value = "han_hai_member-批量删除")
+	@ApiOperation(value="han_hai_member-批量删除", notes="han_hai_member-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(",")));
@@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "用户表-通过id查询")
-	@ApiOperation(value="用户表-通过id查询", notes="用户表-通过id查询")
+	//@AutoLog(value = "han_hai_member-通过id查询")
+	@ApiOperation(value="han_hai_member-通过id查询", notes="han_hai_member-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<HanHaiMember> queryById(@RequestParam(name="id",required=true) String id) {
 		HanHaiMember hanHaiMember = hanHaiMemberService.getById(id);
@@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController<HanHaiMember, IHanHa
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, HanHaiMember hanHaiMember) {
-        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "用户表");
+        return super.exportXls(request, hanHaiMember, HanHaiMember.class, "han_hai_member");
     }
 
     /**

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -18,16 +18,16 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * @Description: 用户表
+ * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Data
 @TableName("han_hai_member")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="han_hai_member对象", description="用户表")
+@ApiModel(value="han_hai_member对象", description="han_hai_member")
 public class HanHaiMember implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -39,12 +39,16 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
 	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     private java.lang.String updateBy;
 	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 	/**所属部门*/
@@ -155,14 +159,13 @@ public class HanHaiMember implements Serializable {
     @ApiModelProperty(value = "shareId")
     private java.lang.String shareId;
 	/**邀请人*/
-	@Excel(name = "邀请人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Excel(name = "邀请人", width = 15)
     @ApiModelProperty(value = "邀请人")
     private java.lang.String vid;
 	/**邀请时间*/
-	@Excel(name = "邀请时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "邀请时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "邀请时间")
     private java.util.Date vtime;
 	/**兼兼街会员*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java

@@ -7,9 +7,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
- * @Description: 用户表
+ * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java

@@ -4,9 +4,9 @@ import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
- * @Description: 用户表
+ * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface IHanHaiMemberService extends IService<HanHaiMember> {

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

@@ -8,9 +8,9 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 用户表
+ * @Description: han_hai_member
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue

@@ -4,26 +4,6 @@
     <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="昵称">
-              <a-input placeholder="请输入昵称" v-model="queryParam.nickName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="邀请人">
-              <j-search-select-tag placeholder="请选择邀请人" v-model="queryParam.vid" dict="han_hai_member,nick_name,id"/>
-            </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>
@@ -32,7 +12,7 @@
     <!-- 操作按钮区域 -->
     <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-button type="primary" icon="download" @click="handleExportXls('han_hai_member')">导出</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>
@@ -119,7 +99,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import HanHaiMemberModal from './modules/HanHaiMemberModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'HanHaiMemberList',
@@ -129,7 +108,7 @@
     },
     data () {
       return {
-        description: '用户表管理页面',
+        description: 'han_hai_member管理页面',
         // 表头
         columns: [
           {
@@ -142,12 +121,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'创建日期',
-            align:"center",
-            sorter: true,
-            dataIndex: 'createTime'
-          },
           {
             title:'昵称',
             align:"center",
@@ -162,34 +135,25 @@
           {
             title:'手机号码',
             align:"center",
-            sorter: true,
             dataIndex: 'phone'
           },
-          {
-            title:'公众号openid',
-            align:"center",
-            dataIndex: 'officialOpenid'
-          },
           {
             title:'邀请人',
             align:"center",
-            dataIndex: 'vid_dictText'
+            dataIndex: 'vid'
           },
           {
             title:'邀请时间',
             align:"center",
-            dataIndex: 'vtime'
-          },
-          {
-            title:'性别',
-            align:"center",
-            dataIndex: 'sex'
+            dataIndex: 'vtime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
-            title:'是否分销商',
+            title:'余额',
             align:"center",
-            dataIndex: 'isDai',
-            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isDai'], text) : ''),
+            dataIndex: 'price'
           },
           {
             title: '操作',
@@ -213,7 +177,6 @@
       }
     },
     created() {
-      this.$set(this.dictOptions, 'isDai', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -226,16 +189,12 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
         fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''})
         fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
-        fieldList.push({type:'string',value:'token',text:'登录TOEKN',dictCode:''})
-        fieldList.push({type:'string',value:'officialOpenid',text:'公众号openid',dictCode:''})
-        fieldList.push({type:'sel_search',value:'vid',text:'邀请人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
-        fieldList.push({type:'datetime',value:'vtime',text:'邀请时间'})
-        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
-        fieldList.push({type:'switch',value:'isDai',text:'是否分销商'})
+        fieldList.push({type:'string',value:'vid',text:'邀请人',dictCode:''})
+        fieldList.push({type:'date',value:'vtime',text:'邀请时间'})
+        fieldList.push({type:'BigDecimal',value:'price',text:'余额',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue

@@ -18,34 +18,19 @@
               <a-input v-model="model.phone" placeholder="请输入手机号码"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="登录TOEKN" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="token">
-              <a-input v-model="model.token" placeholder="请输入登录TOEKN"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="公众号openid" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="officialOpenid">
-              <a-input v-model="model.officialOpenid" placeholder="请输入公众号openid"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="邀请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vid">
-              <j-search-select-tag v-model="model.vid" dict="han_hai_member,nick_name,id"  />
+              <a-input v-model="model.vid" placeholder="请输入邀请人"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="邀请时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="vtime">
-              <j-date placeholder="请选择邀请时间"  v-model="model.vtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
-              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
+              <j-date placeholder="请选择邀请时间" v-model="model.vtime"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="是否分销商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isDai">
-              <j-switch v-model="model.isDai"  ></j-switch>
+            <a-form-model-item label="余额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入余额" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -85,6 +70,10 @@
         },
         confirmLoading: false,
         validatorRules: {
+           phone: [
+              { required: false},
+              { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+           ],
         },
         url: {
           add: "/hanHaiMember/hanHaiMember/add",

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts

@@ -5,12 +5,6 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '创建日期',
-    align:"center",
-    sorter: true,
-    dataIndex: 'createTime'
-   },
-   {
     title: '昵称',
     align:"center",
     dataIndex: 'nickName'
@@ -24,55 +18,29 @@ export const columns: BasicColumn[] = [
    {
     title: '手机号码',
     align:"center",
-    sorter: true,
     dataIndex: 'phone'
    },
-   {
-    title: '公众号openid',
-    align:"center",
-    dataIndex: 'officialOpenid'
-   },
    {
     title: '邀请人',
     align:"center",
-    dataIndex: 'vid_dictText'
+    dataIndex: 'vid'
    },
    {
     title: '邀请时间',
     align:"center",
-    dataIndex: 'vtime'
-   },
-   {
-    title: '性别',
-    align:"center",
-    dataIndex: 'sex'
+    dataIndex: 'vtime',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
    },
    {
-    title: '是否分销商',
+    title: '余额',
     align:"center",
-    dataIndex: 'isDai',
-    customRender:({text}) => {
-       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
-     },
+    dataIndex: 'price'
    },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
-	{
-      label: "昵称",
-      field: "nickName",
-      component: 'Input',
-      colProps: {span: 6},
- 	},
-	{
-      label: "邀请人",
-      field: "vid",
-      component: 'JSearchSelect',
-      componentProps:{
-         dict:"han_hai_member,nick_name,id"
-      },
-      colProps: {span: 6},
- 	},
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
@@ -92,40 +60,26 @@ export const formSchema: FormSchema[] = [
     label: '手机号码',
     field: 'phone',
     component: 'Input',
-  },
-  {
-    label: '登录TOEKN',
-    field: 'token',
-    component: 'Input',
-  },
-  {
-    label: '公众号openid',
-    field: 'officialOpenid',
-    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+          return [
+                 { required: false},
+                 { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+          ];
+     },
   },
   {
     label: '邀请人',
     field: 'vid',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"han_hai_member,nick_name,id"
-    },
+    component: 'Input',
   },
   {
     label: '邀请时间',
     field: 'vtime',
-    component: 'Input',
-  },
-  {
-    label: '性别',
-    field: 'sex',
-    component: 'Input',
+    component: 'DatePicker',
   },
   {
-    label: '是否分销商',
-    field: 'isDai',
-     component: 'JSwitch',
-     componentProps:{
-     },
+    label: '余额',
+    field: 'price',
+    component: 'InputNumber',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue

@@ -53,7 +53,7 @@
   //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
-           title: '用户表',
+           title: 'han_hai_member',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"用户表",
+            name:"han_hai_member",
             url: getExportUrl,
           },
           importConfig: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/controller/StudytourMedalController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 成就勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Api(tags="成就勋章表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/entity/StudytourMedal.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 成就勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Data
@@ -51,8 +51,12 @@ public class StudytourMedal implements Serializable {
 	@Excel(name = "成就名称", width = 15)
     @ApiModelProperty(value = "成就名称")
     private java.lang.String title;
-	/**图标*/
-	@Excel(name = "图标", width = 15)
-    @ApiModelProperty(value = "图标")
-    private java.lang.String icon;
+	/**彩色图标*/
+	@Excel(name = "彩色图标", width = 15)
+    @ApiModelProperty(value = "彩色图标")
+    private java.lang.String icon1;
+	/**灰色图标*/
+	@Excel(name = "灰色图标", width = 15)
+    @ApiModelProperty(value = "灰色图标")
+    private java.lang.String icon2;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/mapper/StudytourMedalMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 成就勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface StudytourMedalMapper extends BaseMapper<StudytourMedal> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/service/IStudytourMedalService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 成就勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface IStudytourMedalService extends IService<StudytourMedal> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 成就勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/StudytourMedalList.vue

@@ -127,9 +127,15 @@
             dataIndex: 'title'
           },
           {
-            title:'图标',
+            title:'彩色图标',
             align:"center",
-            dataIndex: 'icon',
+            dataIndex: 'icon1',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'灰色图标',
+            align:"center",
+            dataIndex: 'icon2',
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
@@ -167,7 +173,8 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'成就名称',dictCode:''})
-        fieldList.push({type:'Text',value:'icon',text:'图标',dictCode:''})
+        fieldList.push({type:'Text',value:'icon1',text:'彩色图标',dictCode:''})
+        fieldList.push({type:'Text',value:'icon2',text:'灰色图标',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue/modules/StudytourMedalForm.vue

@@ -9,8 +9,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="图标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="icon">
-              <j-image-upload isMultiple  v-model="model.icon" ></j-image-upload>
+            <a-form-model-item label="彩色图标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="icon1">
+              <j-image-upload isMultiple  v-model="model.icon1" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="灰色图标" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="icon2">
+              <j-image-upload isMultiple  v-model="model.icon2" ></j-image-upload>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedal/vue3/StudytourMedal.data.ts

@@ -10,9 +10,15 @@ export const columns: BasicColumn[] = [
     dataIndex: 'title'
    },
    {
-    title: '图标',
+    title: '彩色图标',
     align:"center",
-    dataIndex: 'icon',
+    dataIndex: 'icon1',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '灰色图标',
+    align:"center",
+    dataIndex: 'icon2',
     customRender:render.renderAvatar,
    },
 ];
@@ -27,8 +33,15 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '图标',
-    field: 'icon',
+    label: '彩色图标',
+    field: 'icon1',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '灰色图标',
+    field: 'icon2',
      component: 'JImageUpload',
      componentProps:{
       },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/controller/StudytourMedalActivityController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.studytourMedalActivity.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.studytourMedalActivity.entity.StudytourMedalActivity;
+import org.jeecg.modules.studytourMedalActivity.service.IStudytourMedalActivityService;
+
+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:   2025-09-18
+ * @Version: V1.0
+ */
+@Api(tags="活动勋章表")
+@RestController
+@RequestMapping("/studytourMedalActivity/studytourMedalActivity")
+@Slf4j
+public class StudytourMedalActivityController extends JeecgController<StudytourMedalActivity, IStudytourMedalActivityService> {
+	@Autowired
+	private IStudytourMedalActivityService studytourMedalActivityService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param studytourMedalActivity
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "活动勋章表-分页列表查询")
+	@ApiOperation(value="活动勋章表-分页列表查询", notes="活动勋章表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<StudytourMedalActivity>> queryPageList(StudytourMedalActivity studytourMedalActivity,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<StudytourMedalActivity> queryWrapper = QueryGenerator.initQueryWrapper(studytourMedalActivity, req.getParameterMap());
+		Page<StudytourMedalActivity> page = new Page<StudytourMedalActivity>(pageNo, pageSize);
+		IPage<StudytourMedalActivity> pageList = studytourMedalActivityService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param studytourMedalActivity
+	 * @return
+	 */
+	@AutoLog(value = "活动勋章表-添加")
+	@ApiOperation(value="活动勋章表-添加", notes="活动勋章表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody StudytourMedalActivity studytourMedalActivity) {
+		studytourMedalActivityService.save(studytourMedalActivity);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param studytourMedalActivity
+	 * @return
+	 */
+	@AutoLog(value = "活动勋章表-编辑")
+	@ApiOperation(value="活动勋章表-编辑", notes="活动勋章表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody StudytourMedalActivity studytourMedalActivity) {
+		studytourMedalActivityService.updateById(studytourMedalActivity);
+		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) {
+		studytourMedalActivityService.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.studytourMedalActivityService.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<StudytourMedalActivity> queryById(@RequestParam(name="id",required=true) String id) {
+		StudytourMedalActivity studytourMedalActivity = studytourMedalActivityService.getById(id);
+		if(studytourMedalActivity==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(studytourMedalActivity);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param studytourMedalActivity
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, StudytourMedalActivity studytourMedalActivity) {
+        return super.exportXls(request, studytourMedalActivity, StudytourMedalActivity.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, StudytourMedalActivity.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/entity/StudytourMedalActivity.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.studytourMedalActivity.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:   2025-09-18
+ * @Version: V1.0
+ */
+@Data
+@TableName("studytour_medal_activity")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="studytour_medal_activity对象", description="活动勋章表")
+public class StudytourMedalActivity 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 = "studytour_activity", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联活动")
+    private java.lang.String activityId;
+	/**关联勋章*/
+	@Excel(name = "关联勋章", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联勋章")
+    private java.lang.String medalId;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/StudytourMedalActivityMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.studytourMedalActivity.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 活动勋章表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface StudytourMedalActivityMapper extends BaseMapper<StudytourMedalActivity> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/mapper/xml/StudytourMedalActivityMapper.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.studytourMedalActivity.mapper.StudytourMedalActivityMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/service/IStudytourMedalActivityService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.studytourMedalActivity.service;
+
+import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 活动勋章表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+public interface IStudytourMedalActivityService extends IService<StudytourMedalActivity> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.studytourMedalActivity.service.impl;
+
+import org.jeecg.modules.studytourMedalActivity.entity.StudytourMedalActivity;
+import org.jeecg.modules.studytourMedalActivity.mapper.StudytourMedalActivityMapper;
+import org.jeecg.modules.studytourMedalActivity.service.IStudytourMedalActivityService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 活动勋章表
+ * @Author: jeecg-boot
+ * @Date:   2025-09-18
+ * @Version: V1.0
+ */
+@Service
+public class StudytourMedalActivityServiceImpl extends ServiceImpl<StudytourMedalActivityMapper, StudytourMedalActivity> implements IStudytourMedalActivityService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue/StudytourMedalActivityList.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>
+
+    <studytour-medal-activity-modal ref="modalForm" @ok="modalFormOk"></studytour-medal-activity-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import StudytourMedalActivityModal from './modules/StudytourMedalActivityModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'StudytourMedalActivityList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      StudytourMedalActivityModal
+    },
+    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: 'activityId_dictText'
+          },
+          {
+            title:'关联勋章',
+            align:"center",
+            dataIndex: 'medalId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/studytourMedalActivity/studytourMedalActivity/list",
+          delete: "/studytourMedalActivity/studytourMedalActivity/delete",
+          deleteBatch: "/studytourMedalActivity/studytourMedalActivity/deleteBatch",
+          exportXlsUrl: "/studytourMedalActivity/studytourMedalActivity/exportXls",
+          importExcelUrl: "studytourMedalActivity/studytourMedalActivity/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:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'medalId',text:'关联勋章',dictTable:"studytour_medal", dictText:'title', dictCode:'id'})
+        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/studytourMedalActivity/vue/modules/StudytourMedalActivityForm.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="activityId">
+              <j-search-select-tag v-model="model.activityId" dict="studytour_activity,title,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联勋章" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="medalId">
+              <j-search-select-tag v-model="model.medalId" dict="studytour_medal,title,id"  />
+            </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: 'StudytourMedalActivityForm',
+    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: "/studytourMedalActivity/studytourMedalActivity/add",
+          edit: "/studytourMedalActivity/studytourMedalActivity/edit",
+          queryById: "/studytourMedalActivity/studytourMedalActivity/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/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <studytour-medal-activity-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></studytour-medal-activity-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 StudytourMedalActivityForm from './StudytourMedalActivityForm'
+
+  export default {
+    name: 'StudytourMedalActivityModal',
+    components: {
+      StudytourMedalActivityForm
+    },
+    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/studytourMedalActivity/vue/modules/StudytourMedalActivityModal.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="关闭">
+    <studytour-medal-activity-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></studytour-medal-activity-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import StudytourMedalActivityForm from './StudytourMedalActivityForm'
+  export default {
+    name: 'StudytourMedalActivityModal',
+    components: {
+      StudytourMedalActivityForm
+    },
+    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/studytourMedalActivity/vue3/StudytourMedalActivity.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/studytourMedalActivity/studytourMedalActivity/list',
+  save='/studytourMedalActivity/studytourMedalActivity/add',
+  edit='/studytourMedalActivity/studytourMedalActivity/edit',
+  deleteOne = '/studytourMedalActivity/studytourMedalActivity/delete',
+  deleteBatch = '/studytourMedalActivity/studytourMedalActivity/deleteBatch',
+  importExcel = '/studytourMedalActivity/studytourMedalActivity/importExcel',
+  exportXls = '/studytourMedalActivity/studytourMedalActivity/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/studytourMedalActivity/vue3/StudytourMedalActivity.data.ts

@@ -0,0 +1,39 @@
+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: 'activityId_dictText'
+   },
+   {
+    title: '关联勋章',
+    align:"center",
+    dataIndex: 'medalId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '关联活动',
+    field: 'activityId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"studytour_activity,title,id"
+    },
+  },
+  {
+    label: '关联勋章',
+    field: 'medalId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"studytour_medal,title,id"
+    },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalActivity/vue3/StudytourMedalActivityList.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>
+    <!-- 表单区域 -->
+    <StudytourMedalActivityModal @register="registerModal" @success="handleSuccess"></StudytourMedalActivityModal>
+  </div>
+</template>
+
+<script lang="ts" name="studytourMedalActivity-studytourMedalActivity" 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 StudytourMedalActivityModal from './components/StudytourMedalActivityModal.vue'
+  import {columns, searchFormSchema} from './studytourMedalActivity.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './studytourMedalActivity.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/studytourMedalActivity/vue3/components/StudytourMedalActivityModal.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 '../studytourMedalActivity.data';
+    import {saveOrUpdate} from '../studytourMedalActivity.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/studytourMedalUser/controller/StudytourMedalUserController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Api(tags="用户勋章表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/entity/StudytourMedalUser.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Data
@@ -47,11 +47,27 @@ public class StudytourMedalUser implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
+	/**关联活动*/
+	@Excel(name = "关联活动", width = 15, dictTable = "studytour_activity", dicText = "title", dicCode = "id")
+	@Dict(dictTable = "studytour_activity", dicText = "title", dicCode = "id")
+    @ApiModelProperty(value = "关联活动")
+    private java.lang.String activityId;
 	/**关联勋章id*/
 	@Excel(name = "关联勋章id", width = 15, dictTable = "studytour_medal", dicText = "title", dicCode = "id")
 	@Dict(dictTable = "studytour_medal", dicText = "title", dicCode = "id")
     @ApiModelProperty(value = "关联勋章id")
     private java.lang.String metalId;
+	/**是否点亮*/
+	@Excel(name = "是否点亮", width = 15, dicCode = "is_true")
+	@Dict(dicCode = "is_true")
+    @ApiModelProperty(value = "是否点亮")
+    private java.lang.String isLight;
+	/**点亮日期*/
+	@Excel(name = "点亮日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "点亮日期")
+    private java.util.Date lightDate;
 	/**关联用户id*/
 	@Excel(name = "关联用户id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/mapper/StudytourMedalUserMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface StudytourMedalUserMapper extends BaseMapper<StudytourMedalUser> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/service/IStudytourMedalUserService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 public interface IStudytourMedalUserService extends IService<StudytourMedalUser> {

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

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 用户勋章表
  * @Author: jeecg-boot
- * @Date:   2025-08-25
+ * @Date:   2025-09-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/StudytourMedalUserList.vue

@@ -122,11 +122,29 @@
               return parseInt(index)+1;
             }
           },
+          {
+            title:'关联活动',
+            align:"center",
+            dataIndex: 'activityId_dictText'
+          },
           {
             title:'关联勋章id',
             align:"center",
             dataIndex: 'metalId_dictText'
           },
+          {
+            title:'是否点亮',
+            align:"center",
+            dataIndex: 'isLight_dictText'
+          },
+          {
+            title:'点亮日期',
+            align:"center",
+            dataIndex: 'lightDate',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
           {
             title:'关联用户id',
             align:"center",
@@ -166,7 +184,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
+        fieldList.push({type:'sel_search',value:'activityId',text:'关联活动',dictTable:"studytour_activity", dictText:'title', dictCode:'id'})
         fieldList.push({type:'string',value:'metalId',text:'关联勋章id',dictCode:"studytour_medal,title,id"})
+        fieldList.push({type:'string',value:'isLight',text:'是否点亮',dictCode:'is_true'})
+        fieldList.push({type:'date',value:'lightDate',text:'点亮日期'})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue/modules/StudytourMedalUserForm.vue

@@ -3,11 +3,26 @@
     <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="activityId">
+              <j-search-select-tag v-model="model.activityId" dict="studytour_activity,title,id"  />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联勋章id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="metalId">
               <j-dict-select-tag type="list" v-model="model.metalId" dictCode="studytour_medal,title,id" placeholder="请选择关联勋章id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否点亮" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isLight">
+              <j-dict-select-tag type="list" v-model="model.isLight" dictCode="is_true" placeholder="请选择是否点亮" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="点亮日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lightDate">
+              <j-date placeholder="请选择点亮日期" v-model="model.lightDate"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户id" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/studytourMedalUser/vue3/StudytourMedalUser.data.ts

@@ -5,10 +5,28 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
+    title: '关联活动',
+    align:"center",
+    dataIndex: 'activityId_dictText'
+   },
+   {
     title: '关联勋章id',
     align:"center",
     dataIndex: 'metalId_dictText'
    },
+   {
+    title: '是否点亮',
+    align:"center",
+    dataIndex: 'isLight_dictText'
+   },
+   {
+    title: '点亮日期',
+    align:"center",
+    dataIndex: 'lightDate',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
+   },
    {
     title: '关联用户id',
     align:"center",
@@ -20,6 +38,14 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
+  {
+    label: '关联活动',
+    field: 'activityId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"studytour_activity,title,id"
+    },
+  },
   {
     label: '关联勋章id',
     field: 'metalId',
@@ -28,6 +54,19 @@ export const formSchema: FormSchema[] = [
         dictCode:"studytour_medal,title,id"
      },
   },
+  {
+    label: '是否点亮',
+    field: 'isLight',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_true"
+     },
+  },
+  {
+    label: '点亮日期',
+    field: 'lightDate',
+    component: 'DatePicker',
+  },
   {
     label: '关联用户id',
     field: 'userId',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/bean/WxQrCodeVo.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.api.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WxQrCodeVo {
+    /**图片地址*/
+    @ApiModelProperty(value = "图片地址")
+    private String url;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+}

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

@@ -0,0 +1,128 @@
+package org.jeecg.modules.api.service.Impl;
+
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.service.MetalService;
+import org.jeecg.modules.api.utils.CommonUtils;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.studytourImage.entity.StudytourImage;
+import org.jeecg.modules.studytourMedal.service.IStudytourMedalService;
+import org.jeecg.modules.studytourMedalUser.entity.StudytourMedalUser;
+import org.jeecg.modules.studytourMedalUser.service.IStudytourMedalUserService;
+import org.jeecg.modules.studytourRecord.entity.StudytourRecord;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+public class MetalServiceImpl implements MetalService {
+
+    /******************************************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //勋章信息
+    @Resource
+    private IStudytourMedalService studytourMedalService;
+    //用户勋章信息
+    @Resource
+    private IStudytourMedalUserService studytourMedalUserService;
+    /******************************************************************************************************************/
+
+    //我的成就-查询勋章列表
+    @Override
+    public Result<?> queryMedalList(String token, PageBean pageBean) {
+        log.info("开始查询勋章列表");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<StudytourMedalUser> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<StudytourMedalUser> query = null;
+        //返回信息
+        Page<StudytourMedalUser> pageList = null;
+
+        try{
+
+            //分页
+            page = new Page<StudytourMedalUser>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = studytourMedalUserService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //所属用户
+            query.eq(StudytourMedalUser::getUserId, hanHaiMember.getId());
+
+            //按照创建时间降序排列
+            query.orderByDesc(StudytourMedalUser::getCreateTime);
+
+            //获取勋章列表
+            pageList = query.page(page);
+
+            log.info("勋章列表查询结束");
+            return Result.OK("勋章列表", pageList);
+        }catch (Exception e){
+            log.info("勋章列表查询失败");
+            e.printStackTrace();
+            return Result.error("勋章列表查询失败");
+        }
+    }
+
+    //我的成就-点亮勋章
+    @Override
+    public Result<?> lightMedal(String token, String medalId) {
+        log.info("开始点亮勋章");
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+
+        try{
+
+            //1、查询勋章是否存在
+            StudytourMedalUser one = studytourMedalUserService
+                    .lambdaQuery()
+                    .eq(StudytourMedalUser::getUserId, hanHaiMember.getId())
+                    .eq(StudytourMedalUser::getMetalId, medalId)
+                    .one();
+            if(null == one){
+                return Result.error("该勋章还未获取，无法点亮");
+            }else if("1".equals(one.getIsLight())){
+                return Result.error("该勋章已经点亮，无需重复点亮");
+            }
+
+            //2、点亮勋章
+            one.setIsLight("1");
+            one.setLightDate(CommonUtils.getCurrentDate());
+            boolean result =  studytourMedalUserService.updateById(one);
+
+            if(result){
+                log.info("勋章点亮成功");
+                return Result.OK("勋章点亮成功");
+            }else {
+                log.info("勋章点亮失败");
+                return Result.error("勋章点亮失败");
+            }
+
+        }catch (Exception e){
+            log.info("勋章点亮失败");
+            e.printStackTrace();
+            return Result.error("勋章点亮失败");
+        }
+    }
+}

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

@@ -131,8 +131,8 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public Result<?> createOrder(String token, StudytourOrder studytourOrder) {
         //权限验证
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
             //0、校验活动信息

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

@@ -1,6 +1,313 @@
 package org.jeecg.modules.api.service.Impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.api.bean.HttpClientUtil;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.bean.WxQrCodeVo;
 import org.jeecg.modules.api.service.PartnerService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.jeecg.modules.studytourConfig.entity.StudytourConfig;
+import org.jeecg.modules.studytourConfig.service.IStudytourConfigService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
+import javax.annotation.Resource;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@Slf4j
 public class PartnerServiceImpl implements PartnerService {
+
+    /******************************************************************************************************************/
+    private String appid = "wxee64675d48680dd4";//小程序appid
+    private String secret = "d7e3f49858350cf40b1aeeb8fa1c61eb";//小程序密钥
+    @Value("${jeecg.oss.endpoint}")
+    private String endpoint;
+    @Value("${jeecg.oss.accessKey}")
+    private String accessKey;
+    @Value("${jeecg.oss.secretKey}")
+    private String secretKey;
+    @Value("${jeecg.oss.bucketName}")
+    private String bucketName;
+    @Value("${jeecg.oss.staticDomain}")
+    private String staticDomain;
+
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+    //用户信息
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    //配置信息
+    @Resource
+    private IStudytourConfigService studytourConfigService;
+    /******************************************************************************************************************/
+    
+    @Override
+    public Result<?> queryDirectList(String token, PageBean pageBean) {
+        log.info("开始查询直推用户列表");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<HanHaiMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<HanHaiMember> query = null;
+        //返回信息
+        Page<HanHaiMember> pageList = null;
+
+        try{
+
+            //分页
+            page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = hanHaiMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //推荐用户
+            query.eq(HanHaiMember::getVid, hanHaiMember.getId());
+
+            //按照创建时间降序排列
+            query.orderByDesc(HanHaiMember::getCreateTime);
+
+            //获取直推用户列表
+            pageList = query.page(page);
+
+            log.info("直推用户列表查询结束");
+            return Result.OK("直推用户列表", pageList);
+        }catch (Exception e){
+            log.info("直推用户列表查询失败");
+            e.printStackTrace();
+            return Result.error("直推用户列表查询失败");
+        }
+    }
+
+    @Override
+    public Result<?> queryIndirectList(String token, PageBean pageBean) {
+        log.info("开始查询间推用户列表");
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+        //返回信息
+        String massege = "";
+        //分页信息
+        Page<HanHaiMember> page = null;
+        //查询信息
+        LambdaQueryChainWrapper<HanHaiMember> query = null;
+        //返回信息
+        Page<HanHaiMember> pageList = null;
+
+        try{
+
+            //1、获取直推用户列表
+            List<HanHaiMember> directList = hanHaiMemberService
+                    .lambdaQuery()
+                    .eq(HanHaiMember::getVid, hanHaiMember.getId())
+                    .list();
+            List<String> ids = new ArrayList<>();
+            for (HanHaiMember member : directList) {
+                ids.add(member.getId());
+            }
+
+            //2、获取间推用户列表
+            //分页
+            page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+            query = hanHaiMemberService
+                    .lambdaQuery();
+
+            //组装查询条件
+
+            //推荐用户
+            query.in(HanHaiMember::getVid, ids);
+
+            //按照创建时间降序排列
+            query.orderByDesc(HanHaiMember::getCreateTime);
+
+            //获取间推用户列表
+            pageList = query.page(page);
+
+            log.info("间推用户列表查询结束");
+            return Result.OK("间推用户列表", pageList);
+        }catch (Exception e){
+            log.info("间推用户列表查询失败");
+            e.printStackTrace();
+            return Result.error("间推用户列表查询失败");
+        }
+    }
+
+    //邀请二维码
+    @Override
+    public Result<?> getInviteCode(String path) {
+        //获取版本信息
+        StudytourConfig vsion = studytourConfigService.lambdaQuery()
+                .eq(StudytourConfig::getParamCode, "v_sion")
+                .one();
+        Integer vsionStr = Integer.parseInt(vsion.getParamText());
+        String trial = "release";
+        if(vsionStr == 0){
+            trial= "release";
+        }else if(vsionStr == 1){
+            trial= "trial";
+        }else{
+            trial= "develop";
+        }
+
+        Map<String, Object> param = new HashMap<>();
+        param.put("path", path); //跳转页面
+        String accessToken = this.getAccessToken();
+        RestTemplate rest = new RestTemplate();
+        InputStream inputStream = null;
+        OutputStream outputStream = null;
+        File file = null;
+
+        //存储地址
+        String codeImg = "/studytour";
+
+        try{
+            String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
+            //param.put("scene", hanHaiMember.getId());
+            param.put("width", 150);
+            param.put("auto_color", false);
+            param.put("env_version", trial);
+            Map<String, Object> line_color = new HashMap<>();
+            line_color.put("r", 0);
+            line_color.put("g", 0);
+            line_color.put("b", 0);
+            param.put("line_color", line_color);
+            param.put("is_hyaline", true);
+            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+            org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers);
+            ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+            byte[] result = entity.getBody();
+
+            inputStream = new ByteArrayInputStream(result);
+            String tempSave = codeImg;
+            String filePath = tempSave;
+
+            file = new File(filePath);
+            if (!file.exists()) {
+                file.createNewFile();
+            }
+            outputStream = new FileOutputStream(file);
+            int len = 0;
+            byte[] buf = new byte[1024];
+            while ((len = inputStream.read(buf, 0, 1024)) != -1) {
+                outputStream.write(buf, 0, len);
+            }
+            outputStream.flush();
+
+            //将文件上传至阿里云
+            DiskFileItemFactory factory = new DiskFileItemFactory(16, null);
+            FileItem item = factory.createItem("File", "text/plain", true, file.getName());
+            int bytesRead = 0;
+            byte[] buffer = new byte[8192];
+            try {
+                FileInputStream fis = new FileInputStream(file);
+                OutputStream os = item.getOutputStream();
+                while ((bytesRead = fis.read(buffer, 0, 8192)) != -1) {
+                    os.write(buffer, 0, bytesRead);
+                }
+                os.close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            MultipartFile mf = new CommonsMultipartFile(item);
+            //返回图片下载地址
+            WxQrCodeVo wxCodeVo = new WxQrCodeVo();
+            wxCodeVo.setUrl(staticDomain+this.uploadAliYunOss(mf));
+
+            wxCodeVo.setName("二维码");
+
+            return Result.OK(wxCodeVo);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            //删除文件
+            if (file.exists()) {
+                file.delete();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取令牌
+     *
+     * @return
+     */
+    private String getAccessToken() {
+        String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String doGet2 = HttpClientUtil.doGet2(requestUrl);
+        Map<String, String> map = JSON.parseObject(doGet2, new TypeReference<Map<String, String>>() {
+        });
+        return map.get("access_token");
+    }
+
+    /**
+     * 上传文件至阿里云oss
+     *
+     * @return
+     */
+    private String uploadAliYunOss(MultipartFile mf) throws Exception {
+        String uploadFile = "studytour";
+        String fileName = new StringBuffer(mf.getOriginalFilename()).append(".png").toString();// 获取文件名
+        String dbpath = uploadFile + File.separator + fileName;
+        if (dbpath.contains("\\")) {
+            dbpath = dbpath.replace("\\", "/");
+        }
+        String endpoint = this.endpoint;
+        String accessKey = this.accessKey;
+        String secretKey = this.secretKey;
+        // 创建OSSClient实例。
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKey, secretKey);
+        // 上传Byte数组。
+        byte[] content = mf.getBytes();
+        String bucketName = this.bucketName;
+        ossClient.putObject(bucketName, dbpath, new ByteArrayInputStream(content));
+        // 关闭OSSClient。
+        ossClient.shutdown();
+        return dbpath;
+    }
 }

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.api.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+public interface MetalService {
+
+    //我的成就-查询勋章列表
+    public Result<?> queryMedalList(String token, PageBean pageBean);
+
+    //我的成就-点亮勋章
+    public Result<?> lightMedal(String token, String medalId);
+
+}

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

@@ -1,4 +1,17 @@
 package org.jeecg.modules.api.service;
 
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+
 public interface PartnerService {
+
+    //我的团队-获取直推用户列表
+    public Result<?> queryDirectList(String token, PageBean pageBean);
+
+    //我的团队-获取间推用户列表
+    public Result<?> queryIndirectList(String token, PageBean pageBean);
+
+    //合伙人-邀请二维码
+    public Result<?> getInviteCode(String path);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/ExperienceController.java

@@ -22,7 +22,7 @@ import javax.annotation.Resource;
 public class ExperienceController {
 
     /******************************************************************************************************************/
-    //配置信息
+    //成长档案信息
     @Resource
     private ExperienceService experienceService;
     /******************************************************************************************************************/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/MetalController.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.api.studytourController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.service.MetalService;
+import org.jeecg.modules.studytourRecord.entity.StudytourRecord;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags="我的成就-相关接口")
+@RestController
+@RequestMapping("/studytour/metal")
+@Slf4j
+public class MetalController {
+
+    /******************************************************************************************************************/
+    //成长档案信息
+    @Resource
+    private MetalService metalService;
+    /******************************************************************************************************************/
+
+    @ApiOperation(value="我的成就-查询勋章列表", notes="我的成就-查询勋章列表")
+    @RequestMapping(value = "/queryMedalList", method = {RequestMethod.GET})
+    public Result<?> queryMedalList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
+        return metalService.queryMedalList(token, pageBean);
+    }
+
+    @ApiOperation(value="我的成就-点亮勋章", notes="我的成就-点亮勋章")
+    @RequestMapping(value = "/lightMedal", method = {RequestMethod.POST})
+    public Result<?> lightMedal(@RequestHeader("X-Access-Token") String token, String medalId){
+        return metalService.lightMedal(token, medalId);
+    }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/studytourController/PartnerController.java

@@ -5,12 +5,15 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.PageBean;
+import org.jeecg.modules.api.service.MetalService;
+import org.jeecg.modules.api.service.PartnerService;
 import org.jeecg.modules.studytourPartner.entity.StudytourPartner;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 
 @Api(tags="合伙人-相关接口")
@@ -19,28 +22,34 @@ import java.math.BigDecimal;
 @Slf4j
 public class PartnerController {
 
-    @ApiOperation(value="合伙人-申请成为合伙人", notes="合伙人-申请成为合伙人")
-    @RequestMapping(value = "/applyPartner", method = {RequestMethod.POST})
-    public Result<?> applyPartner(@RequestHeader("X-Access-Token") String token, StudytourPartner studytourPartner){
-        return Result.OK("接口暂未处理");
-    }
+    /******************************************************************************************************************/
+    //合伙人信息
+    @Resource
+    private PartnerService partnerService;
+    /******************************************************************************************************************/
+
+//    @ApiOperation(value="合伙人-申请成为合伙人", notes="合伙人-申请成为合伙人")
+//    @RequestMapping(value = "/applyPartner", method = {RequestMethod.POST})
+//    public Result<?> applyPartner(@RequestHeader("X-Access-Token") String token, StudytourPartner studytourPartner){
+//        return Result.OK("接口暂未处理");
+//    }
 
     @ApiOperation(value="我的团队-获取直推用户列表", notes="我的团队-获取直推用户列表")
     @RequestMapping(value = "/queryDirectList", method = {RequestMethod.GET})
     public Result<?> queryDirectList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
-        return Result.OK("接口暂未处理");
+        return partnerService.queryDirectList(token, pageBean);
     }
 
     @ApiOperation(value="我的团队-获取间推用户列表", notes="我的团队-获取间推用户列表")
     @RequestMapping(value = "/queryIndirectList", method = {RequestMethod.GET})
     public Result<?> queryIndirectList(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
-        return Result.OK("接口暂未处理");
+        return partnerService.queryIndirectList(token, pageBean);
     }
 
     @ApiOperation(value="合伙人-邀请二维码", notes="合伙人-邀请二维码")
     @RequestMapping(value = "/getInviteCode", method = {RequestMethod.POST})
     public Result<?> getInviteCode(String path){
-        return Result.OK("接口暂未处理");
+        return partnerService.getInviteCode(path);
     }
 
     @ApiOperation(value="合伙人-提现", notes="合伙人-提现")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/utils/CommonUtils.java

@@ -16,6 +16,16 @@ public class CommonUtils {
         return now;
     }
 
+    //获取当前日期
+    public static Date getCurrentDate(){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date now = new Date();
+        String formattedDate = sdf.format(now);
+//        System.out.println(now); // 输出格式化后的当前时间
+//        System.out.println(formattedDate); // 输出格式化后的当前时间
+        return now;
+    }
+
     //获取延长时间
     public static Date getValidTime(Date oldTime, int month){
         // 创建Calendar实例