图片上传路径修改

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

@@ -7,9 +7,8 @@ import org.apache.commons.lang3.StringUtils;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.text.SimpleDateFormat;
 import java.util.Base64;
-import java.util.Date;
+import java.util.Calendar;
 
 /**
  * 二维码海报工具类
@@ -24,31 +23,39 @@ public class PicturesUtil {
      * <p>
      * 前端传来图片必须为jpeg格式
      * @param file 图片base64字符串
-     * @param path 图片上一级文件夹名
+     * @param partner 用户ID做为文件夹名
      * @param pathType 图片上一级文件夹名
      * @param
      * @return
      */
-    public static String uploadPictures(String file, String path,String pathType){
-        if(StringUtils.isBlank(path)){
-            path = "temp";
+    public static String uploadPictures(String file, String partner,String pathType){
+        if(StringUtils.isBlank(partner)){
+            partner = "temp";
         }
-        Date date = new Date();
-        SimpleDateFormat yyMMdd = new SimpleDateFormat("yyMMdd");
-        String h = yyMMdd.format(date.getTime());
+        Calendar now = Calendar.getInstance();
+        Integer yyyy = now.get(Calendar.YEAR);
+        Integer MM = (now.get(Calendar.MONTH) + 1);
+        Integer DD = now.get(Calendar.DAY_OF_MONTH);
+        String yymmdd = yyyy+"/"+MM+"/"+DD;
+        /*System.out.println("年: " + now.get(Calendar.YEAR));
+        System.out.println("月: " + (now.get(Calendar.MONTH) + 1) + "");
+        System.out.println("日: " + now.get(Calendar.DAY_OF_MONTH));
+        System.out.println("时: " + now.get(Calendar.HOUR_OF_DAY));
+        System.out.println("分: " + now.get(Calendar.MINUTE));*/
+        //blog.csdn.net/kookob/java/article/details/6885383
         String filePath = null;
         String[] multipartFiles = new String[]{file};
         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 = FilePath.PATH.getValue()+ pathType+ "/"  + h + "/" + path;
+                String  filePath1 = FilePath.PATH.getValue()+ pathType+ "/"  + partner + "/" + yymmdd;
                 File dir = new File(filePath1);
                 if (!dir.exists()) {
                     dir.mkdirs();
                 }
-                //enclosure/images/idCard/200525/temp/1590395528186.jpeg
-                filePath = FilePath.PATH.getValue()+ pathType+ "/"+ h + "/" + path + "/" + date.getTime() + "." + houzhui;
+                //enclosure/images/idCard/temp/年/月/日/name.jpeg
+                filePath = FilePath.PATH.getValue()+ pathType+ "/"  + partner + "/" + yymmdd + "." + houzhui;
 
                 //byte[] bytes = Base64.getUrlDecoder().decode(base64Data);
                 //byte[] bytes =new BASE64Decoder().decodeBuffer(base64Data);

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

@@ -175,7 +175,8 @@ public class OrderController extends BaseController {
      */
     @Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
     //@RequestMapping(value="list", method = RequestMethod.POST)
-    public ResponseData<Page<Order>> listOrder(@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
+    public ResponseData<Page<Order>> listOrder(
+            @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
             @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
             @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam("userType") String userType,
             @RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "kapin", required = false) String kapin,
@@ -210,7 +211,8 @@ public class OrderController extends BaseController {
     }
 
     @Permission(menuname = "导出订单", value = "download", method = RequestMethod.POST)
-    public ResponseData<String> downloadOrderView(@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
+    public ResponseData<String> downloadOrderView(
+            @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
             @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
             @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam("userType") String userType,
             @RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "kapin", required = false) String kapin,
@@ -218,6 +220,7 @@ public class OrderController extends BaseController {
             @RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName,
             @RequestParam(name = "orderStatus", required = false) String orderStatus,
             @RequestParam(name = "customerName", required = false) String customerName) {
+
         String dateFormat = "YYYY-MM-DD";
         if (StringUtils.isNotBlank(createTimeStart) && StringUtils.isNotBlank(createTimeEnd)) {
             createTimeStart = createTimeStart.substring(0, dateFormat.length()) + " 00:00:00";