fix:1.审核通过之后,也需要给财务发送邮件。

2.对于质检信息,跟单信息遇到相同的style号的订单采用填写任何一个订单,会自动把相同style号的订单的跟单和质检信息复制过去,无需填写多个。产生的问题:扫描最近三个月的订单,要是扫描不到就会产生查询不到数据的错误, 更新之后,要是扫描不到,就只对于当前修改的订单进行更新,不对于其它相同style的订单进行跟单或者质检信息的复制。

fix:1.审核通过之后,也需要给财务发送邮件。
2.对于质检信息,跟单信息遇到相同的style号的订单采用填写任何一个订单,会自动把相同style号的订单的跟单和质检信息复制过去,无需填写多个。产生的问题:扫描最近三个月的订单,要是扫描不到就会产生查询不到数据的错误, 更新之后,要是扫描不到,就只对于当前修改的订单进行更新,不对于其它相同style的订单进行跟单或者质检信息的复制。
chenhang4442024
1 parent fd3c0b52
Showing 4 changed files with 86 additions and 17 deletions
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/mapper/order/OrderBaseInfoMapper.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/resources/mapper/OrderBaseInfoMapper.xml
@@ -12,6 +12,7 @@ import com.order.erp.domain.dto.admin.AdminUserDO;
 import com.order.erp.domain.dto.admin.AdminUserRoleDO;
 import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
 import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
+//import com.order.erp.domain.vo.order.DeductionUrlFieldVO;
 import com.order.erp.domain.vo.order.FinanceEventJobVO;
 import com.order.erp.domain.vo.order.InvoiceAndCheckBillSendEmailVO;
 import com.order.erp.domain.vo.order.OrderEventJobVO;
@@ -312,7 +313,9 @@ public class EmailSendUtils {
                         .toArray(String[]::new); // 转换为 String[] 数组
             }
             invoiceNoOrCheckNo = invoiceBillOrderDO.getInvoiceNo();
-        }else{
+        }
+//        else if(invoiceAndCheckBillSendEmailVO.getCheckBillOrderDO()!=null){
+            else {
             ProducePaymentCheckBillOrderDO checkBillOrderDO = invoiceAndCheckBillSendEmailVO.getCheckBillOrderDO();
             Set<Long> userIds = null;
             //得到跟单员和业务员和财务。
@@ -329,10 +332,46 @@ public class EmailSendUtils {
                 queryWrapper.or().in(AdminUserDO::getId,userIds);
             }
             List<AdminUserDO> adminUserDOList = adminUserService.list(queryWrapper);
-            email = adminUserDOList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull).flatMap(emails -> Arrays.asList(emails.split("[,，]+"))
+            List<AdminUserDO> distinctUserList = adminUserDOList.stream()
+                    .collect(Collectors.toMap(AdminUserDO::getUserName, user -> user, (existing, replacement) -> existing))
+                    .values()
+                    .stream()
+                    .collect(Collectors.toList());
+
+            email = distinctUserList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull).flatMap(emails -> Arrays.asList(emails.split("[,，]+"))
                     .stream()).map(String::trim).filter(s -> !s.isEmpty()).toArray(String[]::new);
             invoiceNoOrCheckNo=checkBillOrderDO.getCheckNo();
-        }
+        }/*else{
+            DeductionUrlFieldVO deductionUrlFieldVO = invoiceAndCheckBillSendEmailVO.getDeductionUrlFieldVO();
+            Set<Long> userIds = null;
+            //得到跟单员和业务员和财务。
+            if(isTrue){
+                List<AdminUserRoleDO> list = adminUserRoleService.list(new LambdaQueryWrapper<AdminUserRoleDO>()
+                        .eq(AdminUserRoleDO::getRoleId, Constant.SEVEN));
+                userIds= list.stream().map(AdminUserRoleDO::getUserId).collect(Collectors.toSet());
+            }
+            LambdaQueryWrapper<AdminUserDO> queryWrapper = new LambdaQueryWrapper<AdminUserDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .and(wrapper -> wrapper
+                            .in(AdminUserDO::getUserName, Arrays.asList(deductionUrlFieldVO.getTrackerUser(), deductionUrlFieldVO.getBusinesPerson())));
+            if(CollectionUtils.isNotEmpty(userIds)){
+                queryWrapper.or().in(AdminUserDO::getId,userIds);
+            }
+            List<AdminUserDO> adminUserDOList = adminUserService.list(queryWrapper);
+            List<AdminUserDO> distinctUserList = adminUserDOList.stream()
+                    .collect(Collectors.toMap(AdminUserDO::getUserName, user -> user, (existing, replacement) -> existing))
+                    .values()
+                    .stream()
+                    .collect(Collectors.toList());
+
+            email = distinctUserList.stream().map(AdminUserDO::getEmail).filter(Objects::nonNull).flatMap(emails -> Arrays.asList(emails.split("[,，]+"))
+                    .stream()).map(String::trim).filter(s -> !s.isEmpty()).toArray(String[]::new);
+            if(StringUtils.isEmpty(deductionUrlFieldVO.getCheckNo())){
+                invoiceNoOrCheckNo=deductionUrlFieldVO.getInvoiceNo();
+            }else{
+                invoiceNoOrCheckNo=deductionUrlFieldVO.getCheckNo();
+            }
+        }*/
         if(Objects.nonNull(email)){
             try {
                 helper = new MimeMessageHelper(mimeMessage);
@@ -64,5 +64,12 @@ public interface OrderBaseInfoMapper extends BaseMapper&lt;OrderBaseInfoDO&gt; {
     long countAllDayvalueByOrderStatus(Integer orderStatus, LocalDate startDate, LocalDate endDate);
     @Select("SELECT count(*) AS count FROM order_base_info WHERE  enable_flag=10 AND create_time >= #{startDate} AND create_time < #{endDate};")
     long countRecentDayByOrderInit(LocalDate startDate, LocalDate endDate);
+    List<OrderBaseInfoDO> sameAttributeOrder(@Param("customerStyle") String customerStyle,
+                                  @Param("innerNo") String innerNo,
+                                  @Param("isReturnOrder") String isReturnOrder,
+                                  @Param("monthsAgo") LocalDateTime monthsAgo,
+                                  @Param("now") LocalDateTime now);
+
+
 }
@@ -2201,28 +2201,24 @@ end
             redisUtils.set(orderBaseInfoDo.getInnerNo()+Constant.CROSS_BAR_CHARACTER+resultText, "1", 90, TimeUnit.DAYS);
         }
     }
