修复

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: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-09-10
  * @Version: V1.0
  */
-@Api(tags="用户表")
+@Api(tags="用户账户表")
 @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 = "用户账户表-分页列表查询")
+	@ApiOperation(value="用户账户表-分页列表查询", notes="用户账户表-分页列表查询")
 	@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 = "用户账户表-添加")
+	@ApiOperation(value="用户账户表-添加", notes="用户账户表-添加")
 	@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 = "用户账户表-编辑")
+	@ApiOperation(value="用户账户表-编辑", notes="用户账户表-编辑")
 	@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 = "用户账户表-通过id删除")
+	@ApiOperation(value="用户账户表-通过id删除", notes="用户账户表-通过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 = "用户账户表-批量删除")
+	@ApiOperation(value="用户账户表-批量删除", notes="用户账户表-批量删除")
 	@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 = "用户账户表-通过id查询")
+	@ApiOperation(value="用户账户表-通过id查询", notes="用户账户表-通过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, "用户账户表");
     }
 
     /**

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: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-09-10
  * @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="用户账户表")
 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 HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @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,19 +159,18 @@ 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;
-	/**兼兼街会员*/
-	@Excel(name = "兼兼街会员", width = 15)
-    @ApiModelProperty(value = "兼兼街会员")
+	/**是否认证*/
+	@Excel(name = "是否认证", width = 15)
+    @ApiModelProperty(value = "是否认证")
     private java.lang.Integer isPay;
 	/**是否关注公众号*/
 	@Excel(name = "是否关注公众号", width = 15)

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: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-09-10
  * @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: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-09-10
  * @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: 用户账户表
  * @Author: jeecg-boot
- * @Date:   2024-07-08
+ * @Date:   2024-09-10
  * @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('用户账户表')">导出</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: '用户账户表管理页面',
         // 表头
         columns: [
           {
@@ -142,12 +121,6 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'创建日期',
-            align:"center",
-            sorter: true,
-            dataIndex: 'createTime'
-          },
           {
             title:'昵称',
             align:"center",
@@ -160,36 +133,14 @@
             scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'手机号码',
-            align:"center",
-            sorter: true,
-            dataIndex: 'phone'
-          },
-          {
-            title:'公众号openid',
-            align:"center",
-            dataIndex: 'officialOpenid'
-          },
-          {
-            title:'邀请人',
-            align:"center",
-            dataIndex: 'vid_dictText'
-          },
-          {
-            title:'邀请时间',
-            align:"center",
-            dataIndex: 'vtime'
-          },
-          {
-            title:'性别',
+            title:'小程序标识',
             align:"center",
-            dataIndex: 'sex'
+            dataIndex: 'appletOpenid'
           },
           {
-            title:'是否分销商',
+            title:'是否认证',
             align:"center",
-            dataIndex: 'isDai',
-            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isDai'], text) : ''),
+            dataIndex: 'isPay'
           },
           {
             title: '操作',
@@ -213,7 +164,6 @@
       }
     },
     created() {
-      this.$set(this.dictOptions, 'isDai', [{text:'是',value:'Y'},{text:'否',value:'N'}])
     this.getSuperFieldList();
     },
     computed: {
@@ -226,16 +176,10 @@
       },
       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:'appletOpenid',text:'小程序标识',dictCode:''})
