feat:防止没有给生产科配置邮箱产生空指针异常

chenhang4442024
1 parent 17ee2dd5
Showing 15 changed files with 81 additions and 276 deletions
pom.xml
sql/table.sql
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/controller/EmailTemplateController.java
src/main/java/com/order/erp/controller/OrderController.java
src/main/java/com/order/erp/domain/ApplyStatusEnum.java
src/main/java/com/order/erp/domain/ApplyTypeEnum.java
src/main/java/com/order/erp/domain/vo/order/OrderBaseInfoVO.java
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
src/main/resources/application-pre-prod.yml
src/main/resources/application-prod.yml
@@ -55,12 +55,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
             <version>${easyexcel.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>org.ow2.asm</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
@@ -92,12 +86,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <version>${springboot.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>asm</artifactId>
-                    <groupId>org.ow2.asm</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
@@ -277,12 +265,6 @@
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>${aliyun-sdk-oss.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>aliyun-java-sdk-core</artifactId>
-                    <groupId>com.aliyun</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <!--thumbnailator 图片压缩工具-->
@@ -298,25 +280,8 @@
             <groupId>wiki.xsx</groupId>
             <artifactId>x-easypdf-pdfbox</artifactId>
             <version>${x-easypdf-pdfbox.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        <!--email邮件配置-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-
-        <!--Freemarker-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <finalName>order-erp.service-1.0-SNAPSHOT</finalName>
@@ -230,17 +230,19 @@ CREATE TABLE `system_setting` (
           PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置';
-DROP TABLE IF EXISTS `order_opinion_log`;
-CREATE TABLE `order_opinion_log`  (
-           `id` bigint NOT NULL AUTO_INCREMENT,
-           `order_id` bigint NOT NULL COMMENT '订单id',
-           `opinion_type` varchar(64)  NOT NULL COMMENT '意见类型',
-           `field` varchar(64)  NOT NULL COMMENT '更新字段',
-           `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
-           `create_time` DATETIME NOT NULL COMMENT '创建时间',
-           `create_by` varchar(64) NOT NULL COMMENT '创建人',
-           `modify_time` DATETIME  DEFAULT NULL COMMENT '修改时间',
-           `modify_by` varchar(64)  DEFAULT NULL COMMENT '修改人',
-           `version` INT  DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
+DROP TABLE IF EXISTS `receive_email_mapping`;
+CREATE TABLE `receive_email_mapping`  (
+         `id` bigint NOT NULL AUTO_INCREMENT,
+         ` type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '类型',
+          `type_value` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '类型值',
+          `config_infos` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '配置信息 json',
+          `enable_flag` int NOT NULL COMMENT '是否可用 10-可用 20-删除',
+          `create_time` datetime NOT NULL COMMENT '创建时间',
+          `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '创建人',
+          `modify_time` datetime NULL DEFAULT NULL COMMENT '修改时间',
+          `modify_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '修改人',
+          `version` int NULL DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
            PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT = '用户订单操作日志表';
 \ No newline at end of file
+) ENGINE = InnoDB AUTO_INCREMENT = 94 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '邮件接收人信息绑定表' ROW_FORMAT = Dynamic;
+
+
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.domain.EmailTemplateEnum;
-import com.order.erp.domain.email.OrderProductEmailVO;
 import com.order.erp.domain.vo.order.OrderEventJobVO;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -50,31 +49,31 @@ public class EmailSendUtils {
         if(CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum ==null && ObjectUtils.isNull(orderEventJobVO)){
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-            MimeMessageHelper helper= null;
-            Map<String, Object> map = new HashMap<>();
-            map.put("context",emailTemplateEnum.getContent());
-            map.put("title",emailTemplateEnum.getTitle());
-            map.put("data",orderEventJobVO);
-            Template template = null;
-            //设置收件人
-            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-            try {
-                helper = new MimeMessageHelper(mimeMessage,true);
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        MimeMessageHelper helper= null;
+        Map<String, Object> map = new HashMap<>();
+        map.put("context",emailTemplateEnum.getContent());
+        map.put("title",emailTemplateEnum.getTitle());
+        map.put("data",orderEventJobVO);
+        Template template = null;
+        //设置收件人
+        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+        try {
+            helper = new MimeMessageHelper(mimeMessage,true);
             //设置邮件的主题
-                helper.setSubject(emailTemplateEnum.getTitle());
+            helper.setSubject(emailTemplateEnum.getTitle());
             //设置发件人
-                helper.setFrom(sendEmail);
-                helper.setTo(receiveemailListArray);
-                helper.setSentDate(new Date());
-                template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
-                StringWriter stringWriter = new StringWriter();
-                template.process(map,stringWriter);
-                helper.setText(stringWriter.toString(),true);
-            } catch (TemplateException | IOException  | MessagingException e) {
-                throw new RuntimeException("邮件发送失败！");
+            helper.setFrom(sendEmail);
+            helper.setTo(receiveemailListArray);
+            helper.setSentDate(new Date());
+            template = freeMarkerConfigurer.getConfiguration().getTemplate("mail.ftl");
+            StringWriter stringWriter = new StringWriter();
+            template.process(map,stringWriter);
+            helper.setText(stringWriter.toString(),true);
+        } catch (TemplateException | IOException  | MessagingException e) {
+            throw new RuntimeException("邮件发送失败！");
         }
-            javaMailSender.send(mimeMessage);
+        javaMailSender.send(mimeMessage);
     }
     /**
      * @Description:    发送生产指示书邮件
@@ -89,23 +88,23 @@ public class EmailSendUtils {
         if (CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum == null && ObjectUtils.isNull(pdfFile)) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
-            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-            //设置收件人
-            String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
-            MimeMessageHelper helper = null;
-            try {
-                helper = new MimeMessageHelper(mimeMessage, true);
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+        //设置收件人
+        String[] receiveemailListArray = receiveemailList.toArray(new String[receiveemailList.size()]);
+        MimeMessageHelper helper = null;
+        try {
+            helper = new MimeMessageHelper(mimeMessage, true);
             //设置邮件的主题
-                helper.setSubject(emailTemplateEnum.getTitle());
+            helper.setSubject(emailTemplateEnum.getTitle());
             //设置发件人
-                helper.setFrom(sendEmail);
-                helper.setTo(receiveemailListArray);
-                helper.setSentDate(new Date());
-                helper.setText(emailTemplateEnum.getContent());
-                helper.addAttachment(pdfFile.getName(), pdfFile);
-            } catch (MessagingException e) {
-                throw new RuntimeException("邮件发送失败！");
-            }
-            javaMailSender.send(mimeMessage);
+            helper.setFrom(sendEmail);
+            helper.setTo(receiveemailListArray);
+            helper.setSentDate(new Date());
+            helper.setText(emailTemplateEnum.getContent());
+            helper.addAttachment(pdfFile.getName(), pdfFile);
+        } catch (MessagingException e) {
+            throw new RuntimeException("邮件发送失败！");
         }
+        javaMailSender.send(mimeMessage);
+    }
 }
 \ No newline at end of file
@@ -2,8 +2,6 @@ package com.order.erp.controller;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.jsr303.OperateGroup;
-import com.order.erp.common.utils.EasyPdfUtils;
-import com.order.erp.common.utils.FileUtil;
 import com.order.erp.domain.vo.order.EmailTemplateQueryVO;
 import com.order.erp.domain.vo.order.EmailTemplateVO;
 import com.order.erp.service.order.EmailTemplateService;
@@ -14,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
-import java.io.File;
 /**
  * 邮件模板表(EmailTemplate)表控制层
@@ -31,24 +28,6 @@ public class EmailTemplateController {
     @Resource
     private EmailTemplateService emailTemplateService;
-    @Resource
-    private EasyPdfUtils pdfUtils;
-
-    /**
-     * 分页查询
-     *
-     * @param emailTemplateQueryVO 查询条件
-     * @return 查询结果
-     */
-    @PostMapping("/test")
-    public ServerResult test(@RequestBody @Validated({OperateGroup.List.class}) EmailTemplateQueryVO emailTemplateQueryVO) {
-
-
-        pdfUtils.createProducePdf(pdfUtils.build(), "testPagePlaceholder.pdf");
-
-        return ServerResult.success();
-    }
-
     /**
      * 分页查询
      *
@@ -158,17 +158,5 @@ public class OrderController {
     }
-    /**
-     * 一次性通过率
-     *
-     * @param orderOpinionLogVO 查询条件
-     * @return 查询结果
-     */
-    @PostMapping("/passRate")
-    @AnonymousAccess
-    public ServerResult oneTimePassRate(@RequestBody OrderOpinionLogVO orderOpinionLogVO) {
-        return orderBaseInfoService.passRate(orderOpinionLogVO);
-    }
-
 }
@@ -13,8 +13,6 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ApplyStatusEnum {
-    NO_COMMIT(-1, "未提交审核"),
-
     WAIT_AUDIT(0, "待审批"),
     AUDIT_PASS(10, "已通过"),
@@ -18,10 +18,6 @@ public enum ApplyTypeEnum {
     ORDER_PROFIT_APPLY(10, "利润分析申请"),
     ORDER_REPORT_APPLY(20, "项目报告书申请"),
-
-    INVOICE_BILL_APPLY(30, "应收账单申请"),
-
-    CHECK_BILL_APPLY(40, "应付账单申请"),
     ;
     private Integer type;
@@ -117,4 +117,4 @@ public class OrderBaseInfoVO implements Serializable {
      */
     private String businessPerson;
 -}
+}
 \ No newline at end of file
 package com.order.erp.domain.vo.order;
-import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -45,11 +44,6 @@ public class OrderLockFieldVO implements Serializable {
     private OrderInspectionStageFieldVO inspectionStageFields;
     /**
-     * 应收款账单字段
-     */
-    private InvoiceBillOrderDO invoiceBillOrderDO;
-
-    /**
      * 导出指定订单id集合
      */
     private List<Long> orderIds;
@@ -321,14 +321,14 @@ public class OrderOverTimeEventJob {
         String sgsTestFinishTime = eventJobVO.getTrackStageInfo().getSgsTestFinishTime();
         String aitexTestFinishTime = eventJobVO.getTrackStageInfo().getAitexTestFinishTime();
         if (StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(aitexTestFinishResult) && StringUtils.isNotBlank(aitexTestFinishTime)){
-             aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
+            aitextestDaysBetween = getDaysBetween(aitexTestFinishResult, aitexTestFinishTime, orderHodTime);
         }
         if(StringUtils.isNotBlank(orderHodTime) && StringUtils.isNotBlank(sgsTestFinishResult) && StringUtils.isNotBlank(sgsTestFinishTime)){
-             sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
+            sgstestDaysBetween = getDaysBetween(sgsTestFinishResult, sgsTestFinishTime, orderHodTime);
+        }
+        if (Constant.THREE == aitextestDaysBetween  || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween   || Constant.NEGATIVE_ONE == sgstestDaysBetween  ) {
+            return true;
         }
-            if (Constant.THREE == aitextestDaysBetween  || Constant.THREE == sgstestDaysBetween || Constant.NEGATIVE_ONE == aitextestDaysBetween   || Constant.NEGATIVE_ONE == sgstestDaysBetween  ) {
-                return true;
-            }
         return false;
     }
@@ -396,4 +396,4 @@ public class OrderOverTimeEventJob {
         orderBaseInfoVO.setOrderHodTime(orderHodTimeFormat);
         return orderBaseInfoVO;
     }
 -}
+}
 \ No newline at end of file
@@ -101,13 +101,6 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
      */
     ServerResult deleteById(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
-    /**
-     * 通过orderId计算订单的一次性通过率
-     *
-     * @param orderOpinionLogVO 筛选条件
-     * @return 是否成功
-     */
-    ServerResult  passRate(OrderOpinionLogVO orderOpinionLogVO);
     long countByOrderStatus(Integer orderFinish);
@@ -118,11 +118,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     @Resource
     private EmailSendUtils emailSendUtils;
-    @Resource
-    private OrderOpinionLogService orderOpinionLogService;
-    @Resource
-    private InvoiceBillMappingService invoiceBillMappingService;
     /**
      * 通过ID查询单条数据
@@ -205,8 +201,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             // 填充质检信息
             fillInspectionStageInfo(resultVOList);
-            // 填充发票信息
-            fillInvoiceNo(resultVOList);
             if (locked) {
                 // 填充字段锁定信息
@@ -844,26 +838,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * @param orderInfoResultVOList
      */
-    private void fillInvoiceNo(List<OrderInfoResultVO> orderInfoResultVOList) {
-        if (CollectionUtils.isEmpty(orderInfoResultVOList)) {
-            return;
-        }
-        Set<Long> orderIds = orderInfoResultVOList.stream().map(OrderInfoResultVO::getId).collect(Collectors.toSet());
-        List<InvoiceBillMappingDO> invoiceBillMappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .in(InvoiceBillMappingDO::getOrderId, orderIds));
-        if (CollectionUtils.isEmpty(invoiceBillMappingDOS)) {
-            return;
-        }
-        Map<Long, InvoiceBillMappingDO> invoiceBillMappingDOMap = invoiceBillMappingDOS.stream().collect(Collectors.toMap(InvoiceBillMappingDO::getOrderId, Function.identity(), (v1, v2) -> v1));
-        orderInfoResultVOList.forEach(result -> {
-            if (invoiceBillMappingDOMap.containsKey(result.getId())) {
-                InvoiceBillMappingDO invoiceBillMappingDO = invoiceBillMappingDOMap.get(result.getId());
-                result.setInvoiceNo(invoiceBillMappingDO.getInvoiceNo());
-            }
-        });
-    }
     /**
      * @param orderInfoResultVOList
@@ -1517,10 +1492,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         orderOptLogService.save(buildOrderOptLogDo(baseInfoDO.getId(), userId, OrderOptTypeEnum.ORDER_CREATE.getDesc(), null));
-        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(baseInfoDO.getId(),
-                OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),
-                orderAddVO.getBaseInfo().getProductionComment());
-        orderOpinionLogService.save(orderOpinionLogDO);
+
         return ServerResult.success();
     }
@@ -1535,9 +1507,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         return OrderOptLogDO.builder().orderId(orderId).userId(userId).fields(jsonString).optType(optType).build();
     }
-    private OrderOpinionLogDO buildOrderOpinionLogDo(Long orderId, String type, String field) {
-        return OrderOpinionLogDO.builder().orderId(orderId).opinionType(type).field(field).build();
-    }
+
     /**
      * @param updateVO
@@ -1628,12 +1598,8 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             throw new BusinessException(ServerResultCode.ORDER_BASE_INFO_EMPTY);
         }
         OrderOptLogDO optLogDO = new OrderOptLogDO();
-        List<OrderOpinionLogDO> orderOpinionLogDOList = new ArrayList<>();
         if (Objects.nonNull(updateVO.getBaseInfo())) {
-            if(!(updateVO.getBaseInfo().getProductionComment().equals(orderBaseInfoDo.getProductionComment()))){
-                OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PRODUCTION_COMMENT.getDesc(),updateVO.getBaseInfo().getProductionComment());
-                orderOpinionLogDOList.add(orderOpinionLogDO);
-            }
+
             buildUpdateVO(updateVO.getBaseInfo(), orderBaseInfoDo);
             orderBaseInfoDo.setId(updateVO.getOrderId());
             optLogDO = buildOrderOptLogDo(updateVO.getOrderId(), userId, OrderOptTypeEnum.ORDER_EDIT.getDesc(), JSONObject.toJSONString(updateVO));
@@ -1669,13 +1635,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setPpTime(trackStageInfo.getPpTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult())) {
-                    //由于跟单信息在创建时也是采用edit接口,所以要限制第一次创建时ppconfirmResult为空的情况,这种情况要计算到跟单记录中去。
-                    if(!(trackStageInfo.getPpConfirmResult().equals(trackStageDO.getPpConfirmResult())) &&
-                            StringUtils.isNotBlank(trackStageInfo.getPpConfirmResult()) ){
-                        //用于在跟单记录中展示。
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_PP_CONFIRRM_RESULT.getDesc(),trackStageInfo.getPpConfirmResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
+
                     trackStageDO.setPpConfirmResult(trackStageInfo.getPpConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getEsoSampleSendTime())) {
@@ -1685,11 +1645,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setShippmentSampleSendTime(trackStageInfo.getShippmentSampleSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
-                    if(!(trackStageInfo.getShippmentSampleConfirmResult().equals(trackStageDO.getShippmentSampleConfirmResult())) &&
-                            StringUtils.isNotBlank(trackStageInfo.getShippmentSampleConfirmResult())) {
-                        OrderOpinionLogDO orderOpinionLogDO = buildOrderOpinionLogDo(updateVO.getOrderId(), OrderOpinionLogEnum.ORDER_SHIPMENT_SAMPLE_CONFIRM_RESULT.getDesc(), trackStageInfo.getShippmentSampleConfirmResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
+                  trackStageDO.setShippmentSampleConfirmResult(trackStageInfo.getShippmentSampleConfirmResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSelfTestPassTime())) {
                     trackStageDO.setSelfTestPassTime(trackStageInfo.getSelfTestPassTime());
@@ -1698,22 +1654,14 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                     trackStageDO.setAitexTestSendTime(trackStageInfo.getAitexTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())) {
-                    if(!(trackStageInfo.getAitexTestFinishResult().equals(trackStageDO.getAitexTestFinishResult())) &&
-                            StringUtils.isNotBlank(trackStageInfo.getAitexTestFinishResult())){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getAitexTestFinishResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
+
                     trackStageDO.setAitexTestFinishResult(trackStageInfo.getAitexTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestSendTime())) {
                     trackStageDO.setSgsTestSendTime(trackStageInfo.getSgsTestSendTime());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())) {
-                    if(!(trackStageInfo.getSgsTestFinishResult().equals(trackStageDO.getSgsTestFinishResult())) &&
-                            StringUtils.isNotBlank(trackStageInfo.getSgsTestFinishResult())){
-                        OrderOpinionLogDO orderOpinionLogDO =buildOrderOpinionLogDo(updateVO.getOrderId(),OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc(),trackStageInfo.getSgsTestFinishResult());
-                        orderOpinionLogDOList.add(orderOpinionLogDO);
-                    }
+
                     trackStageDO.setSgsTestFinishResult(trackStageInfo.getSgsTestFinishResult());
                 }
                 if (StringUtils.isNotBlank(trackStageInfo.getBarcodeStickerArrivalTime())) {
@@ -1825,7 +1773,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         }
         updateById(orderBaseInfoDo);
         orderOptLogService.save(optLogDO);
-        orderOpinionLogService.saveBatch(orderOpinionLogDOList);
         return ServerResult.success();
     }
@@ -2000,45 +1947,6 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
      * @param orderOpinionLogVO
      * @return
      */
-    @Override
-    public ServerResult passRate(OrderOpinionLogVO orderOpinionLogVO) {
-        if(Objects.isNull(orderOpinionLogVO.getOrderId())){
-            return ServerResult.fail("OrderId 参数不能为空");
-        }
-        LambdaQueryWrapper<OrderOpinionLogDO> orderOpinionWrapper = new LambdaQueryWrapper<OrderOpinionLogDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVO.getOrderId());
-                if(!OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType()) &&
-                        !OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType())){
-                    //不等于sgs和ailtex
-                orderOpinionWrapper.eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType());
-                }else{
-                    orderOpinionWrapper.and(wrapper ->
-                            wrapper.eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc())
-                                    .or()
-                                    .eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc())
-                    );
-                }
-        List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(orderOpinionWrapper);
-        if(CollectionUtils.isEmpty(orderOpinionLogDOList)){
-            return ServerResult.fail("订单跟单信息"+orderOpinionLogVO.getOpinionType()+"未填写");
-        }
-        List<Integer> okCountList=  new ArrayList();
-        List<Integer> FailCountList=  new ArrayList();
-        orderOpinionLogDOList.stream().forEach(x->{
-            if (x.getField().contains("ok")){
-                okCountList.add(Constant.ONE);
-            }else{
-                FailCountList.add(Constant.ZERO);
-            }
-        });
-        int sum=okCountList.size()+FailCountList.size();
-        double rate = ((double) okCountList.size() / sum)*Constant.HUNDRED;
-        DecimalFormat decimalFormat = new DecimalFormat("0");
-        String resultrate = decimalFormat.format(rate);
-        return ServerResult.success(resultrate+"%");
-    }
-
@@ -72,9 +72,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
     @Resource
     private OrderInspectionStageService inspectionStageService;
