Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of…

Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -290,7 +290,7 @@ public class ShoppingCartController {
         for (String sessionId : request.getSessionIds()){
             AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(sessionId);
             cartParamDto.setUserId(assortmentCustomerInfoVo.getMemberId());
-            shoppingCartService.setCartGoodsListTest(cartParamDto, LogThreadLocal.getTrackingNo(),10, TimeUnit.MINUTES);
+            shoppingCartService.setCartGoodsListTest(cartParamDto, LogThreadLocal.getTrackingNo(),60, TimeUnit.MINUTES);
         }
         return new BaseResponse("1","100","");
     }