Merge remote-tracking branch 'remotes/origin/feature/2.1.15-pos-prospectiveAmount'

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

@@ -3053,6 +3053,7 @@ public class OrderSdkAdapter {
                 orderSettlement.setCarrierDiscountAmount(orderSettlementResp.getCarrierDiscountAmount());
                 orderSettlement.setShopAmount(orderSettlementResp.getShopAmount());
                 orderSettlement.setPlatformServiceAmount(orderSettlementResp.getPlatformServiceAmount());
+                orderSettlement.setProspectiveAmount(orderSettlementResp.getProspectiveAmount().longValue());
                 orderSettlementList.add(orderSettlement);
             }
         }

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

@@ -66,4 +66,6 @@ public class OrderSettlementResp {
 
     //结算信息扩展字段映射对象
     private String extInfo;
+    //商家预计收入
+    private BigDecimal prospectiveAmount;
 }