近期更改。

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -370,7 +370,7 @@ public class AwaitSendController {
      * @throws IOException
      */
     private void savePostFile(String filePath, String text, String orderId) throws IOException {
-        File dir = new File(filePath + File.separator + "send_order");
+        File dir = new File(filePath);
         if (!dir.exists()) {
             dir.mkdir();
         }
@@ -566,7 +566,11 @@ public class AwaitSendController {
                 throw new RuntimeException("订单发货失败，请核查");
             }
             // 保存HTML
-            savePostFile(request.getServletContext().getRealPath("/common/"), jsonObject.toJSONString(), salesOrderInfo.getSalesOrderId());
+            String savePath = request.getServletContext().getRealPath("/common/") +
+                    File.separator + "send_order" +
+                    File.separator +
+                    DateTimeUtil.format(salesOrderInfo.getSalesCreateTime(), "yyyyMMdd");
+            savePostFile(savePath, jsonObject.toJSONString(), salesOrderInfo.getSalesOrderId());
         } catch (Exception e) {
             LOGGER.error("", e);
             return ResponseJson.getFAILURE().addResponseKeyValue("error", e.getMessage());
@@ -579,13 +583,19 @@ public class AwaitSendController {
     @ResponseBody
     @RequestMapping(value = "/rePrintOrder", produces= MediaType.APPLICATION_JSON_VALUE+";charset=utf-8")
     @RequiresPermissions("order:listAwaitSendOrder")
-    public ResponseJson rePrintOrder(@RequestParam("orderId") String orderId,@RequestParam("salesId") String salesId,
+    public ResponseJson rePrintOrder(@RequestParam("orderId") String orderId,
+                                     @RequestParam("salesId") Integer salesId,
                                      HttpServletRequest request) throws IOException {
-        String filePath = request.getServletContext().getRealPath("/common/send_order");
-        filePath = filePath + File.separator + orderId + ".txt";
+        SalesOrder salesOrderInfo = salesOrderService.getSalesOrderById(salesId);
+        String savePath = request.getServletContext().getRealPath("/common/") +
+                File.separator + "send_order" +
+                File.separator +
+                DateTimeUtil.format(salesOrderInfo.getSalesCreateTime(), "yyyyMMdd");
+
+        String filePath = savePath + File.separator + orderId + ".txt";
         //查询是否是子母单
         boolean isSub = false;
-        List<SalesOrder> orders = salesOrderService.listSublistCount(Integer.valueOf(salesId));
+        List<SalesOrder> orders = salesOrderService.listSublistCount(salesId);
         if(orders != null && orders.size() > 0){
             isSub = true;
         }