Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa'

修改拼单完成之后失效时间1分钟

See merge request !34

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/CollageOrderBaseServiceImpl.java

@@ -194,15 +194,18 @@ public class CollageOrderBaseServiceImpl implements CollageOrderBaseService {
 
             // 若状态更新为已完成 则将失效时间改为5分钟
             if (CollageOrderStatus.COMPLETE.getValue().equals(collageOrderDto.getStatus())) {
-                expireSeconds = 5 * 60L;
+                expireSeconds = 1 * 60L;
             } else if (CollageOrderStatus.CANCEL.getValue().equals(collageOrderDto.getStatus())) {
                 expireSeconds = 1 * 60L;
             }
 
+            // 修改拼单主信息失效时间
+            collageOrder.setExpireTime(System.currentTimeMillis() + expireSeconds * 1000);
+
             // 更新拼单基础信息
             this.putCollageBaseHash(collageBaseHashKey, collageOrder, expireSeconds);
 
-            // 若状态修改为已完成 则失效时间修改为5分钟
+            // 更新其他缓存失效时间
             this.updateCollageOrderExpire(collageOrderDto.getPartnerId(), collageOrderDto.getStoreId(), collageOrderDto.getCreateCollageUserId(), expireSeconds);
 
             return CartResponseUtil.success();