修复代码

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="演员集表")

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;
 }

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<AtActorCollection> {

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<AtActorCollection> {

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

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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue

@@ -73,6 +73,11 @@
               <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入审核状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/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',
+  },
 ];

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="代表作品表")

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;
 }

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<AtMasterPiece> {

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<AtMasterPiece> {

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

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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/vue/modules/AtMasterPieceForm.vue

@@ -43,6 +43,11 @@
               <j-image-upload isMultiple  v-model="model.userImage" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入审核状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/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',
+  },
 ];

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="动态信息")

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;
 }

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<AtTrends> {

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<AtTrends> {

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

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
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atTrends/vue/modules/AtTrendsForm.vue

@@ -48,6 +48,11 @@
               <j-search-select-tag v-model="model.topId" dict="at_top_price,money,id"  />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <a-input-number v-model="model.state" placeholder="请输入审核状态" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/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',
+  },
 ];

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 = "显示条数" )

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<AtTrends> page = new Page<AtTrends>(bean.getPageNo(), bean.getPageSize());
             Page<AtTrends> 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<AtActorCollection> page = new Page<AtActorCollection>(bean.getPageNo(), bean.getPageSize());
             Page<AtActorCollection> page1 = atActorCollectionService.lambdaQuery()
                     .eq(AtActorCollection::getUserId, hanHaiMember.getId())
                     .orderByDesc(AtActorCollection::getCreateTime)
                     .page(page);
             return Result.OK("我的发布名片", page1);
-
-
+        }else{
+            Page<AtMasterPiece> page = new Page<AtMasterPiece>(bean.getPageNo(), bean.getPageSize());
+            Page<AtMasterPiece> 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("作品发布成功");
     }