三方展示活动信息

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -3074,7 +3074,7 @@ public class OrderSdkAdapter {
                 orderSettlement.setExternalObjectId(orderSettlementResp.getExternalObjectId());
                 orderSettlement.setExternalObjectName(orderSettlementResp.getExternalObjectName());
                 orderSettlement.setExternalObjectSubId(null);
-                orderSettlement.setIgnoreInDiscountAmount(null);
+                orderSettlement.setIgnoreInDiscountAmount(orderSettlementResp.getIgnoreInDiscountAmount());
                 orderSettlement.setSettlementType(orderSettlementResp.getSettlementType());
                 if (orderSettlementResp.getSettlementType() != null && orderSettlementResp.getSettlementType().intValue() == 23
                         && "setMeal".equals(orderSettlementResp.getExternalObjectId())) {

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

@@ -3906,11 +3906,12 @@ public class OrderAdapter {
         orderClients.add(OrderClientType.ALIPAY.getIndex());
         queryOrdersDto.setOrderClients(orderClients);
 
+        List<Integer> payStatus = new ArrayList<>();
         if (queryPayStatus == null){
-            List<Integer> payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
+            payStatus = Arrays.asList(PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode());
             queryOrdersDto.setPayStatuses(payStatus);
         } else {
-            List<Integer> payStatus = Arrays.asList(queryPayStatus);
+            payStatus = Arrays.asList(queryPayStatus);
             queryOrdersDto.setPayStatuses(payStatus);
         }
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderSettlementResp.java

@@ -68,4 +68,6 @@ public class OrderSettlementResp {
     private String extInfo;
     //商家预计收入
     private BigDecimal prospectiveAmount;
+    //是否忽略金额计算
+    private Boolean ignoreInDiscountAmount;
 }