-    //查询最近三个月的数据。
+    //查询最近四个月的数据。(之前设置三个月太少了!)。
     private List<OrderBaseInfoDO> getTwoMonthOrderBaseInfo(OrderBaseInfoDO orderBaseInfoDo){
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime twoMonthsAgo = now.minusMonths(3);
-        LambdaQueryWrapper<OrderBaseInfoDO> orderBaseInfoDOLambdaQueryWrapper;
+        LocalDateTime twoMonthsAgo = now.minusMonths(4);
+        List<OrderBaseInfoDO> orderBaseInfoDOList;
         //这部分代码的目的是,遇到相同style的订单,他们只需要填写其中任何一个订单的跟单信息,就会填写的跟单信息复制到其他订单上。
         if(Constant.STRING_ZERO.equals(orderBaseInfoDo.getReturnOrder())){
             //查询所有相同的style的并且不是返单的订单。
-            orderBaseInfoDOLambdaQueryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>().eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(OrderBaseInfoDO::getCustomerStyle, orderBaseInfoDo.getCustomerStyle())
-                    .eq(OrderBaseInfoDO::getInnerNo, orderBaseInfoDo.getInnerNo())
-                    .eq(OrderBaseInfoDO::getReturnOrder, Constant.STRING_ZERO)
-                    .between(OrderBaseInfoDO::getCreateTime, twoMonthsAgo, now);
+            orderBaseInfoDOList = baseMapper.sameAttributeOrder(orderBaseInfoDo.getCustomerStyle(), orderBaseInfoDo.getInnerNo(), Constant.STRING_ZERO, twoMonthsAgo, now);
         }else{
             //查询所有相同的style的并且是返单的订单。
-            orderBaseInfoDOLambdaQueryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>().eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
-                    .eq(OrderBaseInfoDO::getCustomerStyle, orderBaseInfoDo.getCustomerStyle())
-                    .eq(OrderBaseInfoDO::getInnerNo, orderBaseInfoDo.getInnerNo())
-                    .eq(OrderBaseInfoDO::getReturnOrder, Constant.STRING_ONE)
-                    .between(OrderBaseInfoDO::getCreateTime, twoMonthsAgo, now);
+            orderBaseInfoDOList = baseMapper.sameAttributeOrder(orderBaseInfoDo.getCustomerStyle(), orderBaseInfoDo.getInnerNo(), Constant.STRING_ONE, twoMonthsAgo, now);
         }
-        return list(orderBaseInfoDOLambdaQueryWrapper);
+        //如果一个都没有查询出来,就说明创建订单时创建质检信息,到现在已经距离四个月了,所以连自己都没有查询出来,这个时候就把自己传过去,避免一个都没有。
+        if(CollectionUtils.isEmpty(orderBaseInfoDOList)){
+          orderBaseInfoDOList.add(orderBaseInfoDo);
+        }
+        return orderBaseInfoDOList;
     }
     private  List<OrderOptLogDO> inspectionCopy(OrderBaseInfoDO orderBaseInfoDo,OrderUpdateVO updateVO,Long userId){
@@ -106,4 +106,31 @@
         date;
     </select>
+
+    <select id="sameAttributeOrder" resultType="com.order.erp.domain.dto.order.OrderBaseInfoDO">
+        SELECT
+        obi.*
+        FROM
+        order_base_info obi
+        JOIN
+        order_inspection_stage opa
+        ON
+        opa.order_id = obi.id
+        AND opa.enable_flag = 10
+        WHERE
+        obi.enable_flag = 10
+        AND
+        obi.customer_style = #{customerStyle}
+        AND
+        obi.inner_no = #{innerNo}
+        AND
+        obi.return_order = #{isReturnOrder}
+        AND
+        obi.create_time BETWEEN #{monthsAgo} AND #{now}
+        AND
+        (opa.mid_check_apply_time IS  NULL
+        OR
+        opa.mid_check_result IS  NULL)
+    </select>
+
 </mapper>