Merge remote-tracking branches…

Merge remote-tracking branches 'remotes/origin/feature-2020/4/23-1.9.21-ES查询SDK方法升级-海波' and 'remotes/origin/feature-2020/4/23-1.9.21-预约单-海波'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -517,7 +517,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setOrderCodes(request.getOrderIds());
         orderConditionsReq.setPartnerId(request.getCompanyId());
         orderConditionsReq.setPageSize(request.getPageSize());
-        orderConditionsReq.setPageNum(request.getPageNumber());
+        orderConditionsReq.setPageNum(request.getPageNumber()>0?request.getPageNumber():0);
         orderConditionsReq.setMobile(request.getPhoneNo());
         orderConditionsReq.setStoreIds(request.getShopIds());
         orderConditionsReq.setPayStatuses(request.getPayStatuses());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -659,8 +659,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public QueryOrdersResponse getOrderListByES(QueryOrdersByConditionsRequest queryOrdersByConditionsRequest) {
         OrderConditionsReq request = orderSdkAdapter.convent2QueryOrdersByConditionsRequest(queryOrdersByConditionsRequest);
         BaseDownLoadResponse<List<OrderInfoReqs>> baseDownLoadResponse = orderDownLoadSdkService.queryOrderByConditions(request, "");
-        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || StringUtils.isEmpty(baseDownLoadResponse.getScrollId()) ||
-                CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
+
+        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
             QueryOrdersResponse queryOrdersResponse = new QueryOrdersResponse();
             queryOrdersResponse.setErrcode(Integer.parseInt(baseDownLoadResponse.getCode()));
             QueryOrdersResponse.DataBean dataBean = new QueryOrdersResponse.DataBean();
@@ -670,6 +670,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             queryOrdersResponse.setData(dataBean);
             return queryOrdersResponse;
         }
+
+        if(request.getPageNum()>0){
+            return orderSdkAdapter.convent2OrdersResponseByES(baseDownLoadResponse);
+        }
+
         List<OrderInfoReqs> list = new ArrayList<>();
         list.addAll(baseDownLoadResponse.getResult());
         if (baseDownLoadResponse.getTotalNum() > queryOrdersByConditionsRequest.getPageSize()) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/util/LockUtils.java

@@ -13,10 +13,14 @@ public class LockUtils {
     private static String redis_lock_after="saas:lockAfter:";
 
     public static Boolean lockAfter(RedisTemplate redisTemplate,String afterId){
-        return lock(redisTemplate,redis_lock_after+afterId);
+        return redisLock(redisTemplate,redis_lock_after+afterId);
     }
 
-    private static boolean lock(RedisTemplate redisTemplate,String key){
+    public static Boolean lock(RedisTemplate redisTemplate,String key,Long second){
+        return redisLockByTime(redisTemplate,key,second);
+    }
+
+    private static boolean redisLock(RedisTemplate redisTemplate,String key){
         String lock =  key;
         // 利用lambda表达式
         return (Boolean) redisTemplate.execute((RedisCallback) connection -> {
@@ -32,4 +36,21 @@ public class LockUtils {
         });
     }
 
+    private static boolean redisLockByTime(RedisTemplate redisTemplate,String key,Long second){
+        String lock =  key;
+        Long lockSecond = second;
+        // 利用lambda表达式
+        return (Boolean) redisTemplate.execute((RedisCallback) connection -> {
+            long expireAt = second;
+            Boolean acquire = connection.setNX(lock.getBytes(), String.valueOf(expireAt).getBytes());
+
+            if (acquire) {
+                connection.expire(lock.getBytes(),expireAt);
+                return true;
+            } else {
+                return false;
+            }
+        });
+    }
+
 }