合并分支，升级sdk版本为release

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -173,7 +173,7 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setOutShopNo(orderInfoReqs.getStoreId());
         wechatReportOrderDto.setSubOpenId(userLoginInfoDto.getOpenId());
         wechatReportOrderDto.setLoginToken(userLoginInfoDto.getSessionKey());
-        wechatReportOrderDto.setUserAmount(orderInfoReqs.getActualPayAmount().intValue());
+        wechatReportOrderDto.setUserAmount(orderInfoReqs.getSettlementAmount().intValue());
         wechatReportOrderDto.setOutOrderNo(orderInfoReqs.getOrderCode());
         wechatReportOrderDto.setTransactionId(orderExtInfoDto.getPaid_no());
         wechatReportOrderDto.setOutTradeNo(orderExtInfoDto.getPayTransId());