Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh' into qa

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -580,7 +580,8 @@ public class ShoppingCartConvertAdapter {
                     || ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType())
                     || ObjectUtils.equals(GoodsTypeEnum.ALL_COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType()))
                     ? cartGoods.getSkuId() : cartGoods.getSpuId());
-            productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());
+            //fisherman 这里 商品服务校验需要商品原价, 不是购物车的 finalPrice
+            productType.setPrice(cartGoods.getOriginalPrice() == null ? 0 : cartGoods.getOriginalPrice().intValue());
             productType.setValidatePrice(productType.getPrice() == 0 ? 0 : 1);
             productType.setValidateAttribute(1);
             productType.setValidateStatuses(Arrays.asList(2));