diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 9cc08e35..cfe135a7 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -66,6 +66,34 @@ EndIf + + If TNumberTaobinMember = "" Then + + Else + If PayWithQR = 1 Then + Var VendingTSID = VendingTSIDTmp + Else + Var VendingTSID = "" + EndIf + + + Var BmiYear = PointTaobinStr + Var PointCrm = "" + If FromConsent = 1 Then + Var PointCrm = "pdpa1" + EndIf + Var GetScore = VendingTSID + If TaobinErrorNetwork = 0 Then + AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore + Else + Var PointCrm = "" + AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore + EndIf + Var TNumberTaobinMember = "" + Var VendingTSID = "" + EndIf + + @@ -110,19 +138,19 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 142." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Else - SAVELOG "back_to_main from line > 116." + SAVELOG "back_to_main from line > 147." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf Else - If ActionOKCase = 2 Then - SAVELOG "back_to_main from line > 123." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - EndIf + EndIf @@ -169,6 +197,9 @@ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc ;Var Timeout = 0 Var ActionOKCase = 2 + + SAVELOG "back_to_main from line > 204." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" Else SAVELOG "back_to_main from line > 173." @@ -177,10 +208,7 @@ Else - If ActionOKCase = 2 Then - SAVELOG "back_to_main from line > 180." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" - EndIf + EndIf @@ -240,9 +268,46 @@ If waitAckPay = 2 Then If Timeout > 60 Then + + If CodeChannel = 1 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 + + - SAVELOG "back_to_main from line > 241." - Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + + SAVELOG "back_to_main from line > 309." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf EndIf @@ -282,8 +347,16 @@ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + + If CodeChannel = 0 Then + SAVELOG "back_to_main from line > 315." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Var waitAckPay = 2 + Var Timeout = 5 Var ActionOKCase = 1 + EndIf EndIf @@ -318,8 +391,16 @@ Var SessionID2 = "" Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate - + + If CodeChannel = 0 Then + SAVELOG "back_to_main from line > 357." + Open "ROOT/taobin_project/xml/page_drinkfail2.xml" + EndIf + + Var waitAckPay = 2 + Var Timeout = 5 Var ActionOKCase = 1 + EndIf EndIf @@ -349,6 +430,7 @@ Var ActionOKCase = 1 If CodeChannel = 0 Then + SAVELOG "back_to_main from line > 391." Open "ROOT/taobin_project/xml/page_drinkfail2.xml" EndIf @@ -365,7 +447,7 @@ If MachineState_Result = 1 Then If waitAckPay = 0 Then - Var waitAckPay = 1 + Var waitAckPay = 0 Var Timeout = 0 Var ProcessText = ""