+        fieldList.push({type:'int',value:'isPay',text:'是否认证',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -14,38 +14,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-              <a-input v-model="model.phone" placeholder="请输入手机号码"  ></a-input>
+            <a-form-model-item label="小程序标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="appletOpenid">
+              <a-input v-model="model.appletOpenid" 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-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>
-            </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="isPay">
+              <a-input-number v-model="model.isPay" placeholder="请输入是否认证" style="width: 100%" />
             </a-form-model-item>
           </a-col>
         </a-row>

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'
@@ -22,57 +16,18 @@ export const columns: BasicColumn[] = [
     customRender:render.renderAvatar,
    },
    {
-    title: '手机号码',
-    align:"center",
-    sorter: true,
-    dataIndex: 'phone'
-   },
-   {
-    title: '公众号openid',
-    align:"center",
-    dataIndex: 'officialOpenid'
-   },
-   {
-    title: '邀请人',
-    align:"center",
-    dataIndex: 'vid_dictText'
-   },
-   {
-    title: '邀请时间',
+    title: '小程序标识',
     align:"center",
-    dataIndex: 'vtime'
+    dataIndex: 'appletOpenid'
    },
    {
-    title: '性别',
+    title: '是否认证',
     align:"center",
-    dataIndex: 'sex'
-   },
-   {
-    title: '是否分销商',
-    align:"center",
-    dataIndex: 'isDai',
-    customRender:({text}) => {
-       return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
-     },
+    dataIndex: 'isPay'
    },
 ];
 //查询数据
 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[] = [
@@ -89,43 +44,13 @@ export const formSchema: FormSchema[] = [
       },
   },
   {
-    label: '手机号码',
-    field: 'phone',
+    label: '小程序标识',
+    field: 'appletOpenid',
     component: 'Input',
   },
   {
-    label: '登录TOEKN',
-    field: 'token',
-    component: 'Input',
-  },
-  {
-    label: '公众号openid',
-    field: 'officialOpenid',
-    component: 'Input',
-  },
-  {
-    label: '邀请人',
-    field: 'vid',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"han_hai_member,nick_name,id"
-    },
-  },
-  {
-    label: '邀请时间',
-    field: 'vtime',
-    component: 'Input',
-  },
-  {
-    label: '性别',
-    field: 'sex',
-    component: 'Input',
-  },
-  {
-    label: '是否分销商',
-    field: 'isDai',
-     component: 'JSwitch',
-     componentProps:{
-     },
+    label: '是否认证',
+    field: 'isPay',
+    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: '用户账户表',
            api: list,
            columns,
            canResize:false,
@@ -70,7 +70,7 @@
             },
       },
        exportConfig: {
-            name:"用户表",
+            name:"用户账户表",
             url: getExportUrl,
           },
           importConfig: {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.apiBean.TrendsBean;
 import org.jeecg.modules.apiservice.IndexApiService;
 import org.jeecg.modules.bean.WaterPageBean;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -52,7 +53,7 @@ public class IndexApiController {
     //获取动态详情
     @ApiOperation(value="小程序-获取动态详情", notes="小程序-获取动态详情")
     @GetMapping("/getTrendsDetail")
-    public Result<?> getTrendsDetail(String id,String token)
+    public Result<?> getTrendsDetail(String id, @RequestHeader("X-Access-Token") String token)
     {
         return indexApiService.getTrendsDetail(id,token);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java

@@ -8,6 +8,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiservice.LoginApiService;
 import org.jeecg.modules.apiservice.OrderApiService;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,10 +27,11 @@ public class OrderApiController {
     //创建订单
     @ApiOperation(value = "创建订单",notes = "创建订单")
     @PostMapping("/createOrder")
-    public Result<?> createOrder(){
-        return orderApiService.createOrder();
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token,String id){
+        return orderApiService.createOrder(token,id);
     }
 
+
     //立即支付
     @ApiOperation(value = "立即支付",notes = "立即支付")
     @PostMapping("/payOrder")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java

@@ -7,6 +7,8 @@ import lombok.Data;
 public class ActorSetPageBean {
 
 
+    @ApiModelProperty(value = "搜索标题")
+    private String title;
 
     /**显示条数*/
     @ApiModelProperty(value = "显示条数" )

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/MyReleasePageBean.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class MyReleasePageBean {
 
+    @ApiModelProperty(value = "搜索标题")
+    private String title;
+
 
     @ApiModelProperty(value = "0全部1帖子2名片" )
     private Integer state;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/TrendsBean.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class TrendsBean {
 
+    @ApiModelProperty(value = "搜索标题")
+    private String title;
+
     /**显示条数*/
     @ApiModelProperty(value = "显示条数" )
     private Integer pageSize;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java

@@ -5,7 +5,7 @@ import org.jeecg.common.api.vo.Result;
 public interface OrderApiService {
 
     //创建订单
-    Result<?> createOrder();
+    Result<?> createOrder(String token,String id);
 
     //立即支付
     Result<?> payOrder();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java

@@ -101,21 +101,40 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> getTrendsPage(TrendsBean bean){
         Page<AtTrends> page = new Page<AtTrends>(bean.getPageNo(), bean.getPageSize());
-        Page<AtTrends> pageList = atTrendsService.page(page);
-        List<AtTrends> records = pageList.getRecords();
+        Page<AtTrends> pageList = atTrendsService
+                .page(page);
+
+
+        if (StringUtils.isNotBlank(bean.getTitle())){
+            pageList = atTrendsService
+                    .lambdaQuery()
+                    .eq(AtTrends::getTitle,bean.getTitle())
+                    .page(page);
+        }
+
+
+
+//        List<AtTrends> records = pageList.getRecords();
 //        for (AtTrends atTrends:records) {
 //            atTrends.setUserId(hanHaiMemberService
 //                    .lambdaQuery()
 //                    .eq(HanHaiMember::getId,atTrends.getUserId()).one().getNickName());
 //        }
-        pageList.setRecords(records);
+//        pageList.setRecords(records);
         return Result.OK("动态列表", pageList);
     }
 
     //获取动态详情
     @Override
     public Result<?> getTrendsDetail(String id,String token){
+
+        if(StringUtils.isBlank(id)){
+            return Result.error("动态标识不能为空");
+        }
         AtTrends byId = atTrendsService.getById(id);
+        if(byId == null){
+            return Result.error("当前动态不存在");
+        }
         //根据用户标识查询发布人信息
         HanHaiMember byId1 = hanHaiMemberService.getById(byId.getUserId());
         byId.setUserId(byId1.getNickName());
@@ -125,7 +144,10 @@ public class IndexApiServiceImpl implements IndexApiService {
         Map<String,Object> map = new HashMap<>();
         //作品0/演员1/动态2
         if (StringUtils.isNotBlank(token)){
-            HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
+            HanHaiMember hanHaiMember =hanHaiMemberService.getById(byId.getUserId());
+            if(hanHaiMember == null){
+                return Result.error("当前用户不存在");
+            }
             AtThumbsLog one = atThumbsLogService.lambdaQuery()
                     .eq(AtThumbsLog::getUserId, hanHaiMember.getId())
                     .eq(AtThumbsLog::getType, "2")
@@ -138,11 +160,17 @@ public class IndexApiServiceImpl implements IndexApiService {
                     .eq(AtThumbsLog::getIsState, "1")
                     .one();
             map.put("isThumbs_down", one2);
+            map.put("details", byId);
+            return Result.OK("动态详情", map);
 
+        }else{
+            map.put("isThumbs_up", new AtThumbsLog());
+            map.put("isThumbs_down", new AtThumbsLog());
+            map.put("details", byId);
+            return Result.OK("动态详情", map);
         }
 
-        map.put("details", byId);
-        return Result.OK("动态详情", map);
+
     }
 
     //获取代表作品带分页
@@ -194,7 +222,16 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> getActorSetPage(ActorSetPageBean bean){
         Page<AtActorCollection> page = new Page<AtActorCollection>(bean.getPageNo(), bean.getPageSize());
         Page<AtActorCollection> pageList = atActorCollectionService
+                .lambdaQuery()
                 .page(page);
+
+        if(StringUtils.isNotBlank(bean.getTitle())){
+            pageList = atActorCollectionService
+                    .lambdaQuery()
+                    .eq(AtActorCollection::getTitle,bean.getTitle())
+                    .page(page);
+
+        }
         return Result.OK("演员集列表", pageList);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java

@@ -321,6 +321,7 @@ public class InfoApiServiceImpl implements InfoApiService {
 
         Page<AtTrends> pageList = atTrendsService.lambdaQuery()
                 .eq(AtTrends::getUserId, hanHaiMember.getId())
+                .eq(AtTrends::getTitle,bean.getTitle())
                 .orderByDesc(AtTrends::getCreateTime)
                 .page(page);
 
@@ -329,12 +330,14 @@ public class InfoApiServiceImpl implements InfoApiService {
             pageList = atTrendsService.lambdaQuery()
                     .eq(AtTrends::getUserId, hanHaiMember.getId())
                     .eq(AtTrends::getIsCard,"N")
+                    .eq(AtTrends::getTitle,bean.getTitle())
                     .orderByDesc(AtTrends::getCreateTime)
                     .page(page);
         }else if (bean.getState() == 2){
             pageList = atTrendsService.lambdaQuery()
                     .eq(AtTrends::getUserId, hanHaiMember.getId())
                     .eq(AtTrends::getIsCard,"Y")
+                    .eq(AtTrends::getTitle,bean.getTitle())
                     .orderByDesc(AtTrends::getCreateTime)
                     .page(page);
         }
@@ -421,10 +424,12 @@ public class InfoApiServiceImpl implements InfoApiService {
                 .lambdaQuery()
                 .eq(AtThumbsLog::getUserId, hanHaiMember.getId())
                 .eq(AtThumbsLog::getType, type)
+                .eq(AtThumbsLog::getOrderId,id)
                 .eq(AtThumbsLog::getIsState, "0")
                 .one();
         if (one != null){
-            return Result.error("您已经点过赞了");
+            atThumbsLogService.removeById(one.getId());
+            return Result.error("取消点赞");
         }
         AtThumbsLog newOne = new AtThumbsLog();
         newOne.setUserId(hanHaiMember.getId());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java

@@ -21,7 +21,7 @@ public class OrderApiServiceImpl implements OrderApiService {
 
     //创建订单
     @Override
-    public Result<?> createOrder()
+    public Result<?> createOrder(String token,String id)
     {
         return null;
     }