Merge branch '电子发票' into qa

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

@@ -279,6 +279,7 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setUserAmount(userAmount > 0 ? userAmount : orderInfoReqs.getSettlementAmount().intValue());
         wechatReportOrderDto.setOutOrderNo(orderInfoReqs.getOrderCode());
         wechatReportOrderDto.setTransactionId(orderExtInfoDto.getPaid_no());
+        wechatReportOrderDto.setOrderDetailPath(orderExtInfoDto.getOrderDetailPath());
         wechatReportOrderDto.setOutTradeNo(orderExtInfoDto.getPayTransId());
 
         // 计算优惠金额

call-back-service/src/main/java/cn/freemud/entities/dto/OrderExtInfoDto.java

@@ -102,4 +102,9 @@ public class OrderExtInfoDto {
      * 扫呗商户号 新支付服务做中转使用
      */
     private String terminalId;
+
+    /**
+     * 订单详情页地址
+     */
+    private String orderDetailPath;
 }

call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java

@@ -115,7 +115,10 @@ public class WechatReportOrderDto {
     private String ticketNo;
     //订单修改时间
     private Long gmtModified;
-
+    /**
+     * 订单详情页地址
+     */
+    private String orderDetailPath;
 
     private List<AccountBean> accountList;