From 6a3b1ff3a160e595280152782e507e01352ff8e2 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Mon, 26 Aug 2024 23:44:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=AD=A3=E9=9D=A2=E3=80=81=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=8D=E9=9D=A2=EF=BC=89=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E4=B8=AA=E4=BA=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HanHaiRealEnterpriseController.java | 2 +- .../entity/HanHaiRealEnterprise.java | 10 ++- .../mapper/HanHaiRealEnterpriseMapper.java | 2 +- .../service/IHanHaiRealEnterpriseService.java | 2 +- .../impl/HanHaiRealEnterpriseServiceImpl.java | 2 +- .../vue/HanHaiRealEnterpriseList.vue | 14 ++++ .../vue/modules/HanHaiRealEnterpriseForm.vue | 10 +++ .../vue3/HanHaiRealEnterprise.data.ts | 26 ++++++ .../api/noticeapicontroller/InfoApiController.java | 17 ++-- .../modules/apiBean/HanHaiRealEnterpriseBean.java | 25 ++++++ .../jeecg/modules/apiBean/HanHaiRealNameBean.java | 20 +++++ .../jeecg/modules/apiservice/InfoApiService.java | 9 +- .../apiservice/impl/InfoApiServiceImpl.java | 95 ++++++++++++++++++++-- 13 files changed, 205 insertions(+), 29 deletions(-) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealEnterpriseBean.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealNameBean.java diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java index d0eecf7..528cb38 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java +++ b/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-26 * @Version: V1.0 */ @Api(tags="企业认证表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java index c1580d0..3259f4b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java +++ b/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-26 * @Version: V1.0 */ @Data @@ -66,4 +66,12 @@ 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; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java index 63fb297..6dbdcfc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java +++ b/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-26 * @Version: V1.0 */ public interface HanHaiRealEnterpriseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java index 55fae49..c0ba1de 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java +++ b/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-26 * @Version: V1.0 */ public interface IHanHaiRealEnterpriseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java index d411edd..c3d94ce 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java +++ b/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-26 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue index 46e6fc5..74d7c9b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue @@ -143,6 +143,18 @@ dataIndex: 'otherImage', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'身份证正面', + align:"center", + dataIndex: 'imageStraight', + scopedSlots: {customRender: 'imgSlot'} + }, + { + title:'身份证反面', + align:"center", + dataIndex: 'imageReverseSide', + scopedSlots: {customRender: 'imgSlot'} + }, { title: '操作', dataIndex: 'action', @@ -181,6 +193,8 @@ 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:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue index f5a8b4e..da6e782 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue @@ -23,6 +23,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts index 4748a32..c096964 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts @@ -26,6 +26,18 @@ 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, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -56,4 +68,18 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '身份证正面', + field: 'imageStraight', + component: 'JImageUpload', + componentProps:{ + }, + }, + { + label: '身份证反面', + field: 'imageReverseSide', + component: 'JImageUpload', + componentProps:{ + }, + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java index 1018290..0d38489 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/InfoApiController.java +++ b/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); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealEnterpriseBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealEnterpriseBean.java new file mode 100644 index 0000000..624cd69 --- /dev/null +++ b/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; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealNameBean.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/HanHaiRealNameBean.java new file mode 100644 index 0000000..379a37e --- /dev/null +++ b/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; +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java index 90808f5..72828fa 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java @@ -1,10 +1,7 @@ package org.jeecg.modules.apiservice; 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.hanHaiBank.entity.HanHaiBank; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -26,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); 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 0cc301a..9512f06 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 @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; -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.atPerformer.entity.AtPerformer; import org.jeecg.modules.atPerformer.service.IAtPerformerService; @@ -124,16 +121,98 @@ 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("其他资质未上传！"); + } + + Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise); + if(result){ + return Result.OK("企业认证提交成功！"); + }else { + return Result.OK("企业认证提交失败！"); + } } //获取个人认证信息 From dff4186a56e83aae1634a527c5a50f2112a7d1a2 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Tue, 27 Aug 2024 20:27:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E4=BC=81=E4=B8=9A=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=88?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=87=E5=BF=97=EF=BC=89=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E4=BC=81=E4=B8=9A=E8=AE=A4=E8=AF=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=94=A8=E6=88=B7token=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml | 4 +++- .../controller/HanHaiRealEnterpriseController.java | 2 +- .../hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java | 6 +++++- .../mapper/HanHaiRealEnterpriseMapper.java | 2 +- .../service/IHanHaiRealEnterpriseService.java | 2 +- .../service/impl/HanHaiRealEnterpriseServiceImpl.java | 2 +- .../hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue | 6 ++++++ .../vue/modules/HanHaiRealEnterpriseForm.vue | 5 +++++ .../hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts | 10 ++++++++++ .../org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java | 2 ++ .../src/main/resources/application-dev.yml | 1 + 11 files changed, 36 insertions(+), 6 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml index f1c7418..5c3932c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml +++ b/jeecg-boot-base/jeecg-boot-base-core/jeecg-boot-base-core.iml @@ -10,7 +10,9 @@ - + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java index 528cb38..babbe73 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java +++ b/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-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Api(tags="企业认证表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java index 3259f4b..da8b03f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java +++ b/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-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Data @@ -74,4 +74,8 @@ public class HanHaiRealEnterprise implements Serializable { @Excel(name = "身份证反面", width = 15) @ApiModelProperty(value = "身份证反面") private java.lang.String imageReverseSide; + /**用户标识*/ + @Excel(name = "用户标识", width = 15) + @ApiModelProperty(value = "用户标识") + private java.lang.String userId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java index 6dbdcfc..ba51dd9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java +++ b/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-26 + * @Date: 2024-08-27 * @Version: V1.0 */ public interface HanHaiRealEnterpriseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java index c0ba1de..e06b958 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java +++ b/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-26 + * @Date: 2024-08-27 * @Version: V1.0 */ public interface IHanHaiRealEnterpriseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java index c3d94ce..240e06c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java +++ b/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-26 + * @Date: 2024-08-27 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue index 74d7c9b..a7171ce 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue @@ -155,6 +155,11 @@ dataIndex: 'imageReverseSide', scopedSlots: {customRender: 'imgSlot'} }, + { + title:'用户标识', + align:"center", + dataIndex: 'userId' + }, { title: '操作', dataIndex: 'action', @@ -195,6 +200,7 @@ 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 } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue index da6e782..f326973 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue @@ -33,6 +33,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts index c096964..b24e482 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts @@ -38,6 +38,11 @@ export const columns: BasicColumn[] = [ dataIndex: 'imageReverseSide', customRender:render.renderAvatar, }, + { + title: '用户标识', + align:"center", + dataIndex: 'userId' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -82,4 +87,9 @@ export const formSchema: FormSchema[] = [ componentProps:{ }, }, + { + label: '用户标识', + field: 'userId', + component: 'Input', + }, ]; 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 9512f06..4e595c8 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 @@ -207,6 +207,8 @@ public class InfoApiServiceImpl implements InfoApiService { return Result.OK("其他资质未上传！"); } + haiRealEnterprise.setUserId(hanHaiMember.getId()); + Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise); if(result){ return Result.OK("企业认证提交成功！"); diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index b856d2e..e157a38 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/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: #开启增强配置 From 349534c401deb4f76cc87579ce4f3d0b0f6c0a7e Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Thu, 29 Aug 2024 10:43:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E9=93=B6=E8=A1=8C=E5=8D=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E5=86=85=E5=AE=B9=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=EF=BC=9B2=E3=80=81=E8=8E=B7=E5=8F=96=E9=93=B6?= =?UTF-8?q?=E8=A1=8C=E5=8D=A1=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=86=85=E5=AE=B9=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/impl/InfoApiServiceImpl.java | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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 4e595c8..93ad1c2 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 @@ -80,7 +80,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("银行卡添加失败！"); + } + } @@ -88,7 +108,13 @@ public class InfoApiServiceImpl implements InfoApiService { //获取银行卡列表带分页 @Override public Result getBankCardPage(String token, HanHaiBankBean bean){ - return Result.OK(); + Page page = new Page<>(bean.getPageNo(),bean.getPageSize()); + Page pageList = hanHaiBankService + .lambdaQuery() + .orderByDesc(HanHaiBank::getCreateTime) + .page(page); + + return Result.OK("银行卡列表", pageList); }