From a8d960cfe0052992a4cb45d2607c46c82245c29b Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 17 Aug 2022 11:27:45 +0800 Subject: [PATCH] // add bank --- .../iformall/controller/EnumController.java | 13 --------- ...xProfitSharingReceiverApplyController.java | 25 ++++++++++++++--- .../EnumSharingReceiverOrganizationType.java | 28 +++++++++---------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java b/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java index f1ff79510..2f2bb45c9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/EnumController.java @@ -61,17 +61,4 @@ public class EnumController { } - @ApiOperation(value="个体户行业属性及特殊资质", notes="个体户行业属性及特殊资质") - @GetMapping("/getQualificationGth") - public ResultData getQualificationGth() { - return new ResultData(EnumSharingReceiverQualificationGth.getList()); - } - - @ApiOperation(value="企业属性及特殊资质", notes="企业属性及特殊资质") - @GetMapping("/getQualificationQy") - public ResultData getQualificationQy() { - return new ResultData(EnumSharingReceiverQualificationQy.getList()); - - } - } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java index 0be82d273..922ba7db2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java @@ -6,10 +6,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.domain.po.WxProfitSharingReceiverApply; import com.iformall.douyin.pay.enums.MerchantImportStatus; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumMerchantStatus; -import com.iformall.enums.EnumProfitSharingType; -import com.iformall.enums.EnumSharingReceiverApplymentState; +import com.iformall.enums.*; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverApplyService; import com.iformall.service.WxProfitSharingReceiverService; @@ -92,4 +89,24 @@ public class WxProfitSharingReceiverApplyController extends BaseController { return new ResultData(receiverApply); } + @ApiOperation("获取行业属性及特殊资质") + @GetMapping("/getQualification") + public ResultData getQualification(Integer organizationType) { + log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::getQualification"); + if(organizationType == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "主体类型不能为空"); + } + EnumSharingReceiverOrganizationType enumOrganizationType = EnumSharingReceiverOrganizationType.getEnum(organizationType); + if(enumOrganizationType == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "主体类型不符合规范"); + } + if(EnumSharingReceiverOrganizationType.GETI.equals(enumOrganizationType)){ + return new ResultData(EnumSharingReceiverQualificationGth.getList()); + }else if(EnumSharingReceiverOrganizationType.QIYE.equals(enumOrganizationType)){ + return new ResultData(EnumSharingReceiverQualificationQy.getList()); + }else{ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "主体类型暂不支持"); + } + } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverOrganizationType.java b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverOrganizationType.java index dd66a78ef..5e7e076e2 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverOrganizationType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSharingReceiverOrganizationType.java @@ -1,24 +1,22 @@ package com.iformall.enums; /** - * 进件店铺 主体类型 - * 2401:小微商户,指无营业执照的个人商家。 - * 2500:个人卖家,指无营业执照,已持续从事电子商务经营活动满6个月,且期间经营收入累计超过20万元的个人商家。(若选择该主体,请在“补充说明”填写相关描述)。 - * 4:个体工商户,营业执照上的主体类型一般为个体户、个体工商户、个体经营。 - * 2:企业,营业执照上的主体类型一般为有限公司、有限责任公司。 - * 3:事业单位,包括国内各类事业单位,如:医疗、教育、学校等单位。 - * 2502:政府机关,包括各级、各类政府机关,如机关党委、税务、民政、人社、工商、商务、市监等。 - * 1708:社会组织,包括社会团体、民办非企业、基金会、基层群众性自治组织、农村集体经济组织等组织。 + * 进件特约商户 主体类型 + * SUBJECT_TYPE_INDIVIDUAL(个体户):营业执照上的主体类型一般为个体户、个体工商户、个体经营; + * SUBJECT_TYPE_ENTERPRISE(企业):营业执照上的主体类型一般为有限公司、有限责任公司; + * SUBJECT_TYPE_GOVERNMENT (政府机关):包括各级、各类政府机关,如机关党委、税务、民政、人社、工商、商务、市监等; + * SUBJECT_TYPE_INSTITUTIONS(事业单位):包括国内各类事业单位,如:医疗、教育、学校等单位; + * SUBJECT_TYPE_OTHERS(社会组织): 包括社会团体、民办非企业、基金会、基层群众性自治组织、农村集体经济组织等组织。 */ public enum EnumSharingReceiverOrganizationType { - XIAOWEI(2401, "2401", "小微商户"), - GEREN(2500, "2500", "个人卖家"), - GETI(4, "4", "个体工商户"), - QIYE(2, "2", "企业"), - SHIYE(3, "3", "事业单位"), - ZHENGFU(2502, "2502", "政府机关"), - SHEHUI(1708, "1708", "社会组织"), +// XIAOWEI(2401, "2401", "小微商户"), +// GEREN(2500, "2500", "个人卖家"), + GETI(4, "SUBJECT_TYPE_INDIVIDUAL", "个体工商户"), + QIYE(2, "SUBJECT_TYPE_ENTERPRISE", "企业"), + SHIYE(3, "SUBJECT_TYPE_INSTITUTIONS", "事业单位"), + ZHENGFU(2502, "SUBJECT_TYPE_GOVERNMENT", "政府机关"), + SHEHUI(1708, "SUBJECT_TYPE_OTHERS", "社会组织"), ; public static EnumSharingReceiverOrganizationType getEnum(Integer code) {