Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project
This commit is contained in:
kong
commit
c3e997dbc7
12 changed files with 202 additions and 163 deletions
|
|
@ -26,8 +26,43 @@
|
|||
|
||||
Var waitAckPay = 0
|
||||
Var VendingTSIDTmp = ""
|
||||
|
||||
|
||||
|
||||
|
||||
If PayWithQR = 1 Then
|
||||
Var VendingTSIDTmp = VendingTSID
|
||||
|
||||
If TNumberTaobinCredit = "" Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Else
|
||||
Var TelephoneNumber = TNumberTaobinCredit
|
||||
Var PayO2 = CoffeePinNumber
|
||||
EndIf
|
||||
|
||||
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var PayO2 = ""
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Else
|
||||
|
||||
If StoreCreditFlag = 1 Then
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -78,12 +113,14 @@
|
|||
|
||||
Else
|
||||
|
||||
SAVELOG "back_to_main from line > 116."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If ActionOKCase = 2 Then
|
||||
SAVELOG "back_to_main from line > 123."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -133,12 +170,14 @@
|
|||
Var ActionOKCase = 2
|
||||
|
||||
Else
|
||||
SAVELOG "back_to_main from line > 173."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If ActionOKCase = 2 Then
|
||||
SAVELOG "back_to_main from line > 180."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -157,7 +196,7 @@
|
|||
|
||||
If Simulation = "true" Then
|
||||
If CountDownBrewing = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -176,12 +215,13 @@
|
|||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
|
||||
|
||||
If Timeout > 330 Then
|
||||
If Timeout > 540 Then
|
||||
SAVELOG "back_to_main from line > 217."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
If Timeout > 300 Then
|
||||
If Timeout > 480 Then
|
||||
Var MachineState_Result = 2
|
||||
EndIf
|
||||
|
||||
|
|
@ -209,13 +249,24 @@
|
|||
Var PayO2 = CoffeePinNumber
|
||||
EndIf
|
||||
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
|
||||
Var PayDetail = "1/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
||||
|
||||
|
||||
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
Var ServiceType = "coffee"
|
||||
Var ServiceCredit = SelectDrink
|
||||
Var SuggestID = ""
|
||||
Var SessionID2 = ""
|
||||
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
|
||||
Var ActionOKCase = 1
|
||||
EndIf
|
||||
|
|
@ -231,12 +282,20 @@
|
|||
Var PayO2 = CoffeePinNumber
|
||||
EndIf
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
;Var TelephoneNumber = "0899999999"
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Var PayDetail = "1/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
||||
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
|
||||
Var ServiceType = "coffee"
|
||||
Var ServiceCredit = SelectDrink
|
||||
Var SuggestID = ""
|
||||
Var SessionID2 = ""
|
||||
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
Var ActionOKCase = 1
|
||||
|
|
@ -244,46 +303,30 @@
|
|||
EndIf
|
||||
|
||||
If ChangeOK = 3 Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
If ChangeOK = 4 Then
|
||||
If ActionOKCase = 0 Then
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var ServiceType = "coffee"
|
||||
Var ECommerce = ""
|
||||
Var ECommerce = ECommerce + PriceDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + "C00"
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + CodeNumber
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + "C"
|
||||
Var ServiceParameter = "max"
|
||||
Var ServiceCharge = 0
|
||||
Var AccountType = "new"
|
||||
Var testservice = "kbank"
|
||||
Var tc = ""
|
||||
Var GetScore = ""
|
||||
Var OperatorName = ""
|
||||
Var SessionID = ""
|
||||
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
Var ActionOKCase = 2
|
||||
|
||||
Var SVT = "coffee"
|
||||
Var ACC = "089999999"
|
||||
|
||||
Var PayDetail = "1/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
||||
|
||||
|
||||
|
||||
Var DEE = PayDetail
|
||||
|
||||
PAYEXT SVT ACC VendingTSIDTmp DEE
|
||||
|
||||
Var ActionOKCase = 1
|
||||
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If MachineState_Result = 1 Then
|
||||
If waitAckPay = 0 Then
|
||||
|
||||
|
|
@ -305,8 +348,14 @@
|
|||
Var ServiceCredit = SelectDrink
|
||||
Var SuggestID = ""
|
||||
|
||||
Var PayDetail = "1/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
||||
|
||||
Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
If PayWithQR = 0 Then
|
||||
If CodeChannel = 1 Then
|
||||
|
|
@ -351,46 +400,15 @@
|
|||
|
||||
Else
|
||||
|
||||
|
||||
;no wait ack pay
|
||||
Var waitAckPay = 0
|
||||
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Else
|
||||
Var SVT = "coffee"
|
||||
Var ACC = "089999999"
|
||||
Var DEE = PayDetail
|
||||
|
||||
If StoreCreditFlag = 1 Then
|
||||
PAYEXT SVT ACC VendingTSIDTmp DEE
|
||||
|
||||
|
||||
Var VendingDiscount = 0
|
||||
Var VendingCampaign = 0
|
||||
Var ServiceType = "credit"
|
||||
Var SessionID2 = SelectDrink
|
||||
Var ServiceCredit = "coffee"
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
|
||||
Else
|
||||
|
||||
;no wait ack pay
|
||||
Var waitAckPay = 0
|
||||
|
||||
|
||||
Var SVT = "coffee"
|
||||
Var ACC = "089999999"
|
||||
Var DEE = "1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
PAYEXT SVT ACC VendingTSID DEE
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -406,9 +424,8 @@
|
|||
If ErrTimeout = 0 Then
|
||||
Var ErrTimeout = 1
|
||||
|
||||
|
||||
|
||||
If PayWithQR = 0 Then
|
||||
If PayWithQR = 0 Then
|
||||
If CodeChannel = 0 Then
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
|
|
@ -418,88 +435,45 @@
|
|||
Else
|
||||
Change ServiceAmount2
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
|
||||
Var ServiceAmount3 = ServiceAmount2 - IntVendingCampaign
|
||||
|
||||
If StoreCreditFlag = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
Change ServiceAmount2
|
||||
Change ServiceAmount3
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
If CodeChannel = 1 Then
|
||||
Var ChangeOK = 4
|
||||
Else
|
||||
Var ChangeOK = 3
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
Var ChangeOK = 2
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If CodeChannel = 0 Then
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
Var ServiceAmount2 = CoinAmount
|
||||
If StoreCreditFlag = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
Change ServiceAmount2
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
Else
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
Var ChangeOK = 3
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
Var ServiceAmount2 = CoinAmount
|
||||
If StoreCreditFlag = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
Change ServiceAmount2
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
Else
|
||||
If ChangeFlag2 = 1 Then
|
||||
Var ChangeOK = 2
|
||||
Else
|
||||
Var ChangeOK = 4
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var ChangeOK = 3
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
|
||||
|
||||
|
|
@ -514,6 +488,7 @@
|
|||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
SAVELOG "back_to_main from line > 488."
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue