Merge remote-tracking branch 'origin/master'

core-service/src/test/java/com/winsun/user/UserTestHelper.java

@@ -2,6 +2,7 @@ package com.winsun.user;
 
 
 import com.winsun.base.AppApplicationBaseIT;
 import com.winsun.base.AppApplicationBaseIT;
 import com.winsun.item.modular.system.dao.UserMapper;
 import com.winsun.item.modular.system.dao.UserMapper;
+import com.winsun.outSideSystem.IntelligenceSendOrder;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +18,8 @@ public class UserTestHelper extends AppApplicationBaseIT {
     @Autowired
     @Autowired
     private UserMapper mapper;
     private UserMapper mapper;
 
 
+    @Autowired
+    private IntelligenceSendOrder intelligenceSendOrder;
     @Test
     @Test
     public void decryptPwd() {
     public void decryptPwd() {
 //        final String account = "18028801118";
 //        final String account = "18028801118";
@@ -31,5 +34,7 @@ public class UserTestHelper extends AppApplicationBaseIT {
 //
 //
 //        String orderSeq = RandomUtil.RandomNumber(32);
 //        String orderSeq = RandomUtil.RandomNumber(32);
 //        System.out.println(orderSeq);
 //        System.out.println(orderSeq);
+
+        intelligenceSendOrder.queryStatus("iczrnmals07dq3im35c1",null);
     }
     }
 }
 }

task/src/main/java/com/winsun/service/ExportService.java

@@ -3,7 +3,6 @@ package com.winsun.service;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
-import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.bean.ExportExcel;
 import com.winsun.bean.ExportExcel;
 import com.winsun.bean.Order;
 import com.winsun.bean.Order;
 import com.winsun.bean.School;
 import com.winsun.bean.School;
@@ -23,8 +22,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileOutputStream;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -50,9 +47,6 @@ public class ExportService extends BaseController {
     private ExportExcelMapper exportExcelMapper;
     private ExportExcelMapper exportExcelMapper;
 
 
     @Autowired
     @Autowired
-    private IHhrUserService hhrUserService;
-
-    @Autowired
     public ExportService(OrderMapper orderMapper,ExportExcelMapper exportExcelMapper){
     public ExportService(OrderMapper orderMapper,ExportExcelMapper exportExcelMapper){
         this.orderMapper = orderMapper;
         this.orderMapper = orderMapper;
         this.exportExcelMapper = exportExcelMapper;
         this.exportExcelMapper = exportExcelMapper;