Merge branch 'dev' of http://175.178.51.79:3000/lzx/hanhai-a-notice-api into dev

jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml

@@ -10,7 +10,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="Entities" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 企业认证表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-08-27
  * @Version: V1.0
  */
 @Api(tags="企业认证表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业认证表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-08-27
  * @Version: V1.0
  */
 @Data
@@ -66,4 +66,16 @@ public class HanHaiRealEnterprise implements Serializable {
 	@Excel(name = "其他资质", width = 15)
     @ApiModelProperty(value = "其他资质")
     private java.lang.String otherImage;
+	/**身份证正面*/
+	@Excel(name = "身份证正面", width = 15)
+    @ApiModelProperty(value = "身份证正面")
+    private java.lang.String imageStraight;
+	/**身份证反面*/
+	@Excel(name = "身份证反面", width = 15)
+    @ApiModelProperty(value = "身份证反面")
+    private java.lang.String imageReverseSide;
+	/**用户标识*/
+	@Excel(name = "用户标识", width = 15)
+    @ApiModelProperty(value = "用户标识")
+    private java.lang.String userId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业认证表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-08-27
  * @Version: V1.0
  */
 public interface HanHaiRealEnterpriseMapper extends BaseMapper<HanHaiRealEnterprise> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 企业认证表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-08-27
  * @Version: V1.0
  */
 public interface IHanHaiRealEnterpriseService extends IService<HanHaiRealEnterprise> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 企业认证表
  * @Author: jeecg-boot
- * @Date:   2024-08-25
+ * @Date:   2024-08-27
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue

@@ -143,6 +143,23 @@
             dataIndex: 'otherImage',
             scopedSlots: {customRender: 'imgSlot'}
           },
+          {
+            title:'身份证正面',
+            align:"center",
+            dataIndex: 'imageStraight',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'身份证反面',
+            align:"center",
+            dataIndex: 'imageReverseSide',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'用户标识',
+            align:"center",
+            dataIndex: 'userId'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -181,6 +198,9 @@
         fieldList.push({type:'string',value:'card',text:'法人身份证',dictCode:''})
         fieldList.push({type:'string',value:'tradeImage',text:'营业执照',dictCode:''})
         fieldList.push({type:'string',value:'otherImage',text:'其他资质',dictCode:''})
+        fieldList.push({type:'string',value:'imageStraight',text:'身份证正面',dictCode:''})
+        fieldList.push({type:'string',value:'imageReverseSide',text:'身份证反面',dictCode:''})
+        fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue

@@ -23,6 +23,21 @@
               <j-image-upload isMultiple  v-model="model.otherImage" ></j-image-upload>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证正面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageStraight">
+              <j-image-upload isMultiple  v-model="model.imageStraight" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="身份证反面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageReverseSide">
+              <j-image-upload isMultiple  v-model="model.imageReverseSide" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <a-input v-model="model.userId" placeholder="请输入用户标识"  ></a-input>
+            </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/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts

@@ -26,6 +26,23 @@ export const columns: BasicColumn[] = [
     dataIndex: 'otherImage',
     customRender:render.renderAvatar,
    },
+   {
+    title: '身份证正面',
+    align:"center",
+    dataIndex: 'imageStraight',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '身份证反面',
+    align:"center",
+    dataIndex: 'imageReverseSide',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '用户标识',
+    align:"center",
+    dataIndex: 'userId'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -56,4 +73,23 @@ export const formSchema: FormSchema[] = [
      componentProps:{
       },
   },
+  {
+    label: '身份证正面',
+    field: 'imageStraight',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '身份证反面',
+    field: 'imageReverseSide',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '用户标识',
+    field: 'userId',
+    component: 'Input',
+  },
 ];

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

@@ -5,10 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.apiBean.HanHaiBankBean;
-import org.jeecg.modules.apiBean.HanHaiWaterBean;
-import org.jeecg.modules.apiBean.MyReleasePageBean;
-import org.jeecg.modules.apiBean.PromotionPageBean;
+import org.jeecg.modules.apiBean.*;
 import org.jeecg.modules.apiservice.InfoApiService;
 import org.jeecg.modules.hanHaiBank.entity.HanHaiBank;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -142,22 +139,22 @@ public class InfoApiController {
 
 
 
-
-
     //个人认证提交
     @ApiOperation(value="小程序-个人认证提交", notes="小程序-个人认证提交")
     @GetMapping("/submitCertification")
-    public Result<?> submitCertification(@RequestHeader("X-Access-Token") String token)
+    public Result<?> submitCertification(@RequestHeader("X-Access-Token") String token, HanHaiRealNameBean hanHaiRealNameBean)
     {
-        return Result.OK();
+        return infoApiService.submitCertification(token,hanHaiRealNameBean);
     }
 
+
+
     //企业认证提交
     @ApiOperation(value="小程序-企业认证提交", notes="小程序-企业认证提交")
     @GetMapping("/submitCompanyCertification")
-    public Result<?> submitCompanyCertification(@RequestHeader("X-Access-Token") String token)
+    public Result<?> submitCompanyCertification(@RequestHeader("X-Access-Token") String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean)
     {
-        return Result.OK();
+        return infoApiService.submitCompanyCertification(token,hanHaiRealEnterpriseBean);
     }
 
 

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

@@ -0,0 +1,25 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HanHaiRealEnterpriseBean {
+    @ApiModelProperty(value = "身份证正面照片" )
+    String imageStraight;
+
+    @ApiModelProperty(value = "身份证反面照片" )
+    String imageReverseSide;
+
+    @ApiModelProperty(value = "法人真实姓名" )
+    String name;
+
+    @ApiModelProperty(value = "法人身份证号" )
+    String card;
+
+    @ApiModelProperty(value = "营业执照" )
+    String tradeImage;
+
+    @ApiModelProperty(value = "其他资质" )
+    String otherImage;
+}

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

@@ -0,0 +1,20 @@
+package org.jeecg.modules.apiBean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HanHaiRealNameBean {
+
+    @ApiModelProperty(value = "身份证正面照片" )
+    String imageStraight;
+
+    @ApiModelProperty(value = "身份证反面照片" )
+    String imageReverseSide;
+
+    @ApiModelProperty(value = "姓名" )
+    String name;
+
+    @ApiModelProperty(value = "身份证号" )
+    String card;
+}

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

@@ -23,10 +23,10 @@ public interface InfoApiService {
 
 
     //个人认证提交
-    Result<?> submitCertification(String token);
+    Result<?> submitCertification(String token, HanHaiRealNameBean hanHaiRealNameBean);
 
     //企业认证提交
-    Result<?> submitCompanyCertification(String token);
+    Result<?> submitCompanyCertification(String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean);
 
     //获取个人认证信息
     Result<?> getCertification(String token);

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

@@ -99,7 +99,27 @@ public class InfoApiServiceImpl implements InfoApiService {
     //添加银行卡
     @Override
     public Result<?> addBankCard(String token, HanHaiBank bean){
-        return Result.OK();
+
+        String bankId = bean.getBankId();
+        String name = bean.getName();
+        String card = bean.getCard();
+
+        if(null == bankId){
+            return Result.OK("银行卡号未上传！");
+        }else if(null == name){
+            return Result.OK("姓名未上传！");
+        }else if(null == card){
+            return Result.OK("身份证号未上传！");
+        }
+
+        boolean result = hanHaiBankService.save(bean);
+
+        if(result){
+            return Result.OK("银行卡添加成功！");
+        }else {
+            return Result.OK("银行卡添加失败！");
+        }
+
     }
 
 
@@ -107,7 +127,13 @@ public class InfoApiServiceImpl implements InfoApiService {
     //获取银行卡列表带分页
     @Override
     public Result<?> getBankCardPage(String token, HanHaiBankBean bean){
-        return Result.OK();
+        Page<HanHaiBank> page = new Page<>(bean.getPageNo(),bean.getPageSize());
+        Page<HanHaiBank> pageList = hanHaiBankService
+                .lambdaQuery()
+                .orderByDesc(HanHaiBank::getCreateTime)
+                .page(page);
+
+        return Result.OK("银行卡列表", pageList);
     }
 
 
@@ -140,16 +166,100 @@ public class InfoApiServiceImpl implements InfoApiService {
 
     //个人认证提交
     @Override
-    public Result<?> submitCertification(String token){
+    public Result<?> submitCertification(String token, HanHaiRealNameBean hanHaiRealNameBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
-        return Result.OK();
+
+        String imageStraight = hanHaiRealNameBean.getImageStraight();
+        String imageReverseSide = hanHaiRealNameBean.getImageReverseSide();
+        String name = hanHaiRealNameBean.getName();
+        String card = hanHaiRealNameBean.getCard();
+
+        HanHaiRealName haiRealName = new HanHaiRealName();
+        if(null != imageStraight){
+            haiRealName.setImageStraight(imageStraight);
+        }else{
+            return Result.OK("身份证正面照未上传！");
+        }
+        if(null != imageReverseSide){
+            haiRealName.setImageReverseSide(imageReverseSide);
+        }else{
+            return Result.OK("身份证反面照未上传！");
+        }
+        if(null != name){
+            haiRealName.setName(name);
+        }else{
+            return Result.OK("姓名未上传！");
+        }
+        if(null != card){
+            haiRealName.setName(card);
+        }else{
+            return Result.OK("身份证号码未上传！");
+        }
+
+        haiRealName.setUserId(hanHaiMember.getId());
+
+        boolean result = hanHaiRealNameService.save(haiRealName);
+
+        if(result){
+            return Result.OK("个人认证提交成功！");
+        }else {
+            return Result.OK("个人认证提交失败！");
+        }
+
     }
 
     //企业认证提交
     @Override
-    public Result<?> submitCompanyCertification(String token){
+    public Result<?> submitCompanyCertification(String token, HanHaiRealEnterpriseBean hanHaiRealEnterpriseBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
-        return Result.OK();
+
+        String imageStraight = hanHaiRealEnterpriseBean.getImageStraight();
+        String imageReverseSide = hanHaiRealEnterpriseBean.getImageReverseSide();
+        String name = hanHaiRealEnterpriseBean.getName();
+        String card = hanHaiRealEnterpriseBean.getCard();
+        String tradeImage = hanHaiRealEnterpriseBean.getTradeImage();
+        String otherImage = hanHaiRealEnterpriseBean.getOtherImage();
+
+        HanHaiRealEnterprise haiRealEnterprise = new HanHaiRealEnterprise();
+        if(null != imageStraight){
+            haiRealEnterprise.setImageStraight(imageStraight);
+        }else {
+            return Result.OK("身份证正面照未上传！");
+        }
+        if(null != imageReverseSide){
+            haiRealEnterprise.setImageReverseSide(imageReverseSide);
+        }else {
+            return Result.OK("身份证反面照未上传！");
+        }
+        if(null != name){
+            haiRealEnterprise.setName(name);
+        }else{
+            return Result.OK("法人真实姓名未上传！");
+        }
+        if(null != card){
+            haiRealEnterprise.setName(card);
+        }else{
+            return Result.OK("法人身份证号码未上传！");
+        }
+        if(null != card){
+            haiRealEnterprise.setTradeImage(tradeImage);
+        }else{
+            return Result.OK("营业执照未上传！");
+        }
+        if(null != card){
+            haiRealEnterprise.setOtherImage(otherImage);
+        }else{
+            return Result.OK("其他资质未上传！");
+        }
+
+        haiRealEnterprise.setUserId(hanHaiMember.getId());
+
+        Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise);
+        if(result){
+            return Result.OK("企业认证提交成功！");
+        }else {
+            return Result.OK("企业认证提交失败！");
+        }
     }
 
     //获取个人认证信息

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -270,6 +270,7 @@ cas:
 logging:
   level:
     org.jeecg.modules.system.mapper : info
+    org.jeecg.modules : debug
 #swagger
 knife4j:
   #开启增强配置