Merge branch 'saas_hgw_pay' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantOrderRecordServiceImpl.java

@@ -456,6 +456,10 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
                     log.error("error tenant callback request orderNo is null param:{}", data);
                     return "failed";
                 }
+                //只处理未支付状态的订单
+                if(!record.getOrderState().equals(0)){
+                    return "succeeded";
+                }
                 switch (transType) {
                     case "payment.succeeded":// 支付成功
                         Consumer<TenantOrderRecord> consumer = checkOrder.get(record.getOrderType());