打印订单功能优化，并增加缓存功能

watero-common-tool/src/main/java/com/iamberry/redis/RedisUtils.java

@@ -217,21 +217,4 @@ public class RedisUtils {
             jedis.close();
         }
     }
-
-    public static void main(String[] args) {
-        // 判断Redis是否存在当前月的缓存信息
-        String key = "weixiu_total_" + "201905";
-        String total = get(key);
-        String no = null;
-        if (total == null) {
-            // 本月没有生成过数据
-            no = "0001";
-            // 写入下次的使用数据
-            put(key, "0002");
-            // 设置31天后过期
-            expire(key, new Date(System.currentTimeMillis() + 2678400000L));
-        } else {
-            no = total;
-        }
-    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
+import com.iamberry.redis.RedisUtils;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
@@ -28,6 +29,7 @@ import com.iamberry.rst.service.product.mapper.ProductMapper;
 import com.iamberry.rst.service.sys.mapper.SysConfigMapper;
 import com.iamberry.rst.util.PageUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
+import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.slf4j.Logger;
@@ -503,7 +505,23 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Override
     public List<SalesOrderItem> listSalesOrderItem(SalesOrderItem salesOrderItem) {
-        return salesOrderMapper.listSalesOrderItem(salesOrderItem);
+        // 通过计算机名称来判断服务器环境
+        Map<String,String> map = System.getenv();
+        String name = map.get("COMPUTERNAME");
+        if ("iZ94klno8qrZ".equalsIgnoreCase(name)) {
+            name = "RST_";
+        } else {
+            name = "adv_";
+        }
+        // 获取数据
+        String key = name + "ORDER_ITEM_" + salesOrderItem.getItemOrderId();
+        List<SalesOrderItem> list = RedisUtils.list(key, SalesOrderItem.class);
+        if (list == null ) {
+            list = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+            RedisUtils.put(key, list);
+            RedisUtils.expire(key, new Date(259200000 + System.currentTimeMillis()));
+        }
+        return list;
     }
 
     @Override

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -262,6 +262,7 @@
     </where>
     GROUP BY tb_rst_sales_order_info.sales_id
     ORDER BY sales_create_time DESC
+    LIMIT 0, #{endOrderNO}
   </select>
 
 

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

@@ -136,13 +136,15 @@ public class AwaitSendController {
         mv.addObject("postMap", postMap);
         mv.addObject("errorOrderNum", errorOrderNum);
         mv.addObject("productColorList", productColorList);
+        mv.addObject("pageSize", pageSize);
         return mv;
     }
 
     // 打单发货页面
     @RequestMapping("/printOrderUI")
     @RequiresPermissions("order:listAwaitSendOrder")
-    public ModelAndView printOrderUI(@RequestParam(value = "orderId", required = false) String[] orders) {
+    public ModelAndView printOrderUI(@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "orderId", required = false) String[] orders) {
         SalesOrder salesOrder = new SalesOrder();
         if (orders == null) {
             salesOrder.setSalesShippingStatus(11);
@@ -158,7 +160,7 @@ public class AwaitSendController {
         salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
         // 查询确认的订单
         salesOrder.setSalesStatus(1);
-        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, pageSize, salesOrder, false);
         // 待发货产品总数
         int waitProductTotal = 0;
         // 查询订单项
@@ -420,7 +422,6 @@ public class AwaitSendController {
 
     /**
      * 跳转到手动发货页面
-     *
      * @return
      */
     @RequiresPermissions("salesOrder:send:salesOrder")
@@ -490,6 +491,7 @@ public class AwaitSendController {
                                  @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) {
         ResponseJson rj = ResponseJson.getFAILURE();
         salesOrder.setSalesShippingStatus(11);      //salesShippingStatus
+        salesOrder.setEndOrderNO(pageSize);
         List<SalesOrder>  salesOrderList = salesOrderService.listSalesOrder(salesOrder);
         StringBuffer ids = new StringBuffer();
         for (int i =0 ;i<salesOrderList.size();i++){

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -8,7 +8,7 @@
     <meta http-equiv="Cache-Control" content="no-siteapp" />
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
-<#include "/base/add_base.ftl">
+    <#include "/base/add_base.ftl">
     <script type="text/javascript" src="https://s.iamberry.com/js/LodopFuncs.js"></script>
     <title>打单发货</title>