Merge branch 'dev_v1.3.4_20220914' into dev_v1.3.4_20220919

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -176,6 +176,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderItem.setGiftIntegration(cartPromotionItem.getIntegration());
             orderItem.setGiftGrowth(cartPromotionItem.getGrowth());
             orderItem.setPromoterId(cartPromotionItem.getPromoterId());
+            orderItem.setPrecisionAmount(BigDecimal.ZERO);
             orderItemList.add(orderItem);
         }
         //判断购物车中商品是否都有库存

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -722,10 +722,9 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
                 .map(ActivityPlanReward::getRewardId).distinct().collect(Collectors.toList());
 
         String clientType = activityPlan.getActivityClient().getCode();
-        long validRewardNums = activityRewardService.listByIds(collect).stream()
-                .filter(x -> Lists.newArrayList(x.getRewardClient().split(",")).contains(clientType))
-                .count();
-        if (saveOrUpdateRewardDto.getUpdateRewardDtoList().size() != validRewardNums) {
+        boolean invalidRewardNums = activityRewardService.listByIds(collect).stream()
+                .anyMatch(x -> !Lists.newArrayList(x.getRewardClient().split(",")).contains(clientType));
+        if (invalidRewardNums) {
             throw new BizException("添加奖品与活动客户端不匹配");
         }