Merge branch 'feature/2.0.12-富友线下对接开放平台-lcf'

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

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

@@ -934,17 +934,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     public BaseResponse<GetMemberInfoResponseVo> getMemberInfo(GetMemberInfoRequestDto request) {
 
         GetMemberInfoResponseVo responseData = new GetMemberInfoResponseVo();
-        /*
-        GetMemberByMobileRequest getMemberByMobileRequest = new GetMemberByMobileRequest();
-        getMemberByMobileRequest.setIsHaveChannels("1");
-        getMemberByMobileRequest.setMobile(request.getMobile());
-        getMemberByMobileRequest.setPartnerId(request.getPartnerId());
 
-
-        */
         String partnerId = request.getPartnerId();
-        // com.freemud.application.sdk.api.base.BaseResponse<GetMemberByMobileResponse> memberByMobile = memberCenterService.getMemberByMobile(getMemberByMobileRequest, LogThreadLocal.getTrackingNo());
-        // String memberId = memberByMobile.getData().getMemberId();
         String memberId = request.getUserId();
         responseData.setUserId(memberId);
         List<GetMemberInfoRequestDto.OrderItemRequest> orderItemList = request.getOrderItemList();
@@ -955,20 +946,26 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             getMemberCouponListRequestDto.setPageNum(1);
             getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
             GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);
-            List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = result.getMemberCoupons();
-            Date nowDate = new Date();
-            memberCoupons = memberCoupons.stream().filter(item -> filterExpireCoupon(nowDate, item.getEndTime())).collect(Collectors.toList());//过滤掉过期的券
-            List<GetMemberInfoResponseVo.Coupon> coupons = memberCoupons.stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+            List<GetMemberInfoResponseVo.Coupon> coupons = new ArrayList<>();
+            if (result != null && CollectionUtils.isNotEmpty(result.getMemberCoupons())){
+                List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = result.getMemberCoupons();
+                Date nowDate = new Date();
+                memberCoupons = memberCoupons.stream().filter(item -> filterExpireCoupon(nowDate, item.getEndTime())).collect(Collectors.toList());//过滤掉过期的券
+                coupons = memberCoupons.stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+            }
             responseData.setCoupons(coupons);
-
             // 积分
             GetMemberInfoResponseVo.Score score = new GetMemberInfoResponseVo.Score();
             StatisticalScoreRequest statisticalScoreRequest = new StatisticalScoreRequest();
             statisticalScoreRequest.setMemberId(memberId);
             statisticalScoreRequest.setPartnerId(partnerId);
             com.freemud.application.sdk.api.base.BaseResponse<StatisticalScoreResponse> statisticalScoreResponseBaseResponse = memberPropertyService.statisticalScore(statisticalScoreRequest, LogThreadLocal.getTrackingNo());
-            StatisticalScoreResponse statisticalScoreResponse = statisticalScoreResponseBaseResponse.getData();
-            score.setCurrentScore(statisticalScoreResponse.getCurrentScore());
+            if (statisticalScoreResponseBaseResponse != null && statisticalScoreResponseBaseResponse.getData() != null){
+                StatisticalScoreResponse statisticalScoreResponse = statisticalScoreResponseBaseResponse.getData();
+                score.setCurrentScore(statisticalScoreResponse.getCurrentScore());
+            } else {
+                score.setCurrentScore(0);
+            }
             responseData.setScore(score);
 
         } else {
@@ -976,9 +973,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             List<CartGoods> cartGoodsList = orderItemList.stream().map(each -> convert2ShopCartGoods(each)).collect(toList());
 
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, partnerId
-                    , memberId, request.getStoreId(), "", false, request.getOrderType(), 0, "");
-            List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
-            responseData.setCoupons(coupons);
+                    , memberId, request.getStoreId(), "", false, request.getOrderType(), 0,"");
+            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())){
+                List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+                responseData.setCoupons(coupons);
+            }
 
             // 积分
             GetUserScoreUseDetailRequest scoreRequest = new GetUserScoreUseDetailRequest();
@@ -986,24 +985,26 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             scoreRequest.setPaidAmount(request.getActualPayAmount());
             scoreRequest.setPartnerId(partnerId);
             GetUserScoreUserDetailResponse userScoreUseDetail = customScoreClient.getUserScoreUseDetail(scoreRequest);
-            GetUserScoreUserDetailResponse.UserScoreDetailVo result = userScoreUseDetail.getResult();
-
             GetMemberInfoResponseVo.Score score = new GetMemberInfoResponseVo.Score();
-            score.setCurrentScore(result.getCurrentScore());
-            score.setReduceAmount(result.getReduceAmount());
-            score.setReduceScore(result.getUseScore());
-
+            if (userScoreUseDetail != null && userScoreUseDetail.getResult() != null){
+                GetUserScoreUserDetailResponse.UserScoreDetailVo result = userScoreUseDetail.getResult();
+                score.setCurrentScore(result.getCurrentScore());
+                score.setReduceAmount(result.getReduceAmount());
+                score.setReduceScore(result.getUseScore());
+            } else {
+                score.setCurrentScore(0);
+                score.setReduceAmount(0);
+                score.setReduceScore(0);
+            }
             responseData.setScore(score);
-
         }
         // 储值卡
         StatisticalPropertyRequest getMemberCardRequest = new StatisticalPropertyRequest();
         getMemberCardRequest.setPartnerId(partnerId);
         getMemberCardRequest.setMemberId(memberId);
         com.freemud.application.sdk.api.base.BaseResponse<List<GetSvcInfoByMemberIdResponse>> svcInfoByMemberId = memberPropertyService.getSvcInfoByMemberId(getMemberCardRequest, LogThreadLocal.getTrackingNo());
-
-        List<GetSvcInfoByMemberIdResponse> memberCardResponses = svcInfoByMemberId.getData();
-        if(CollectionUtils.isNotEmpty(memberCardResponses)) {
+        if (svcInfoByMemberId != null && CollectionUtils.isNotEmpty(svcInfoByMemberId.getData())){
+            List<GetSvcInfoByMemberIdResponse> memberCardResponses = svcInfoByMemberId.getData();
             // 查询储值卡的余额
             List<String> cardCodes = memberCardResponses.stream().map(GetSvcInfoByMemberIdResponse::getCardCode).collect(Collectors.toList());
             SVCCardAmountRequest svcCardAmountRequest = new SVCCardAmountRequest();
@@ -1013,8 +1014,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             List<SVCCardAmountResponse.CardSimpleInfo> cardSimpleInfos = svcCardAmountResponseBaseResponse.getData().getData().getCardSimpleInfos();
             List<GetMemberInfoResponseVo.Card> cards = cardSimpleInfos.stream().map(each -> convert2MemberSvcCard(each)).collect(toList());
             responseData.setCards(cards);
-        }
 
+        }
         return ResponseUtil.success(responseData);
     }