修复bug

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-20
+ * @Date:   2024-09-23
  * @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-20
+ * @Date:   2024-09-23
  * @Version: V1.0
  */
 @Data
@@ -108,4 +108,12 @@ public class AtActorCollection implements Serializable {
 	@Excel(name = "置顶标识", width = 15)
     @ApiModelProperty(value = "置顶标识")
     private java.lang.String topId;
+	/**作品名称*/
+	@Excel(name = "作品名称", width = 15)
+    @ApiModelProperty(value = "作品名称")
+    private java.lang.String workName;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
 }

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-20
+ * @Date:   2024-09-23
  * @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-20
+ * @Date:   2024-09-23
  * @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-20
+ * @Date:   2024-09-23
  * @Version: V1.0
  */
 @Service

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

@@ -214,6 +214,16 @@
             align:"center",
             dataIndex: 'topId'
           },
+          {
+            title:'作品名称',
+            align:"center",
+            dataIndex: 'workName'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -265,6 +275,8 @@
         fieldList.push({type:'switch',value:'isUser',text:'是否本人发布'})
         fieldList.push({type:'switch',value:'isState',text:'是否验证'})
         fieldList.push({type:'string',value:'topId',text:'置顶标识',dictCode:''})
+        fieldList.push({type:'Text',value:'workName',text:'作品名称',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
         this.superFieldList = fieldList
       }
     }

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

@@ -63,6 +63,16 @@
               <a-input v-model="model.topId" placeholder="请输入置顶标识"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="作品名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workName">
+              <a-input v-model="model.workName" placeholder="请输入作品名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts

@@ -84,6 +84,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'topId'
    },
+   {
+    title: '作品名称',
+    align:"center",
+    dataIndex: 'workName'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -180,4 +190,14 @@ export const formSchema: FormSchema[] = [
     field: 'topId',
     component: 'Input',
   },
+  {
+    label: '作品名称',
+    field: 'workName',
+    component: 'Input',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
 ];

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

@@ -240,4 +240,14 @@ public class InfoApiController {
 
 
 
+    //确认推广接口
+    @ApiOperation(value="小程序-确认推广接口", notes="小程序-确认推广接口")
+    @PostMapping("/confirmPromotion")
+    public Result<?> confirmPromotion(@RequestHeader("X-Access-Token") String token, String id,String dayId)
+    {
+        return infoApiService.confirmPromotion(token,id,dayId);
+    }
+
+
+
 }

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

@@ -88,4 +88,8 @@ public interface InfoApiService {
 
     Result<?> getContact( String token, String id);
 
+
+    //确认推广接口
+    Result<?> confirmPromotion(String token, String id,String dayId);
+
 }

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

@@ -242,8 +242,29 @@ public class InfoApiServiceImpl implements InfoApiService {
 
         boolean result = hanHaiRealNameService.save(haiRealName);
 
+
+        //创建支付订单
+
+        //获取当前置顶价格
+        BigDecimal money = new BigDecimal("0.01");
+        //吊起微信支付
+        String s = money.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+
+
+        //创建支付订单
+        Object appOrder = mpWxPayService.createOrder2(
+                "实名认证" ,
+                "127.0.0.1",
+                System.currentTimeMillis()+"",
+                i1,
+                System.currentTimeMillis()+"",
+                hanHaiMember.getAppletOpenid(),
+                "{}");
+
+
         if(result){
-            return Result.OK("个人认证提交成功！");
+            return Result.OK("个人认证提交成功！",appOrder);
         }else {
             return Result.OK("个人认证提交失败！");
         }
@@ -297,8 +318,28 @@ public class InfoApiServiceImpl implements InfoApiService {
         haiRealEnterprise.setUserId(hanHaiMember.getId());
 
         Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise);
+
+
+        //获取当前置顶价格
+        BigDecimal money = new BigDecimal("0.01");
+        //吊起微信支付
+        String s = money.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+
+
+        //创建支付订单
+        Object appOrder = mpWxPayService.createOrder2(
+                "实名认证" ,
+                "127.0.0.1",
+                System.currentTimeMillis()+"",
+                i1,
+                System.currentTimeMillis()+"",
+                hanHaiMember.getAppletOpenid(),
+                "{}");
+
+
         if(result){
-            return Result.OK("企业认证提交成功！");
+            return Result.OK("个人认证提交成功！",appOrder);
         }else {
             return Result.OK("企业认证提交失败！");
         }
@@ -653,6 +694,48 @@ public class InfoApiServiceImpl implements InfoApiService {
                 idStr,
                 hanHaiMember.getAppletOpenid(),
                 "{}");
+        return Result.OK("吊起微信支付",appOrder);
+    }
+
+
+    //确认推广接口
+    @Override
+    public Result<?> confirmPromotion(String token, String id,String dayId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //查询推广记录
+        AtOrder one1 = atOrderService.lambdaQuery()
+                .eq(AtOrder::getOrderId, id)
+                .one();
+
+        AtTopPrice one = atTopPriceService.lambdaQuery()
+                .eq(AtTopPrice::getId, dayId)
+                .one();
+        if (one == null){
+            return Result.error("数据不存在");
+        }
+
+        //获取当前置顶价格
+        BigDecimal money = one.getMoney();
+        //吊起微信支付
+        String s = money.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(s).intValue();
+
+
+        //创建支付订单
+        Object appOrder = mpWxPayService.createOrder2(
+                "再次推广" ,
+                "127.0.0.1",
+                System.currentTimeMillis()+"",
+                i1,
+                System.currentTimeMillis()+"",
+                hanHaiMember.getAppletOpenid(),
+                "{}");
+
+
+
+
+
         return Result.OK("吊起微信支付",appOrder);
     }
 }