储值卡和返回积分抵扣金额

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2398,6 +2398,7 @@ public class OrderAdapter {
         previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
         previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
         previewOrderInfoVo.setFullDiscount(queryOrderResponseVo.getFullDiscountAmount());
+        previewOrderInfoVo.setCustomerScoreAmount(queryOrderResponseVo.getCustomerScoreAmount());
         if (queryOrderResponseVo.getCouponInfo() != null) {
             previewOrderInfoVo.setCouponDiscount(queryOrderResponseVo.getCouponInfo().getCouponAmount());
         }
@@ -2457,9 +2458,11 @@ public class OrderAdapter {
             sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
         }
         sdkUpdateOrderProductInfoRequest.setThirdOrderCode(queryOrderByIdResponse.getData().getThirdOrderCode());
-        sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
-        sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());
-        sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());
+        if (shoppingCartGoodsResponse != null) {
+            sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
+            sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());
+            sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());
+        }
         sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
         sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
         sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());

order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java

@@ -117,6 +117,10 @@ public class PreviewOrderInfoVo {
      */
     private ShoppingCartCustomerScoreVo customerScoreVo;
     /**
+     * 用户积分抵扣金额
+     */
+    private Long customerScoreAmount;
+    /**
      * svc卡支付描述
      */
     private String svcDiscountDesc;

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

@@ -465,7 +465,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
         }
         // 校验svc卡
-        checkOrder.checkCardCode(createReserveOrderVo.getPartnerId(),assortmentCustomerInfoVo.getMemberId(), createReserveOrderVo.getCardCode());
+        checkOrder.checkCardCode(assortmentCustomerInfoVo.getPartnerId(),assortmentCustomerInfoVo.getMemberId(), createReserveOrderVo.getCardCode());
         CreateOrderResponseVo orderResponseVo = null;
         //拉取订单详细信息
         BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();