diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java index ba2f48b..a19c23a 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java @@ -176,6 +176,7 @@ public class BsMerController { } if (mer.getId() == null + || StringUtils.isBlank(mer.getOrgNo()) || mer.getMerType() == null || StringUtils.isBlank(mer.getMerName()) || StringUtils.isBlank(mer.getMerAbbreviate()) diff --git a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java index f3ffafe..79d2696 100644 --- a/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java +++ b/service/src/main/java/com/hfkj/channel/saas/SaasMerService.java @@ -97,7 +97,7 @@ public class SaasMerService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到经营范围"); } Map body = new HashMap<>(); - body.put("userNo", SaasConfig.userNo); + body.put("userNo",basisModel.getOrgNo()); body.put("email", basisModel.getRegEmail()); body.put("busiCode", "WECHAT_PAY"); body.put("merRegName", basisModel.getMerName()); diff --git a/service/src/main/java/com/hfkj/dao/BsMerMapper.java b/service/src/main/java/com/hfkj/dao/BsMerMapper.java index ceff1a3..8dd043a 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerMapper.java @@ -39,42 +39,44 @@ public interface BsMerMapper extends BsMerMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_mer (company_id, company_name, ", - "agent_id, agent_name, ", - "salesman_id, salesman_name, ", - "reg_phone, reg_name, ", - "reg_email, mer_type, ", - "mer_no, mer_name, ", - "mer_abbreviate, mer_mcc_code, ", - "mer_mcc_name, blis_url, ", - "blis_name, blis_no, ", - "blis_reg_address, blis_period_type, ", - "blis_period_start, blis_period_end, ", - "lar_name, lar_id_card, ", - "lar_id_card_portrait_img, lar_id_card_national_emblem_img, ", - "lar_id_card_address, lar_id_card_period_type, ", - "lar_id_card_period_start, lar_id_card_period_end, ", - "complete_status, mer_status, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", - "values (#{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, ", - "#{agentId,jdbcType=BIGINT}, #{agentName,jdbcType=VARCHAR}, ", - "#{salesmanId,jdbcType=BIGINT}, #{salesmanName,jdbcType=VARCHAR}, ", - "#{regPhone,jdbcType=VARCHAR}, #{regName,jdbcType=VARCHAR}, ", - "#{regEmail,jdbcType=VARCHAR}, #{merType,jdbcType=INTEGER}, ", - "#{merNo,jdbcType=VARCHAR}, #{merName,jdbcType=VARCHAR}, ", - "#{merAbbreviate,jdbcType=VARCHAR}, #{merMccCode,jdbcType=VARCHAR}, ", - "#{merMccName,jdbcType=VARCHAR}, #{blisUrl,jdbcType=VARCHAR}, ", - "#{blisName,jdbcType=VARCHAR}, #{blisNo,jdbcType=VARCHAR}, ", - "#{blisRegAddress,jdbcType=VARCHAR}, #{blisPeriodType,jdbcType=INTEGER}, ", - "#{blisPeriodStart,jdbcType=VARCHAR}, #{blisPeriodEnd,jdbcType=VARCHAR}, ", - "#{larName,jdbcType=VARCHAR}, #{larIdCard,jdbcType=VARCHAR}, ", - "#{larIdCardPortraitImg,jdbcType=VARCHAR}, #{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, ", - "#{larIdCardAddress,jdbcType=VARCHAR}, #{larIdCardPeriodType,jdbcType=INTEGER}, ", - "#{larIdCardPeriodStart,jdbcType=VARCHAR}, #{larIdCardPeriodEnd,jdbcType=VARCHAR}, ", - "#{completeStatus,jdbcType=INTEGER}, #{merStatus,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "insert into bs_mer (org_no, company_id, ", + "company_name, agent_id, ", + "agent_name, salesman_id, ", + "salesman_name, reg_phone, ", + "reg_name, reg_email, ", + "mer_type, mer_no, ", + "mer_name, mer_abbreviate, ", + "mer_mcc_code, mer_mcc_name, ", + "blis_url, blis_name, ", + "blis_no, blis_reg_address, ", + "blis_period_type, blis_period_start, ", + "blis_period_end, lar_name, ", + "lar_id_card, lar_id_card_portrait_img, ", + "lar_id_card_national_emblem_img, lar_id_card_address, ", + "lar_id_card_period_type, lar_id_card_period_start, ", + "lar_id_card_period_end, complete_status, ", + "mer_status, create_time, ", + "update_time, ext_1, ", + "ext_2, ext_3)", + "values (#{orgNo,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{companyName,jdbcType=VARCHAR}, #{agentId,jdbcType=BIGINT}, ", + "#{agentName,jdbcType=VARCHAR}, #{salesmanId,jdbcType=BIGINT}, ", + "#{salesmanName,jdbcType=VARCHAR}, #{regPhone,jdbcType=VARCHAR}, ", + "#{regName,jdbcType=VARCHAR}, #{regEmail,jdbcType=VARCHAR}, ", + "#{merType,jdbcType=INTEGER}, #{merNo,jdbcType=VARCHAR}, ", + "#{merName,jdbcType=VARCHAR}, #{merAbbreviate,jdbcType=VARCHAR}, ", + "#{merMccCode,jdbcType=VARCHAR}, #{merMccName,jdbcType=VARCHAR}, ", + "#{blisUrl,jdbcType=VARCHAR}, #{blisName,jdbcType=VARCHAR}, ", + "#{blisNo,jdbcType=VARCHAR}, #{blisRegAddress,jdbcType=VARCHAR}, ", + "#{blisPeriodType,jdbcType=INTEGER}, #{blisPeriodStart,jdbcType=VARCHAR}, ", + "#{blisPeriodEnd,jdbcType=VARCHAR}, #{larName,jdbcType=VARCHAR}, ", + "#{larIdCard,jdbcType=VARCHAR}, #{larIdCardPortraitImg,jdbcType=VARCHAR}, ", + "#{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, #{larIdCardAddress,jdbcType=VARCHAR}, ", + "#{larIdCardPeriodType,jdbcType=INTEGER}, #{larIdCardPeriodStart,jdbcType=VARCHAR}, ", + "#{larIdCardPeriodEnd,jdbcType=VARCHAR}, #{completeStatus,jdbcType=INTEGER}, ", + "#{merStatus,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsMer record); @@ -86,6 +88,7 @@ public interface BsMerMapper extends BsMerMapperExt { @SelectProvider(type=BsMerSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="org_no", property="orgNo", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), @@ -128,7 +131,7 @@ public interface BsMerMapper extends BsMerMapperExt { @Select({ "select", - "id, company_id, company_name, agent_id, agent_name, salesman_id, salesman_name, ", + "id, org_no, company_id, company_name, agent_id, agent_name, salesman_id, salesman_name, ", "reg_phone, reg_name, reg_email, mer_type, mer_no, mer_name, mer_abbreviate, ", "mer_mcc_code, mer_mcc_name, blis_url, blis_name, blis_no, blis_reg_address, ", "blis_period_type, blis_period_start, blis_period_end, lar_name, lar_id_card, ", @@ -140,6 +143,7 @@ public interface BsMerMapper extends BsMerMapperExt { }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="org_no", property="orgNo", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT), @@ -191,7 +195,8 @@ public interface BsMerMapper extends BsMerMapperExt { @Update({ "update bs_mer", - "set company_id = #{companyId,jdbcType=BIGINT},", + "set org_no = #{orgNo,jdbcType=VARCHAR},", + "company_id = #{companyId,jdbcType=BIGINT},", "company_name = #{companyName,jdbcType=VARCHAR},", "agent_id = #{agentId,jdbcType=BIGINT},", "agent_name = #{agentName,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java index b82e91b..a32ee5c 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java @@ -28,6 +28,10 @@ public class BsMerSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("bs_mer"); + if (record.getOrgNo() != null) { + sql.VALUES("org_no", "#{orgNo,jdbcType=VARCHAR}"); + } + if (record.getCompanyId() != null) { sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } @@ -186,6 +190,7 @@ public class BsMerSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("org_no"); sql.SELECT("company_id"); sql.SELECT("company_name"); sql.SELECT("agent_id"); @@ -244,6 +249,10 @@ public class BsMerSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getOrgNo() != null) { + sql.SET("org_no = #{record.orgNo,jdbcType=VARCHAR}"); + } + if (record.getCompanyId() != null) { sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } @@ -401,6 +410,7 @@ public class BsMerSqlProvider { sql.UPDATE("bs_mer"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("org_no = #{record.orgNo,jdbcType=VARCHAR}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}"); @@ -448,6 +458,10 @@ public class BsMerSqlProvider { SQL sql = new SQL(); sql.UPDATE("bs_mer"); + if (record.getOrgNo() != null) { + sql.SET("org_no = #{orgNo,jdbcType=VARCHAR}"); + } + if (record.getCompanyId() != null) { sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsMer.java b/service/src/main/java/com/hfkj/entity/BsMer.java index 3f65c97..d7ed83f 100644 --- a/service/src/main/java/com/hfkj/entity/BsMer.java +++ b/service/src/main/java/com/hfkj/entity/BsMer.java @@ -18,6 +18,11 @@ public class BsMer implements Serializable { */ private Long id; + /** + * 机构编号 + */ + private String orgNo; + /** * 公司id */ @@ -204,6 +209,14 @@ public class BsMer implements Serializable { this.id = id; } + public String getOrgNo() { + return orgNo; + } + + public void setOrgNo(String orgNo) { + this.orgNo = orgNo; + } + public Long getCompanyId() { return companyId; } @@ -513,6 +526,7 @@ public class BsMer implements Serializable { } BsMer other = (BsMer) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getOrgNo() == null ? other.getOrgNo() == null : this.getOrgNo().equals(other.getOrgNo())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName())) && (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId())) @@ -557,6 +571,7 @@ public class BsMer implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getOrgNo() == null) ? 0 : getOrgNo().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode()); result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode()); @@ -604,6 +619,7 @@ public class BsMer implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", orgNo=").append(orgNo); sb.append(", companyId=").append(companyId); sb.append(", companyName=").append(companyName); sb.append(", agentId=").append(agentId); diff --git a/service/src/main/java/com/hfkj/entity/BsMerExample.java b/service/src/main/java/com/hfkj/entity/BsMerExample.java index b4498a9..ca00d91 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerExample.java @@ -185,6 +185,76 @@ public class BsMerExample { return (Criteria) this; } + public Criteria andOrgNoIsNull() { + addCriterion("org_no is null"); + return (Criteria) this; + } + + public Criteria andOrgNoIsNotNull() { + addCriterion("org_no is not null"); + return (Criteria) this; + } + + public Criteria andOrgNoEqualTo(String value) { + addCriterion("org_no =", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotEqualTo(String value) { + addCriterion("org_no <>", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoGreaterThan(String value) { + addCriterion("org_no >", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoGreaterThanOrEqualTo(String value) { + addCriterion("org_no >=", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLessThan(String value) { + addCriterion("org_no <", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLessThanOrEqualTo(String value) { + addCriterion("org_no <=", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoLike(String value) { + addCriterion("org_no like", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotLike(String value) { + addCriterion("org_no not like", value, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoIn(List values) { + addCriterion("org_no in", values, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotIn(List values) { + addCriterion("org_no not in", values, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoBetween(String value1, String value2) { + addCriterion("org_no between", value1, value2, "orgNo"); + return (Criteria) this; + } + + public Criteria andOrgNoNotBetween(String value1, String value2) { + addCriterion("org_no not between", value1, value2, "orgNo"); + return (Criteria) this; + } + public Criteria andCompanyIdIsNull() { addCriterion("company_id is null"); return (Criteria) this;