-    @Resource
-    private InvoiceBillOrderService invoiceBillOrderService;
-
     /**
      * 通过ID查询单条数据
      * <p>
@@ -119,22 +116,19 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 BeanUtils.copyProperties(x, resultVO);
                 String fields = x.getFields();
                 if (StringUtils.isNotBlank(fields)) {
-                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(x.getType())) {
+                    if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() == x.getType()) {
                         resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
                     }
-                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(x.getType())) {
+                    if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType() == x.getType()) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
-                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(x.getType())) {
+                    if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() == x.getType()) {
                         OrderLockFieldVO fieldVO = new OrderLockFieldVO();
                         fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
                         resultVO.setFieldInfos(fieldVO);
                     }
-                    if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
-                        resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
-                    }
                 }
                 return resultVO;
             }).collect(Collectors.toList());
@@ -342,7 +336,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
                 .in(CollectionUtils.isNotEmpty(orderIds), OrderFieldLockApplyDO::getOrderId, orderIds);
         if (Objects.isNull(roleSelect)) {
             queryWrapper.like(Objects.nonNull(roleEnum), OrderFieldLockApplyDO::getAuditRoleCodes, roleEnum.getCode());
-        } else {
+        }else {
             queryWrapper.eq(Objects.nonNull(roleSelect), OrderFieldLockApplyDO::getAuditRoleCodes, roleSelect.getCode());
         }
@@ -401,13 +395,7 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
         } else if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(applyDO.getType())) {
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
-        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
-            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
-            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
-            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
-            invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }
-
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_REFUSE.getDesc()).build();
         applyService.updateById(applyDO);
@@ -528,11 +516,6 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
             }
             orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
             orderBaseInfoService.updateById(orderBaseInfoDO);
-        } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
-            OrderLockFieldVO lockFieldVO =  JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
-            InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
-            invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
-            invoiceBillOrderService.updateById(invoiceBillOrderDO);
         }
         OrderAuditLogDO auditLogDO = OrderAuditLogDO.builder().applyId(applyDO.getId()).orderId(applyDO.getOrderId()).optType(ApplyStatusEnum.AUDIT_PASS.getDesc()).build();
@@ -76,19 +76,15 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-#    host: xxx
-    host: smtp.163.com
+    host: xxx
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-#    username: xxxx
-    username: chenhang4442024@163.com
+    username: xxxx
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-#    password: xxx
-    password: ACHWYJSXRITHTMGA
+    password: xxx
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-#    port: 587
-    port: 25
+    port: 587
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
@@ -76,21 +76,23 @@ spring:
     timeout: 2000
   mail:
     # 配置 SMTP 服务器地址
-    host: xxx
+    host: smtp.163.com
     # 发送者邮箱，已开通POP3/SMTP服务的邮箱，也就是你自己的
-    username: xxxx
+    username: chenhang4442024@163.com
     # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-    password: xxx
+    password: ACHWYJSXRITHTMGA
     # 邮件接收者
     mailRecipient: #邮件接收者邮箱
     # 端口号465或587（QQ邮箱发送邮件仅支持587端口协议）
-    port: 587
+    port: 465
     # 默认的邮件编码为UTF-8
     default-encoding: UTF-8
     # 配置SSL 加密工厂
     properties:
       mail:
         smtp:
+          ssl:
+            enable: true
           socketFactoryClass: javax.net.ssl.SSLSocketFactory
         #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
         debug: true