修改

pom.xml

@@ -106,6 +106,11 @@
             <artifactId>openapi-sdk</artifactId>
             <version>6.0</version>
         </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>1.4.7</version>
+        </dependency>
 
     </dependencies>
     <build>
@@ -122,8 +127,8 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>QMS_QUEUE_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
-<!--                        <param>QMS_QUEUE_SPELLING_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
+                        <!--                        <param>QMS_QUEUE_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
+                        <!--                        <param>QMS_QUEUE_SPELLING_LIST</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -84,7 +84,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
     @ApiOperation(value="APP端司机查看排队信息")
     @GetMapping("getQueueResultByTotalId")
     public RESTfulResult getQueueResultByTotalId(String resultTotalId){
-        if("undefined".equals(resultTotalId)){
+        if("undefined".equals(resultTotalId) ){
             return failed();
         }
         return success(qmsQueueResultService.getQueueResultByTotalId(resultTotalId));

src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -216,4 +216,6 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
 
     int updateTotalResultTime(BigDecimal resultTotalId);
 
+    int updateTotalResultStatusByResultId(BigDecimal resultId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -278,6 +278,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         QmsQueueResult qmsQueueResult = new QmsQueueResult();
         qmsQueueResult.setResultId(resultId);
         qmsQueueResult.setResultCancelReason((String) map.get("resultCancelReason"));//设置取消原因
+        //更新总实绩表
+        qmsQueueResultMapper.updateTotalResultStatusByResultId(resultId);
         return qmsQueueResultMapper.updateCancelResult(qmsQueueResult);
     }
 

src/main/java/com/steerinfo/dil/service/impl/QmsQueueResultServiceImpl.java

@@ -175,7 +175,9 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @return
      */
     public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
-        System.out.println(resultTotalId + "resultTotalId");
+        if(resultTotalId == "") {
+            return new HashMap<>();
+        }
         Map<String,Object> map = qmsQueueResultMapper.getQueueResultByOrderId(DataChange.dataToBigDecimal(resultTotalId));
         if(map == null){
             return new HashMap<>();
@@ -269,7 +271,7 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             Date now=new Date();
             Calendar call=Calendar.getInstance();
             call.setTime(now);
-            call.set(Calendar.HOUR_OF_DAY,8);
+            call.set(Calendar.HOUR_OF_DAY,0);
             call.set(Calendar.MINUTE,0);
             call.set(Calendar.SECOND,0);
             call.set(Calendar.MILLISECOND,0);

src/main/java/com/steerinfo/dil/util/SaleLogUtil.java

@@ -2,12 +2,17 @@ package com.steerinfo.dil.util;
 
 import com.steerinfo.dil.mapper.SaleLogMapper;
 import com.steerinfo.dil.model.SaleLog;
+import com.sun.mail.util.MailSSLSocketFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.mail.*;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Map;
+import java.util.Properties;
 
 @Component
 public class SaleLogUtil {
@@ -88,4 +93,61 @@ public class SaleLogUtil {
             return "未知用户";
         }
     }
+
+    //public static void main(String[] args) throws Exception {
+    //    testMail();
+    //}
+    //
+    //private static void testMail () throws Exception {
+    //    // 给用户发送邮件的邮箱
+    //    final String from = "2361742724@qq.com";
+    //    // 邮箱的用户名
+    //    final String username = "2361742724@qq.com";
+    //    // 邮箱授权码，刚刚保存的授权码，不是qq密码
+    //    final String password = "rfhbbmbqssykebaf";
+    //    // 发送邮件的服务器地址，QQ服务器
+    //    final String host = "smtp.qq.com";
+    //    // 接收人邮箱
+    //    final String to = "987666087@qq.com";
+    //    // 邮件主题
+    //    final String title = "测试用例";
+    //
+    //    // 使用QQ邮箱时配置
+    //    Properties prop = new Properties();
+    //    prop.setProperty("mail.host", "smtp.qq.com");    // 设置QQ邮件服务器
+    //    prop.setProperty("mail.transport.protocol", "smtp");      // 邮件发送协议
+    //    prop.setProperty("mail.smtp.auth", "true");      // 需要验证用户名和密码
+    //    // 关于QQ邮箱，还要设置SSL加密，其他邮箱不需要
+    //    MailSSLSocketFactory sf = new MailSSLSocketFactory();
+    //    sf.setTrustAllHosts(true);
+    //    prop.put("mail.smtp.ssl.enable", "true");
+    //    prop.put("mail.smtp.ssl.socketFactory", sf);
+    //
+    //    // 创建定义整个邮件程序所需的环境信息的 Session 对象，QQ才有，其他邮箱就不用了
+    //    Session session = Session.getDefaultInstance(prop, new Authenticator() {
+    //        @Override
+    //        protected PasswordAuthentication getPasswordAuthentication() {
+    //            // 发件人邮箱用户名，授权码
+    //            return new PasswordAuthentication(username, password);
+    //        }
+    //    });
+    //    // 开启 Session 的 debug 模式，这样就可以查看程序发送 Email 的运行状态
+    //    session.setDebug(true);
+    //    // 通过 session 得到 transport 对象
+    //    Transport ts = session.getTransport();
+    //    // 使用邮箱的用户名和授权码连上邮箱服务器
+    //    ts.connect(host, username, password);
+    //    // 创建邮件，写邮件
+    //    MimeMessage message = new MimeMessage(session);
+    //    message.setFrom(new InternetAddress(from)); // 指明邮件的发件人
+    //    message.setRecipient(Message.RecipientType.TO, new InternetAddress(to));   // 指明邮件的收件人
+    //    message.setSubject(title);     // 邮件主题
+    //    message.setContent("验证码为:8824", "text/html;charset=utf-8");    // 邮件内容
+    //    message
+    //    // 发送邮件
+    //    ts.sendMessage(message, message.getAllRecipients());
+    //    System.out.println("验证码发送成功");
+    //    // 释放资源
+    //    ts.close();
+    //}
 }

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -2429,10 +2429,12 @@
        FROM
            OMSTRUCK_ORDER OO
                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+               LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
        WHERE
-           OO.ORDER_LINE_SEQUENCE >= 1
+          TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
          AND OO.ORDER_STATUS = 5
+         AND NVL(OO.CAPACITY_ID,0) != 35128
          AND TLFR.RESULT_OUT_GATE_TIME IS NULL
          AND OO.ORDER_TYPE = 1
    </select>
@@ -2468,6 +2470,7 @@
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = tlfr.RESULT_OUT_GATE_TIME
                         and oo.order_type=1
+                        and oo.order_status in (4,5)
                     </if>
                 </where>
                 order by ter.RESULT_ENTRY_GATE_TIME desc
@@ -2481,12 +2484,14 @@
         FROM
             OMSTRUCK_ORDER OO
                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                 LEFT JOIN RMS_CAPACITY RC
                           ON RC.CAPACITY_ID=OO.CAPACITY_ID
         WHERE
-            OO.ORDER_LINE_SEQUENCE >= 1
+            TER.RESULT_ENTRY_GATE_TIME IS NOT NULL
           AND OO.ORDER_STATUS = 5
+          AND NVL(OO.CAPACITY_ID,0) != 35128
           AND TLFR.RESULT_OUT_GATE_TIME IS NULL
           AND OO.ORDER_TYPE = 1
     </select>
@@ -2517,7 +2522,10 @@
         ON RCA.CAPACITY_ID = OO.CAPACITY_ID
         WHERE ASO.SALE_TYPE = 1
         AND ASO.DELETED = 0
+        AND ASO.SALE_ORDER_STATUS = 4
         and RCA.CAPACITY_NUMBER is not null
+        AND NVL(OO.CAPACITY_ID,0) != 35128
+        and nvl(oo.ORDER_STATUS,0) in (4,5)
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         and ASOM.SALE_DATE_OF_RECEIPT  > sysdate
         and ASOM.SALE_DATE_OF_RECEIPT - 1 &lt; sysdate)
@@ -2534,4 +2542,9 @@
             TTR.QUEUE_ALLOW_TIME = sysdate
         WHERE TTR.RESULT_TOTAL_ID = #{resultTotalId}
     </update>
+    <update id="updateTotalResultStatusByResultId">
+        UPDATE TMSTRUCK_TOTAL_RESULT TTR
+        SET TTR.ORDER_STATUS = '已接单'
+        WHERE TTR.RESULT_TOTAL_ID IN (SELECT QQR.RESULT_TOTAL_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_ID = #{resultId})
+    </update>
 </mapper>