Merge branch 'feature/20200525_会员价'

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

@@ -863,7 +863,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             ProductBeanDTO productBean;
             if ((productBean = productBeanMap.get(sendGoods.getGoodsId())) != null) {
                 // 设置加价购商品原价
-                sendGoods.setOriginalPrice(productBean.getOriginalPrice());
+                sendGoods.setOriginalPrice(productBean.getFinalPrice());
             } else {
                 throw new ServiceException(ResponseResult.SHOPPING_CART_SENDGOODS_NOT_EXIST);
             }

shopping-cart-application-service/src/main/java/cn/freemud/service/strategy/DefaultDiscountStrategy.java

+package cn.freemud.service.strategy;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: DefaultDiscountStrategy
+ * @Package cn.freemud.service.strategy
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/6/2 16:12
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Component
+public class DefaultDiscountStrategy {
+}