转档模块 优化转档失败逻辑，增加日志打印

支付模块 将支付宝跳转路径修改回17pdf.com

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/AlipayServiceImpl.java

@@ -81,7 +81,7 @@ public class AlipayServiceImpl implements AlipayService {
             request = new AlipayTradeAppPayRequest();
         }
 //        AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
-        String outUrl = CommonBusinessUtils.getOutUrl();
+//        String outUrl = CommonBusinessUtils.getOutUrl();
         String property = "";
         if(CommonEnum.SubscriptionTypeEnum.SET_PRICING.value().equals(subscription.getTargetType())){
             property = config.getProperty("ali.pay.setPricingReturnUrl");
@@ -90,9 +90,9 @@ public class AlipayServiceImpl implements AlipayService {
         }else{
             property = config.getProperty("ali.pay.returnUrl");
         }
-        if(StringUtils.isNotBlank(outUrl)){
-            property = property.replace(rightUrl,outUrl);
-        }
+//        if(StringUtils.isNotBlank(outUrl)){
+//            property = property.replace(rightUrl,outUrl);
+//        }
         request.setReturnUrl(property);
         //设置回调return_url、响应url
         request.setNotifyUrl(config.getProperty("ali.pay.notifyUrl"));

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/AuthServiceImpl.java

@@ -224,11 +224,11 @@ public class AuthServiceImpl implements AuthService {
                 if(!CommonBusinessUtils.verifyBlackEmail(receiver)) {
                     //忘记密码时邮箱验证 发送重置密码邮件
                     if (CaptchaActionEnum.FORGET_PASSWORD.value().equals(action.value())) {
-                        //todo 上线后再改回来，不再使用cn.17pdf.com
-                        String outUrl = CommonBusinessUtils.getOutUrl();
-                        if (StringUtils.isNotBlank(outUrl)) {
-                            url = outUrl;
-                        }
+//                        // 上线后再改回来，不再使用cn.17pdf.com
+//                        String outUrl = CommonBusinessUtils.getOutUrl();
+//                        if (StringUtils.isNotBlank(outUrl)) {
+//                            url = outUrl;
+//                        }
                         String content = String.format(CommonConstant.resetPasswordEmailTemplate, url + "resetPsw?verifyCode=" + code + "&account=" + receiver);
                         flag = emailUtils.sendMail(action.subject(), content, Collections.singletonList(receiver));
                     } else {

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MissionServiceImpl.java

@@ -299,7 +299,7 @@ public class MissionServiceImpl implements MissionService {
             for (FileInfoDto file : list) {
                 MissionFiles missionFiles = missionFilesService.queryByProcessId(file.getFileKey());
                 if("success".equals(file.getStatus())){
-                    if(!missionFiles.getStatus().equals(MissionFileStatusEnum.SUCCESS.value())) {
+                    if(!MissionFileStatusEnum.SUCCESS.value().equals(missionFiles.getStatus())) {
                         //成功的话修改本地missionFile表状态
                         //修改missionFile对象信息（convert_end_at,convert_at）
                         missionFiles.setOutFilename(file.getDownFileName());
@@ -321,7 +321,7 @@ public class MissionServiceImpl implements MissionService {
                     }
                 }else if ("failed".equals(file.getStatus())){
                     //先查询文件状态是否已更新成失败状态，已更新则不返回券数
-                    if(!MissionFileStatusEnum.FAILED.value().equals(missionFiles.getStatus())){
+                    if(!MissionFileStatusEnum.FAILED.value().equals(missionFiles.getStatus()) && 0 != missionFiles.getPrice()){
                         //修改文件状态为失败
                         fileFailUpdate(members, file, missionFiles,false);
                     }
@@ -344,6 +344,7 @@ public class MissionServiceImpl implements MissionService {
      * @param flag 是否超时
      */
     private void fileFailUpdate(Members members, FileInfoDto file, MissionFiles missionFiles, boolean flag) {
+        log.info("文件转档更新失败原因，missionFileId：{}", missionFiles.getId());
         missionFiles.setStatus(MissionFileStatusEnum.FAILED.value());
         if(flag){
             missionFiles.setFailReason("文件转换失败：文件转换超时");