MrTech/ctg-app-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into sit

Browse Source
This commit is contained in:
Alawn
2021-04-13 17:30:48 +08:00
parent 56d58e745f 78a3798e3e
commit 423af5ec4e
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bui/etc/BUI_PUB_CTL.XML
+2 -2
View File
@@ -85,7 +85,7 @@
<Set>token=$TOKEN</Set>
<Set>funcId=$FUNC_ID</Set>
<Set>TXN_CD=$TXN_CD</Set>
<If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,4905103,2040867,2040862,2040865,2040863,2040864,2040860,2040868)">
<If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040869,2040862,2040860)">
<!--第三方鉴权-->
<Exec func="PUB:CallThirdComm" error="IGNORE">
<Arg name="HTxnCd" value="TokenVerify" />
@@ -149,7 +149,7 @@
<Exec func="PUB:RollbackWork" error="IGNORE" />
</Else>
<!--FLG_LOG值为0：代表此交易不用写入操作日志 ;其他情况则写入操作日志中 -->
<If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,4905103,2040867,2040862,2040865,2040863,2040864,2040860)">
<If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040862,2040860)">
<!--操作员流水 -->
<Set>MSG_TYP=$GWA.MSG_TYP</Set>
<Set>MSG_CD=$GWA.MSG_CD</Set>
bui/etc/cap/OBUICAP1/0040008_CTL.XML
+4 -9
View File
@@ -11,21 +11,16 @@
RUL_STS = 2 AND
(BNK_TYP = '%s' OR BNK_TYP IS NULL OR BNK_TYP = '') AND
(TRA_CD = '%s' OR TRA_CD IS NULL OR TRA_CD = '') AND
(TXN_CNL = '%s' OR TXN_CNL IS NULL OR TXN_CNL = '') AND
(YMCC_CD = '%s' OR YMCC_CD IS NULL OR YMCC_CD = '') AND
(RARD_CD = '%s' OR RARD_CD IS NULL OR RARD_CD = '') AND
(BNK_TYP = '%s' OR BNK_TYP IS NULL OR BNK_TYP = '') AND
(CRD_FLG = '%s' OR CRD_FLG IS NULL or CRD_FLG = '') AND
(TO_NUMBER(NVL(ATM_LOW,0)) &lt;= '%s') AND
(TO_NUMBER(NVL(ATM_UP,99999999999)) &gt;= '%s') AND
(DAT_LOW &lt;= '%s' OR DAT_LOW IS NULL OR DAT_LOW = '') AND
(DAT_UP &gt;= '%s' OR DAT_UP IS NULL OR DAT_UP = '') AND
(TIM_LOW &lt;= '%s' OR TIM_LOW = 0) AND
(TIM_UP &gt;= '%s' OR TIM_UP = 0) AND
(ROUT_FLG = '%s' OR ROUT_FLG IS NULL OR ROUT_FLG = '') OR
RUL_NO in ('0000')
(TIM_UP &gt;= '%s' OR TIM_UP = 0)
ORDER BY RUL_LVL ASC
</Sentence>
<Fields>BNK_TYP|TRA_CD|TXN_CNL|YMCC_CD|RARD_CD|BNK_TYP|ATM|ATM|DAT|DAT|TIM|TIM|ROUT_FLG|ROUT_FLG|ROUT_FLG|
<Fields>BNK_TYP|TRA_CD|CRD_FLG|ATM|ATM|DAT|DAT|TIM|TIM|
</Fields>
</DynSentence>
@@ -40,7 +35,7 @@
</DynSentence>
<FlowCtrl>
<Exec func="PUB:DumpETF" />
<Exec func="SXP:GetRandom" error="IGNORE">
<Arg name="SqlCmd" value="QRY_CMMTRTRULEINFO" />
<Arg name="DestName" value="CORG_NO" />
bui/etc/cap/OBUICAP1/2040865_CTL.XML
+1 -1
View File
@@ -41,7 +41,7 @@
</Exec>
<If condition="~RetCod=0">
<Exec func="PUB:GWASetMsg">
<Arg name="MsgCd" value="CAP00021"/>
<Arg name="MsgCd" value="CAP00031"/>
<Arg name="MsgDat" value="该路由组存在支付地抬头关联关系不允许删除"/>
</Exec>
<Return/>
bui/etc/cap/OBUICAP2_CTL.XML
+1 -1
View File
@@ -24,7 +24,7 @@
<Include file="app/bui/etc/BUI_PUB_CTL.XML"/> <!-- UI公共前后处理 -->
<!-- 公共前处理和后处理 -->
<Include file="app/bui/etc/common/BUI_INC.XML" />
<!--Include file="app/bui/etc/common/BUI_INC.XML" /-->
<!-- 商户电子账户信息 -->
<!--删除 -->
<Include file="etc/cap/OBUICAP2/4900000_CTL.XML" />