Merge remote-tracking branch 'origin/qa' into qa

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 {
     }
 
 
-
 }

shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java

@@ -280,11 +280,14 @@ public class CouponTest {
          */
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = new ArrayList<>();
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
+        /*
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product);
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
+
+         */
     }
 
 
@@ -315,11 +318,14 @@ public class CouponTest {
          */
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = new ArrayList<>();
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
+        /*
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
             CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product);
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
+
+         */
         //ShoppingCartInfoRequestVo
         String shoppingCartInfoRequestVoStr = "{\"premiumExchangeActivity\":{\"activityCode\":\"MEHG2020092914160146595\",\"activityName\":\"丹妮加价购活动\",\"products\":[{\"attributes\":[],\"originalPrice\":1300,\"qty\":1,\"skuId\":\"186550397673068596\",\"skuName\":\"桔子单品12\",\"spuId\":\"186550397673068596\"}]},\"shoppingCartInfoRequestVo\":{\"flag\":0,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"2399\",\"reachStoreType\":4,\"receiveId\":\"3584084950985469155\",\"sessionId\":\"146e3ced5884092de0ba3d0369cf7dc338b515c8\",\"shopId\":\"716001\",\"useCustomerScore\":2,\"version\":\"2.0.1\"}}";
         GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo = JSONObject.parseObject(shoppingCartInfoRequestVoStr, new TypeReference<GetShoppingCartGoodsApportionRequestVo>() {