diff --git a/db/2022-1-4变更.sql b/db/2022-1-4变更.sql index cf708f3c..e2286e07 100644 --- a/db/2022-1-4变更.sql +++ b/db/2022-1-4变更.sql @@ -28,3 +28,19 @@ ALTER TABLE `pay_meeting` MODIFY COLUMN `council_id` varchar(50) NULL DEFAULT NULL COMMENT '理事会项目id' AFTER `standards_id`, MODIFY COLUMN `council_name` varchar(50) NULL DEFAULT NULL COMMENT '理事会项目名称' AFTER `council_id`; +create table wx_secret +( + login_type varchar(255) null, + secret varchar(255) null +); +INSERT INTO wx_secret (login_type, secret) VALUES ('dev', 'db3482f68206b077ca67041f47462c3229d22c277308d96c02c72a128aee0f3fdd05ac2f70d22539'); +INSERT INTO wx_secret (login_type, secret) VALUES ('prod', '51daf9829b6b487f99693a2032cda10abde40319b6ffdc61886b921e7eaa40c5ae3e49a5b13a2a31'); +-- 2022-1-24新增 +ALTER TABLE `pay_meeting` + MODIFY COLUMN `meeting_content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '会议内容' AFTER `estimated_number`; + +-- 2022-2-12 +INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1492310294221639681', '1431145150766923778', '证书费用', '20', '', 20, 1, 'LKGLZ', '2022-02-12 09:31:14' ); +ALTER TABLE `income_payments`.`tb_certificate_payment` + MODIFY COLUMN `charge_use` tinyint(1) NULL DEFAULT 20 COMMENT '来款用途（字典表）' AFTER `mail`; +update tb_certificate_payment set charge_use = 20 where 1 = 1; \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java index 5dca42f2..802687f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/aspect/annotation/CompanyNameTranslate.java @@ -23,5 +23,5 @@ public @interface CompanyNameTranslate { /** * 拼接内容 */ - String splicing() default " (待审核)"; + String splicing() default " (未审核)"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 7249940e..4f7fbb3c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -35,6 +35,7 @@ import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.temporary.common.PayCompanyManagementTemporaryCommon; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -43,6 +44,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.math.BigDecimal; import java.util.List; @@ -182,7 +184,16 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCompanyManagement)){ throw new JeroBootException("企业不存在！"); } - projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName()); + if(Objects.equals(payCompanyManagement.getStatus(), PayCompanyManagementTemporaryCommon.STATUS2)){ + projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName() + PayCompanyManagementTemporaryCommon.CHECK); + }else{ + projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName()); + } + projectDetailVO.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagement.getCompanyPhone())); + projectDetailVO.setDutyCode(payCompanyManagement.getDutyCode()); + projectDetailVO.setBankAccountName(payCompanyManagement.getBankAccountName()); + projectDetailVO.setBankAccount(payCompanyManagement.getBankAccount()); + projectDetailVO.setOpeningBank(payCompanyManagement.getOpeningBank()); projectDetailVO.setPostalCodeCompany(payCompanyManagement.getPostalCode()); projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress()); PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId()); @@ -209,9 +220,15 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCompanyManagementTemporary)){ throw new JeroBootException("企业不存在！"); } + projectDetailVO.setCompanyName(payCompanyManagementTemporary.getCompanyName()); projectDetailVO.setPostalCodeCompany(payCompanyManagementTemporary.getPostalCode()); projectDetailVO.setCompanyAddress(payCompanyManagementTemporary.getCompanyAddress()); + projectDetailVO.setCompanyPhone(PasswordUtil.decrypt(payCompanyManagementTemporary.getCompanyPhone())); + projectDetailVO.setDutyCode(payCompanyManagementTemporary.getDutyCode()); + projectDetailVO.setBankAccountName(payCompanyManagementTemporary.getBankAccountName()); + projectDetailVO.setBankAccount(payCompanyManagementTemporary.getBankAccount()); + projectDetailVO.setOpeningBank(payCompanyManagementTemporary.getOpeningBank()); PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId()); if(Objects.isNull(payContactsManagementTemporary)){ throw new JeroBootException("联系人不存在！"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java index 233feb03..9f91ba1c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java @@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; @@ -91,6 +93,21 @@ public class ProjectDetailVO implements Serializable { @ApiModelProperty(value = "企业地址") private String companyAddress; + @ApiModelProperty(value = "公司电话") + private String companyPhone; + + @ApiModelProperty(value = "信用代码") + private String dutyCode; + + @ApiModelProperty(value = "银行户名") + private String bankAccountName; + + @ApiModelProperty(value = "开户行") + private String openingBank; + + @ApiModelProperty(value = "银行账号") + private String bankAccount; + /** * 企业联系人 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 9f6592a1..d9c678e7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -14,6 +14,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; +import com.jero.company.entity.WxSecret; +import com.jero.company.mapper.WxSecretMapper; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.vo.CompanyLoginVO; @@ -61,6 +63,8 @@ public class CompanyLoginController { private ISysDictService sysDictService; @Resource private BaseCommonService baseCommonService; + @Resource + private WxSecretMapper wxSecretMapper; @Value("${defaultPassword}") private String defaultPassword; /** @@ -257,7 +261,12 @@ public class CompanyLoginController { */ @ApiOperation("微信登录凭证校验") @GetMapping(value = "/jscode2session") - public Result jscode2session(Jscode2sessionVO jscode2sessionVO) { + public Result jscode2session(Jscode2sessionVO jscode2sessionVO,String type) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("login_type",type); + WxSecret wxSecret = wxSecretMapper.selectOne(wrapper); + String secret = PasswordUtil.decrypt(wxSecret.getSecret()); + jscode2sessionVO.setSecret(secret); Map hashMap = JSONObject.parseObject(JSONObject.toJSONString(jscode2sessionVO), Map.class); String result = HttpUtil.get("https://api.weixin.qq.com/sns/jscode2session",hashMap); return Result.OK(JSONObject.parseObject(result)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java index 41205abd..06d28c0c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.jero.common.aspect.annotation.Dict; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -78,7 +79,7 @@ public class PayContactsManagement implements Serializable { @Excel(name = "手机号", width = 15) @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号格式错误") private String phone; /**邮箱*/ @Excel(name = "邮箱", width = 15) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/WxSecret.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/WxSecret.java new file mode 100644 index 00000000..302e5445 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/entity/WxSecret.java @@ -0,0 +1,19 @@ +package com.jero.company.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * @author liJiaRao + * @date 2022-01-19 13:56 + */ +@Data +@TableName(value = "wx_secret") +public class WxSecret { + @TableField(value = "login_type") + private String loginType; + + @TableField(value = "secret") + private String secret; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/WxSecretMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/WxSecretMapper.java new file mode 100644 index 00000000..a94fab5e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/WxSecretMapper.java @@ -0,0 +1,11 @@ +package com.jero.company.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.company.entity.WxSecret; + +/** + * @author liJiaRao + * @date 2022-01-19 13:56 + */ +public interface WxSecretMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/WxSecretMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/WxSecretMapper.xml new file mode 100644 index 00000000..3aab1292 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/WxSecretMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + login_type, secret + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java index fe67691f..0a3d689e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyLoginVO.java @@ -2,6 +2,7 @@ package com.jero.company.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; +import com.jero.common.util.superSearch.ConstantUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -19,7 +20,7 @@ public class CompanyLoginVO { /**手机号*/ @ApiModelProperty(value = "手机号") @NotEmpty(message = "手机号不能为空！") - @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") + @Pattern(regexp = ConstantUtils.TEL_PHONE,message = "手机号码格式错误") private String phone; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java index 5f895a72..18cc16d1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java @@ -163,7 +163,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName()); PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); @@ -173,7 +173,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayIncomeContract::getContractName,payIncomeContract.getContractName()); PayIncomeContract payIncomeContractNew = payIncomeContractService.getOne(query); @@ -294,7 +294,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl queryPayIncomeContractInstallment = new LambdaQueryWrapper<>(); queryPayIncomeContractInstallment.eq(PayIncomeContractInstallment::getContractId,payIncomeContract.getId()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 1e518f36..e295065a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -45,7 +45,7 @@ order by pe.create_time desc - SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name + SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name from pay_case_committee pe left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) @@ -94,7 +94,7 @@ - SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name + SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(未审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name from pay_case_council pe left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id) @@ -85,7 +85,7 @@