From 66545d9010d497206b3d62d1898c8f4d71cd8d4f Mon Sep 17 00:00:00 2001 From: lzx <2602107437@qq.com> Date: Wed, 25 Sep 2024 19:00:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AtActorCollectionController.java | 2 +- .../entity/AtActorCollection.java | 6 +- .../mapper/AtActorCollectionMapper.java | 2 +- .../service/IAtActorCollectionService.java | 2 +- .../service/impl/AtActorCollectionServiceImpl.java | 2 +- .../vue/AtActorCollectionList.vue | 6 ++ .../vue/modules/AtActorCollectionForm.vue | 5 ++ .../vue3/AtActorCollection.data.ts | 10 ++++ .../controller/AtMasterPieceController.java | 2 +- .../atMasterPiece/entity/AtMasterPiece.java | 6 +- .../atMasterPiece/mapper/AtMasterPieceMapper.java | 2 +- .../service/IAtMasterPieceService.java | 2 +- .../service/impl/AtMasterPieceServiceImpl.java | 2 +- .../atMasterPiece/vue/AtMasterPieceList.vue | 6 ++ .../vue/modules/AtMasterPieceForm.vue | 5 ++ .../atMasterPiece/vue3/AtMasterPiece.data.ts | 10 ++++ .../atTrends/controller/AtTrendsController.java | 2 +- .../jeecg/modules/atTrends/entity/AtTrends.java | 6 +- .../modules/atTrends/mapper/AtTrendsMapper.java | 2 +- .../modules/atTrends/service/IAtTrendsService.java | 2 +- .../atTrends/service/impl/AtTrendsServiceImpl.java | 2 +- .../jeecg/modules/atTrends/vue/AtTrendsList.vue | 6 ++ .../modules/atTrends/vue/modules/AtTrendsForm.vue | 5 ++ .../jeecg/modules/atTrends/vue3/AtTrends.data.ts | 10 ++++ .../jeecg/modules/apiBean/MyReleasePageBean.java | 4 +- .../apiservice/impl/InfoApiServiceImpl.java | 65 ++++++++++++++++++---- 26 files changed, 147 insertions(+), 27 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java index 376418b..f611a6d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 演员集表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="演员集表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java index 18af103..ddb6a70 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 演员集表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data @@ -116,4 +116,8 @@ public class AtActorCollection implements Serializable { @Excel(name = "价格", width = 15) @ApiModelProperty(value = "价格") private java.math.BigDecimal price; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + private java.lang.Integer state; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java index 571c076..433b765 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 演员集表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface AtActorCollectionMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java index 69ef888..a4290d9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 演员集表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface IAtActorCollectionService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java index 54f2897..cbc275e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 演员集表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue index 768cc8d..9e35c09 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue @@ -224,6 +224,11 @@ align:"center", dataIndex: 'price' }, + { + title:'审核状态', + align:"center", + dataIndex: 'state' + }, { title: '操作', dataIndex: 'action', @@ -277,6 +282,7 @@ fieldList.push({type:'string',value:'topId',text:'置顶标识',dictCode:''}) fieldList.push({type:'Text',value:'workName',text:'作品名称',dictCode:''}) fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''}) + fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue index b5eb86a..1c26ad6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue @@ -73,6 +73,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts index 895107b..3b3cbe7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts @@ -94,6 +94,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'price' }, + { + title: '审核状态', + align:"center", + dataIndex: 'state' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -200,4 +205,9 @@ export const formSchema: FormSchema[] = [ field: 'price', component: 'InputNumber', }, + { + label: '审核状态', + field: 'state', + component: 'InputNumber', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java index b9c0662..883f18f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 代表作品表 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="代表作品表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java index 67befcb..64a28d7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/entity/AtMasterPiece.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 代表作品表 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data @@ -84,4 +84,8 @@ public class AtMasterPiece implements Serializable { @Excel(name = "发布人头像", width = 15) @ApiModelProperty(value = "发布人头像") private java.lang.String userImage; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + private java.lang.Integer state; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java index 9b7cb74..4c83cfa 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/mapper/AtMasterPieceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 代表作品表 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface AtMasterPieceMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java index b1c128b..56d5920 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/IAtMasterPieceService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 代表作品表 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface IAtMasterPieceService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java index c392d9b..99f429f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 代表作品表 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue index 7da63e1..87d4e1c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/AtMasterPieceList.vue @@ -187,6 +187,11 @@ dataIndex: 'userImage', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'审核状态', + align:"center", + dataIndex: 'state' + }, { title: '操作', dataIndex: 'action', @@ -230,6 +235,7 @@ fieldList.push({type:'Text',value:'vod',text:'视频',dictCode:''}) fieldList.push({type:'int',value:'thumbsUp',text:'点赞',dictCode:''}) fieldList.push({type:'string',value:'userImage',text:'发布人头像',dictCode:''}) + fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue index 3aa993a..586f7d0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue @@ -43,6 +43,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts index 970da87..c89fed3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue3/AtMasterPiece.data.ts @@ -54,6 +54,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'userImage', customRender:render.renderAvatar, }, + { + title: '审核状态', + align:"center", + dataIndex: 'state' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -118,4 +123,9 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '审核状态', + field: 'state', + component: 'InputNumber', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/controller/AtTrendsController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/controller/AtTrendsController.java index 18d8e8a..66f9eb1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/controller/AtTrendsController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/controller/AtTrendsController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 动态信息 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Api(tags="动态信息") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/entity/AtTrends.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/entity/AtTrends.java index 59100ae..95cccd7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/entity/AtTrends.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/entity/AtTrends.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 动态信息 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Data @@ -85,4 +85,8 @@ public class AtTrends implements Serializable { @Dict(dictTable = "at_top_price", dicText = "money", dicCode = "id") @ApiModelProperty(value = "置顶标识") private java.lang.String topId; + /**审核状态*/ + @Excel(name = "审核状态", width = 15) + @ApiModelProperty(value = "审核状态") + private java.lang.Integer state; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/mapper/AtTrendsMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/mapper/AtTrendsMapper.java index e02b861..ae02305 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/mapper/AtTrendsMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/mapper/AtTrendsMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 动态信息 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface AtTrendsMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java index bf7c1c2..1dc20c6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/IAtTrendsService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 动态信息 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ public interface IAtTrendsService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.java index 289a9e1..4026319 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/service/impl/AtTrendsServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 动态信息 * @Author: jeecg-boot - * @Date: 2024-09-20 + * @Date: 2024-09-25 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/AtTrendsList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/AtTrendsList.vue index fb983e8..439e08b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/AtTrendsList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/AtTrendsList.vue @@ -209,6 +209,11 @@ align:"center", dataIndex: 'topId_dictText' }, + { + title:'审核状态', + align:"center", + dataIndex: 'state' + }, { title: '操作', dataIndex: 'action', @@ -256,6 +261,7 @@ fieldList.push({type:'switch',value:'isCard',text:'名片/帖子'}) fieldList.push({type:'switch',value:'isPay',text:'是否付费'}) fieldList.push({type:'sel_search',value:'topId',text:'置顶标识',dictTable:"at_top_price", dictText:'money', dictCode:'id'}) + fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue index 9510fa1..9b8d02f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue @@ -48,6 +48,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue3/AtTrends.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue3/AtTrends.data.ts index e8d0587..fba74be 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue3/AtTrends.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue3/AtTrends.data.ts @@ -60,6 +60,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'topId_dictText' }, + { + title: '审核状态', + align:"center", + dataIndex: 'state' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -164,4 +169,9 @@ export const formSchema: FormSchema[] = [ dict:"at_top_price,money,id" }, }, + { + label: '审核状态', + field: 'state', + component: 'InputNumber', + }, ]; 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 519e83d..726725d 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 @@ -7,8 +7,8 @@ import lombok.Data; public class MyReleasePageBean { - @ApiModelProperty(value = "0帖子1名片" ) - private Integer state; + @ApiModelProperty(value = "0帖子1名片2作品" ) + private Integer type; /**显示条数*/ @ApiModelProperty(value = "显示条数" ) 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 eb9b873..b01f49f 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 @@ -100,6 +100,9 @@ public class InfoApiServiceImpl implements InfoApiService { //付费记录 @Resource private IAtPhoneOrderService atPhoneOrderService; + //获取代表作品 + @Resource + private IAtMasterPieceService atMasterPieceService; @@ -373,25 +376,28 @@ public class InfoApiServiceImpl implements InfoApiService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - if(bean.getState() == 0){ + if(bean.getType() == 0){ Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page pageList = atTrendsService.lambdaQuery() .eq(AtTrends::getUserId, hanHaiMember.getId()) - .eq(AtTrends::getIsCard,"N") .orderByDesc(AtTrends::getCreateTime) .page(page); return Result.OK("我的发布帖子", pageList); - }else{ + }else if(bean.getType() == 1){ Page page = new Page(bean.getPageNo(), bean.getPageSize()); Page page1 = atActorCollectionService.lambdaQuery() .eq(AtActorCollection::getUserId, hanHaiMember.getId()) .orderByDesc(AtActorCollection::getCreateTime) .page(page); return Result.OK("我的发布名片", page1); - - + }else{ + Page page = new Page(bean.getPageNo(), bean.getPageSize()); + Page page1 = atMasterPieceService.lambdaQuery() + .eq(AtMasterPiece::getUserId, hanHaiMember.getId()) + .orderByDesc(AtMasterPiece::getCreateTime) + .page(page); + return Result.OK("我的作品", page1); } - } //获取我的发布详情 @@ -466,9 +472,10 @@ public class InfoApiServiceImpl implements InfoApiService { public Result releaseTrends(String token, AtTrends atTrends){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); atTrends.setUserId(hanHaiMember.getId()); - atTrendsService.save(atTrends); + atTrends.setCreateTime(new Date()); + atTrendsService.saveOrUpdate(atTrends); //置顶支付置顶费用 - if(atTrends.getIsTop().equals("Y")){ + if(atTrends.getIsTop().equals("Y") && StringUtils.isBlank(atTrends.getId())){ //根据置顶标识查询置顶费用 AtTopPrice one = atTopPriceService.lambdaQuery() .eq(AtTopPrice::getId, atTrends.getTopId()) @@ -511,7 +518,45 @@ public class InfoApiServiceImpl implements InfoApiService { public Result releaseActorSet(String token, AtActorCollection atActorCollection){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); atActorCollection.setUserId(hanHaiMember.getId()); - atActorCollectionService.save(atActorCollection); + atActorCollectionService.saveOrUpdate(atActorCollection); + + + //置顶支付置顶费用 + if(atActorCollection.getIsTop().equals("Y") && StringUtils.isBlank(atActorCollection.getId())){ + //根据置顶标识查询置顶费用 + AtTopPrice one = atTopPriceService.lambdaQuery() + .eq(AtTopPrice::getId, atActorCollection.getTopId()) + .one(); + //获取当前置顶价格 + BigDecimal money = one.getMoney(); + //吊起微信支付 + String s = money.multiply(new BigDecimal(100)).toString(); + int i1 = Double.valueOf(s).intValue(); + + //创建推广记录订单 + AtOrder atOrder = new AtOrder(); + String id = ""+System.currentTimeMillis(); + atOrder.setId(id); + atOrder.setName(atActorCollection.getTitle()+"置顶"); + atOrder.setImage(atActorCollection.getImage()); + atOrder.setPrice(money); + atOrder.setCreateTime(new Date()); + atOrder.setUserId(hanHaiMember.getId()); + atOrder.setOrderId(atActorCollection.getId()); + atOrderService.save(atOrder); + + Object appOrder = mpWxPayService.createOrder( + "购买"+atActorCollection.getTitle()+"置顶" , + "127.0.0.1", + id, + i1, + id, + hanHaiMember.getAppletOpenid(), + "{}"); + + return Result.OK("微信支付回调成功", appOrder); + } + return Result.OK("动态发布成功"); } @@ -522,7 +567,7 @@ public class InfoApiServiceImpl implements InfoApiService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); atWorks.setUserId(hanHaiMember.getId()); atWorks.setUserImage(hanHaiMember.getHeadImage()); - iAtMasterpieceService.save(atWorks); + iAtMasterpieceService.saveOrUpdate(atWorks); return Result.OK("作品发布成功"); }