Commit 2438b614 authored by 33's avatar 33

fix BUG

parent ca2f25d2
...@@ -4,7 +4,7 @@ FROM java:8 ...@@ -4,7 +4,7 @@ FROM java:8
COPY localtime /etc/ COPY localtime /etc/
RUN echo 'Asia/Shanghai' >/etc/timezone RUN echo 'Asia/Shanghai' >/etc/timezone
ADD joying-portal-1.0.0.jar app.jar ADD joying-portal-1.1.0.jar app.jar
EXPOSE 8001 EXPOSE 8001
# -Dspring.profiles.active=sit 等号后面表示使用application-sit.yml,修改该项使用其他配置文件 # -Dspring.profiles.active=sit 等号后面表示使用application-sit.yml,修改该项使用其他配置文件
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=sit", "-jar", "/app.jar"] ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=sit", "-jar", "/app.jar"]
...@@ -80,6 +80,9 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper, ...@@ -80,6 +80,9 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
private UserService userService; private UserService userService;
@Resource @Resource
private AuthPersonService authPersonService;
@Resource
private NftService nftService; private NftService nftService;
@Resource @Resource
...@@ -118,6 +121,10 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper, ...@@ -118,6 +121,10 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
if (nft == null || !nft.getUserId().equals(user.getId())) { if (nft == null || !nft.getUserId().equals(user.getId())) {
throw GlobalException.newException(ResultCode.FAILED, "请先确认此nft的有效性"); throw GlobalException.newException(ResultCode.FAILED, "请先确认此nft的有效性");
} }
AuthPerson authPerson = authPersonService.getByUserId(user.getId());
if (authPerson == null) {
throw GlobalException.newException(ResultCode.UNAUTHORIZED, "申请人尚未实名认证");
}
// 如果发表状态是已发表的话,需要传入首次发表日期和省市 // 如果发表状态是已发表的话,需要传入首次发表日期和省市
if (SystemConstant.BOOLEAN_DATA_TRUE.equals(copyrightDTO.getPublishState()) && if (SystemConstant.BOOLEAN_DATA_TRUE.equals(copyrightDTO.getPublishState()) &&
(copyrightDTO.getFirstPublishDate() == null || (copyrightDTO.getFirstPublishDate() == null ||
...@@ -128,7 +135,7 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper, ...@@ -128,7 +135,7 @@ public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper,
// 首次提交,登记状态为待支付 // 首次提交,登记状态为待支付
copyrightApply.setRegisterState(CopyrightApplyState.TO_BE_PAY.getCode()); copyrightApply.setRegisterState(CopyrightApplyState.TO_BE_PAY.getCode());
copyrightApply.setUserId(user.getId()); copyrightApply.setUserId(user.getId());
copyrightApply.setApplyName(user.getAuthPerson().getName()); copyrightApply.setApplyName(authPerson.getName());
copyrightApply.setApplyTime(new Date()); copyrightApply.setApplyTime(new Date());
try { try {
save(copyrightApply); save(copyrightApply);
......
...@@ -43,7 +43,7 @@ ALTER TABLE `tb_copyright_apply` ...@@ -43,7 +43,7 @@ ALTER TABLE `tb_copyright_apply`
ADD COLUMN `register_owner` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登记证书人名称,在版权登记审核通过后生成' AFTER `register_code`; ADD COLUMN `register_owner` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登记证书人名称,在版权登记审核通过后生成' AFTER `register_code`;
ALTER TABLE `tb_copyright_apply` ALTER TABLE `tb_copyright_apply`
ADD COLUMN `register_time` datetime NULL DEFAULT NULL COMMENT '登记证书时间,在版权登记审核通过后生成' AFTER `register_owner`; ADD COLUMN `register_time` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登记证书时间,在版权登记审核通过后生成' AFTER `register_owner`;
ALTER TABLE `tb_copyright_apply_owner_relation` ALTER TABLE `tb_copyright_apply_owner_relation`
CHARACTER SET = utf8mb4, CHARACTER SET = utf8mb4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment