From f4784c490b068b334a6004b26cb79acaec2f6983 Mon Sep 17 00:00:00 2001 From: lzx <2602107437@qq.com> Date: Fri, 13 Sep 2024 17:59:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HanHaiMemberController.java | 32 ++++---- .../modules/hanHaiMember/entity/HanHaiMember.java | 25 +++--- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 4 +- .../hanHaiMember/service/IHanHaiMemberService.java | 4 +- .../service/impl/HanHaiMemberServiceImpl.java | 4 +- .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 72 ++--------------- .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 33 +------- .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 93 +++------------------- .../modules/hanHaiMember/vue3/HanHaiMemberList.vue | 4 +- .../noticeapicontroller/IndexApiController.java | 3 +- .../noticeapicontroller/OrderApiController.java | 6 +- .../jeecg/modules/apiBean/ActorSetPageBean.java | 2 + .../jeecg/modules/apiBean/MyReleasePageBean.java | 3 + .../java/org/jeecg/modules/apiBean/TrendsBean.java | 3 + .../jeecg/modules/apiservice/OrderApiService.java | 2 +- .../apiservice/impl/IndexApiServiceImpl.java | 49 ++++++++++-- .../apiservice/impl/InfoApiServiceImpl.java | 7 +- .../apiservice/impl/OrderApiServiceImpl.java | 2 +- 18 files changed, 124 insertions(+), 224 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 4d92241..dda8804 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/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> queryPageList(HanHaiMember hanHaiMember, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -78,8 +78,8 @@ public class HanHaiMemberController extends JeecgController add(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.save(hanHaiMember); @@ -92,8 +92,8 @@ public class HanHaiMemberController extends JeecgController edit(@RequestBody HanHaiMember hanHaiMember) { hanHaiMemberService.updateById(hanHaiMember); @@ -106,8 +106,8 @@ public class HanHaiMemberController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hanHaiMemberService.removeById(id); @@ -120,8 +120,8 @@ public class HanHaiMemberController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hanHaiMemberService.removeByIds(Arrays.asList(ids.split(","))); @@ -134,8 +134,8 @@ public class HanHaiMemberController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { HanHaiMember hanHaiMember = hanHaiMemberService.getById(id); @@ -153,7 +153,7 @@ public class HanHaiMemberController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java index dcb6869..501d2b4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java index cd9b45f..4416acb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue index 4769824..235fdbc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue @@ -4,26 +4,6 @@
- - - - - - - - - - - - - 查询 - 重置 - - {{ toggleSearchStatus ? '收起' : '展开' }} - - - -
@@ -32,7 +12,7 @@
新增 - 导出 + 导出 导入 @@ -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 } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue index 84e2704..b57168e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue @@ -14,38 +14,13 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts index 46043f7..782f934 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts +++ b/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', }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue index 1802655..e2a9d5a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue +++ b/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: { diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java index 2b85647..2617ae3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/IndexApiController.java +++ b/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); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java index 3d22663..2a51cd7 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java +++ b/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") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java index 58ae17a..8b4c42e 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ActorSetPageBean.java +++ b/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 = "显示条数" ) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/MyReleasePageBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/MyReleasePageBean.java index 72c82a0..884c396 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/MyReleasePageBean.java +++ b/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; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/TrendsBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/TrendsBean.java index d34a398..ead7ee4 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/TrendsBean.java +++ b/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; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java index a0c69b4..1e83b58 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java +++ b/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(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index 9acac0e..210032f 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/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 page = new Page(bean.getPageNo(), bean.getPageSize()); - Page pageList = atTrendsService.page(page); - List records = pageList.getRecords(); + Page pageList = atTrendsService + .page(page); + + + if (StringUtils.isNotBlank(bean.getTitle())){ + pageList = atTrendsService + .lambdaQuery() + .eq(AtTrends::getTitle,bean.getTitle()) + .page(page); + } + + + +// List 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 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 page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atActorCollectionService + .lambdaQuery() .page(page); + + if(StringUtils.isNotBlank(bean.getTitle())){ + pageList = atActorCollectionService + .lambdaQuery() + .eq(AtActorCollection::getTitle,bean.getTitle()) + .page(page); + + } return Result.OK("演员集列表", pageList); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 54bd457..c573684 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -321,6 +321,7 @@ public class InfoApiServiceImpl implements InfoApiService { Page 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()); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java index 2a78cce..86913ee 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java +++ b/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; }