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

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

@@ -40,6 +40,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -176,8 +177,23 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setOutOrderNo(orderInfoReqs.getOrderCode());
         wechatReportOrderDto.setTransactionId(orderExtInfoDto.getPaid_no());
         wechatReportOrderDto.setOutTradeNo(orderExtInfoDto.getPayTransId());
-        wechatReportOrderDto.setTotalAmount(orderInfoReqs.getOriginalAmount().intValue());
-        wechatReportOrderDto.setDiscountAmount(orderInfoReqs.getSettlementAmount().intValue());
+
+        // 计算优惠金额
+        int discountAmount = 0;
+        List<OrderSettlementResp> accountList = orderInfoReqs.getOrderSettlementDetailList();
+        if(accountList != null && !CollectionUtils.isEmpty(accountList)) {
+            for(OrderSettlementResp accountBean : accountList) {
+                try {
+                    Long price = accountBean.getSettlementAmount() == null ? 0 : accountBean.getSettlementAmount().longValue();
+                    if(price < 0) {
+                        discountAmount = discountAmount - price.intValue();
+                    }
+                } catch (Exception e) {
+                }
+            }
+        }
+        wechatReportOrderDto.setTotalAmount(discountAmount+orderInfoReqs.getSettlementAmount().intValue());
+        wechatReportOrderDto.setDiscountAmount(discountAmount);
         //订单状态 (2—用户下单；1—支付完成)
         wechatReportOrderDto.setStatus(NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState()) ? 2 : 1);
         // 菜品列表
@@ -191,15 +207,6 @@ public class OrderCallBackMQService {
             dishList.add(dishInfo);
         }
         wechatReportOrderDto.setDishList(dishList);
-        //优惠列表
-        List<WechatReportOrderDto.AccountBean> accountList = new ArrayList<>();
-        for (OrderSettlementResp orderSettlementResp :orderInfoReqs.getOrderSettlementDetailList()) {
-            WechatReportOrderDto.AccountBean accountBean = new WechatReportOrderDto.AccountBean();
-            accountBean.setAccountId(orderSettlementResp.getExternalObjectId());
-            accountBean.setPrice(orderSettlementResp.getAgentDiscountAmount());
-            accountList.add(accountBean);
-        }
-        wechatReportOrderDto.setAccountList(accountList);
         return wechatReportOrderDto;
     }
 }