Merge remote-tracking branch 'remotes/origin/feature/1.9.21_储值卡支付的订单'

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

@@ -879,6 +879,8 @@ public class OrderSdkAdapter {
         data.setOid(orderInfoReqs.getOrderCode());
         data.setOrderType(getOldOrderType(orderInfoReqs.getOrderType()));
         data.setAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
+        data.setSettlementAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
+        data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue());
         data.setUserId(orderInfoReqs.getUserId());
         data.setUserName(orderInfoReqs.getUserName());
         data.setType(getOldOrderType(orderInfoReqs.getOrderType()));

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -104,6 +104,14 @@ public class QueryOrdersResponse {
              */
             private Long amount;
             /**
+             * 用户在界面上看到的支付金额，单位分
+             */
+            private Long settlementAmount;
+            /*
+            * 实际支付金额
+            */
+            private Long actualPayAmount;
+            /**
              * 吧台桌号
              */
             private String barCounter;