edv/SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDMDatenverarbeitung, Formulare, MSE API

Browse Source
This commit is contained in:
d.breimaier
2024-08-23 11:05:58 +02:00
parent 23b8d757ba
commit 94501c2214
5 changed files with 266 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
VERAG_PROG_ALLGEMEIN/Schnittstellen/MSE/cMSEAPI.vb
View File

@@ -1,4 +1,5 @@
Imports System.Data.SqlClient
Imports System.EnterpriseServices
Imports System.Net
Imports System.Reflection
@@ -73,7 +74,7 @@ Public Class cMSEAPI
End Function
Public Function getNewestTransactions(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer) As String
Public Function getNewestTransactions(jwt As String, dt As DataTable, ByRef batchNr As Integer, ByRef totalPages As Integer, ByRef currentPage As Integer, onlyBilledTransactions As Boolean) As String
Try
Dim returnText As String = ""
Dim failureText As String = ""
@@ -150,7 +151,7 @@ Public Class cMSEAPI
Return "FEHLER im TransaktionArray"
End If
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"), onlyBilledTransactions)
Catch ex As WebException
@@ -516,7 +517,7 @@ Public Class cMSEAPI
'If json.StringOf("receiver") = "10738" Then saveTransactions(num, dt, transactions, json.StringOf("receiver"))
saveTransactions(num, dt, transactions, json.StringOf("receiver"), True) ' wenn ID explizit aufgerufen keine Prüfung auf receivcer und purchaseDate
saveTransactions(num, dt, transactions, json.StringOf("receiver"), True,) ' wenn ID explizit aufgerufen keine Prüfung auf receivcer und purchaseDate
End If
@@ -1035,7 +1036,7 @@ Public Class cMSEAPI
Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False)
Public Sub saveTransactions(num As Integer, dt As DataTable, transactions As Chilkat.JsonArray, receiver As Integer, Optional ignorePurchaseDate As Boolean = False, Optional onlyBilledTransactions As Boolean = True)
Dim j As Integer = 0
@@ -1097,15 +1098,6 @@ Public Class cMSEAPI
R("entry_point_name") = transaction.StringOf("entry_point_name")
R("exit_point_name") = transaction.StringOf("exit_point_name")
R("device_product_type") = transaction.StringOf("device_product_type")
If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And CDbl(transaction.StringOf("msts_fee_amount").Replace(".", ",")) <> 0) Then
R("device_product_type") = transaction.StringOf("transaction_product_name")
End If
If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And transaction.StringOf("transaction_product_name") = "Charge - HU-GO SIM card fee") Then
R("device_product_type") = transaction.StringOf("transaction_product_name")
End If
R("device_product_number") = transaction.StringOf("device_product_number")
R("transaction_product_id") = transaction.IntOf("transaction_product_id")
R("transaction_product_name") = transaction.StringOf("transaction_product_name")
@@ -1141,6 +1133,18 @@ Public Class cMSEAPI
'R("distance_km") = transaction.StringOf("distance_km")
If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And CDbl(transaction.StringOf("msts_fee_amount").Replace(".", ",")) <> 0) Then
R("device_product_type") = transaction.StringOf("transaction_product_name")
End If
If ((transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null") And transaction.StringOf("transaction_product_name") = "Charge - HU-GO SIM card fee") Then
R("device_product_type") = transaction.StringOf("transaction_product_name")
End If
If (transaction.IntOf("transaction_product_id") = 453 And (transaction.StringOf("device_product_type") = "" Or transaction.StringOf("device_product_type") = "null")) Then
R("device_product_type") = "HU-GO SIM renewal"
End If
Dim purchase_datetime_string As String = transaction.StringOf("purchase_datetime")
Dim entry_datetime_string As String = transaction.StringOf("entry_datetime")
Dim exit_datetime_string As String = transaction.StringOf("exit_datetime")
@@ -1193,7 +1197,13 @@ Public Class cMSEAPI
trans.tstmp = Now()
trans.USteuer_EUR = checkNulDbl(R("USteuer_EUR"))
'trans.distance_km = CDbl(R("distance_km"))
trans.SAVE()
If onlyBilledTransactions Then
If trans.transaction_status = "Billed" Then trans.SAVE()
Else
trans.SAVE()
End If
End If