现金支付扣减积分优化

order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java

@@ -66,6 +66,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 public class PointsMallOrderServiceImpl implements PointsMallOrderService {
@@ -198,7 +199,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 return ResponseUtil.error(createOrderResponseDto.getCode(), "支付异常," + response.getData().getResultMsg());
             }
             //唤起支付返回参数
-            pointsMallOrderAdapter.convent2CreateOrderResponseVo(createOrderResponseVo,appId,response.getData());
+            pointsMallOrderAdapter.convent2CreateOrderResponseVo(createOrderResponseVo, appId, response.getData());
         }
         //保存支付信息
         BaseResponse baseResponse1 = updateOrder(orderCode, points, cashPrice, partnerId, storeId, createOrderResponseVo.getFmId(), channel);
@@ -213,7 +214,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         }
         //全积分支付商品，订单完成
         if (ExchangeTypeEnum.TYPE_1.getCode().equals(exchangeType)) {
-            BaseResponse response1 = orderPaySuccess(createOrderResponseDto.getResult(), points,false);
+            BaseResponse response1 = orderPaySuccess(createOrderResponseDto.getResult(), points, false);
             if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, response1.getCode())) {
                 return response1;
             }
@@ -287,7 +288,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             orderItemList.add(orderItemResp);
         }
         orderInfo.setOrderItemList(orderItemList);
-        BaseResponse baseResponse = orderPaySuccess(orderInfo, 0,true);
+        BaseResponse baseResponse = orderPaySuccess(orderInfo, 0, true);
         if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
             return refundFaileMessage(baseResponse.getMessage());
         }
@@ -515,7 +516,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
 
 
     //共用支付成功方法
-    private BaseResponse orderPaySuccess(OrderInfoReqs orderInfo, Integer points,Boolean isCash) {
+    private BaseResponse orderPaySuccess(OrderInfoReqs orderInfo, Integer points, Boolean isCash) {
         String nickName = orderInfo.getUserName();
         String orderCode = orderInfo.getOrderCode();
         String partnerId = orderInfo.getPartnerId();
@@ -557,14 +558,18 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             return ResponseUtil.error(updateOrderStateResp.getCode(), "更新订单异常");
         }
         //有现金支付,扣减积分
-        if (isCash) {
-            points = orderInfo.getOrderPayItemCreateReqList().get(0).getPayAmount().intValue();
+        if (isCash && CollectionUtils.isNotEmpty(orderInfo.getOrderPayItemCreateReqList())) {
+            List<OrderPayItemResp> collect = orderInfo.getOrderPayItemCreateReqList().stream().filter(orderPayItemResp ->
+                    orderPayItemResp.getPayChannelType().equals(PayChannelType.POINTS.getIndex().intValue())).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                points = collect.get(0).getPayAmount().intValue();
                 UseScoreRequest userScoreRequest = pointsMallOrderAdapter.convent2UseScoreRequest(partnerId, memberId, appId, orderCode, points);
                 CustomerPropertyBaseResponse baseResponse = customerPropertyClient.useScore(userScoreRequest);
                 if (!Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, baseResponse.getCode())) {
                     return ResponseUtil.error(baseResponse.getCode(), "扣减积分失败");
                 }
             }
+        }
         return ResponseUtil.success();
     }