Merge branches 'feature/20210818_购物车新增积分商品_wuping' and 'qa' of…

Merge branches 'feature/20210818_购物车新增积分商品_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -46,7 +46,9 @@ public class CustomerScoreService implements IPromotionService {
         }
         GetUserScoreUseDetailRequest request = new GetUserScoreUseDetailRequest();
         request.setMemberId(userLoginInfoDto.getMemberId());
-        request.setUseScore(calculationDiscountResult != null ? calculationDiscountResult.getTotalScore() : 0);
+        if(calculationDiscountResult != null  && calculationDiscountResult.getTotalScore() != null){
+            request.setUseScore(calculationDiscountResult.getTotalScore());
+        }
         request.setPaidAmount(getValue(shoppingCartGoodsResponseVo.getTotalAmount()));
         request.setPartnerId(userLoginInfoDto.getPartnerId());
         GetUserScoreUserDetailResponse userScoreUseDetail = null;