分销员接口修改

common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java

@@ -921,7 +921,7 @@ public class IntelligenceSendOrder {
             }
         }
 
-        Map<String, Object> orderMap = null;
+        Map<String, Object> orderMap = new HashMap<>();
         Wrapper<OrderView> orderViewWrapper = new EntityWrapper<>();
         orderViewWrapper.eq("orderSeq", order.getKdOrderId());
         List<Map<String, Object>> orderViewMaps = orderViewMapper.selectMaps(orderViewWrapper);

common/src/main/java/com/winsun/utils/PicturesUtil.java

@@ -7,9 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.*;
 
 /**
  * 二维码海报工具类
@@ -51,22 +49,24 @@ public class PicturesUtil {
         //blog.csdn.net/kookob/java/article/details/6885383
         String filePath = null;
         String[] multipartFiles = new String[]{file};
+        Map<String,Object> map = new HashMap<>();
         for (int i = 0; i < multipartFiles.length; i++) {
             if (!multipartFiles[i].isEmpty()) {
                 String base64Data = multipartFiles[i].split(",")[1];
                 String houzhui = multipartFiles[i].split(",")[0].split("/")[1].split(";")[0];
                 String  filePath1 = UPLOAD_PRE + FilePath.PATH.getValue()+ pathType+ "/" + yymmdd + "/" + orderNum;
-                File dir = new File(filePath1);
+                map.put("filePath1",filePath1);
+                File dir = new File(map.get("filePath1").toString());
                 if (!dir.exists()) {
                     dir.mkdirs();
                 }//enclosure/images/idCard/temp/年/月/日/name.jpeg
 
                 filePath = UPLOAD_PRE + FilePath.PATH.getValue()+ pathType+ "/" + yymmdd + "/" + orderNum + "/" + (new Date()).getTime() + "." + PicturesUtil.checkSuffix(houzhui);
-
+                map.put("filePath",filePath);
                 byte[] bytes = Base64.getMimeDecoder().decode(base64Data.replace(" ","+"));
                         FileOutputStream fos = null;
                 try {
-                    fos = new FileOutputStream(filePath);
+                    fos = new FileOutputStream(map.get("filePath").toString());
                     if (fos != null) {
                         fos.write(bytes);
                     }

service-manager/src/main/java/com/winsun/controller/OrderConversionController.java

@@ -28,10 +28,7 @@ import java.io.InputStream;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Author: chenhaojian
@@ -60,7 +57,7 @@ public class OrderConversionController extends BaseController {
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
             ResponseData.error("无权限查询订单");
         }
-        List<Map<String,Object>> list = null;
+        List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
         if("".equals(startTime)&&"".equals(endTime)){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             // 暂时计算2019年6月1号开始数据
@@ -103,7 +100,7 @@ public class OrderConversionController extends BaseController {
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
             ResponseData.error("无权限查询订单");
         }
-        List<Map<String,Object>> list = null;
+        List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
         if("".equals(startTime)&&"".equals(endTime)){
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             // 暂时计算2019年6月1号开始数据