Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group

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

@@ -1071,7 +1071,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     private CartGoods convert2ShopCartGoods(GetMemberInfoRequestDto.OrderItemRequest each){
         CartGoods card = new CartGoods();
-        int saleValue = (each.getProductPrice() * each.getProductQuantity() - each.getProductSharePrice()) / each.getProductQuantity();
+        int sharePrice = each.getProductSharePrice() == null ? 0 : each.getProductSharePrice();
+        int saleValue = (each.getProductPrice() * each.getProductQuantity() - sharePrice) / each.getProductQuantity();
         card.setAmount(Long.valueOf(saleValue));
         card.setOriginalPrice(each.getProductPrice() == null ? 0L : Long.valueOf(each.getProductPrice()));
         card.setQty(each.getProductQuantity());