推送调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/taskordernontaxrecord/TaskOrderNonTaxRecordServiceImpl.java

@@ -469,16 +469,6 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
         if (status == BpmTaskStatusEnum.APPROVE.getStatus().intValue()) {
             String payNoticeNo = financialSystemService.getPayNoticeNo();
             updateObj.setPaymentInstructionNo(payNoticeNo);
-            try {
-                //生成缴费通知书
-                ByteArrayOutputStream outputStream = this.getRecordOutputStream(id);
-                if (outputStream != null){
-                    String attachmentPath = fileApi.createFile(outputStream.toByteArray());
-                    updateObj.setNoticePdfUrl(attachmentPath);
-                }
-            } catch (Exception e) {
-                log.error("e:{}", e.getMessage());
-            }
         }
         taskOrderNonTaxRecordMapper.updateById(updateObj);
 
@@ -579,6 +569,19 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
             taskOrderNonTaxRecordMapper.updateById(updateObj);
         }
 
+        try {
+            //生成缴费通知书
+            ByteArrayOutputStream outputStream = this.getRecordOutputStream(id);
+            if (outputStream != null){
+                String attachmentPath = fileApi.createFile(outputStream.toByteArray());
+                updateObj.setId(id);
+                updateObj.setNoticePdfUrl(attachmentPath);
+                taskOrderNonTaxRecordMapper.updateById(updateObj);
+            }
+        } catch (Exception e) {
+            log.error("e:{} 生成缴费通知书失败!", e.getMessage());
+        }
+
         return true;
     }
 
@@ -589,8 +592,10 @@ public class TaskOrderNonTaxRecordServiceImpl extends ServiceImpl<TaskOrderNonTa
         if (taskOrderNonTaxRecordDO == null) {
             throw new ServiceException(902, "未找到记录");
         }
-        if (EnvConstants.ENV_PROD.equals(env)) {
-            qrcode = taskOrderNonTaxRecordDO.getPaymentInstruction();
+        if (EnvConstants.ENV_PROD.equals(env) || EnvConstants.ENV_UAT.equals(env)) {
+            if (taskOrderNonTaxRecordDO.getPaymentInstruction() != null){
+                qrcode = taskOrderNonTaxRecordDO.getPaymentInstruction();
+            }
         }
 
         return qrcode;