Merge branch 'feature/20201229-并发fix-lcf' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java

@@ -132,7 +132,7 @@ public class AppOrderServiceImpl implements AppOrderService {
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(createPrepayVo.getPartnerId(), createPrepayVo.getPayAppId(), createPrepayVo.getOpenId(), faceCode,
                 cardCode, createPrepayVo.getPayCode(), createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderOperateDto.getTotalAmount(),
                 createOrderOperateDto.getCardAmount(), extInfo, transId, OrderClientType.APP);
-        redisService.savePaymentTransIdOrder(RedisUtil.getPaymentTransIdOrderKey(transId), productOrderBean.getOid(), 30L, TimeUnit.MINUTES);
+        redisService.savePaymentTransIdOrder(RedisUtil.getPaymentTransIdOrderKey(transId), productOrderBean.getOid(), 60L, TimeUnit.MINUTES);
         return orderservice.createPrepayOrder(createPrepayRequestDto);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ItemServiceImpl.java

@@ -156,7 +156,7 @@ public class ItemServiceImpl implements ItemService {
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productInfosDto.getErrcode())
                 && productInfosDto.getData() != null
                 && CollectionUtils.isNotEmpty(productInfosDto.getData().getProducts())) {
-            productInfosDto.getData().getProducts().parallelStream().forEach(productBean -> {
+            productInfosDto.getData().getProducts().stream().forEach(productBean -> {
                 //多规格获取sku信息
                 GetProductsVo getProductsVo = new GetProductsVo();
                 getProductsVo.setSkuId(productBean.getPid());
@@ -194,8 +194,8 @@ public class ItemServiceImpl implements ItemService {
         ProductListDto productListDto = storeItemClient.getSpuIdsBySkuIds(bySkuIdsDto);
         if (ResponseCodeConstant.RESPONSE_SUCCESS.equals(productListDto.getErrcode())
                 && CollectionUtils.isNotEmpty(productListDto.getData())) {
-            productListDto.getData().parallelStream().forEach(product -> {
-                product.getSkuList().parallelStream().forEach(skuProductBean -> {
+            productListDto.getData().stream().forEach(product -> {
+                product.getSkuList().stream().forEach(skuProductBean -> {
                     if (resultMap.get(skuProductBean.getSkuId()) != null) {
                         GetProductsVo getProductsVo = resultMap.get(skuProductBean.getSkuId());
                         getProductsVo.setSpuId(product.getPid());
@@ -232,5 +232,4 @@ public class ItemServiceImpl implements ItemService {
     }
 
 
-
 }