From 53e1af5a04345a044c80c34a57f43bff8cb53adc Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 24 九月 2024 15:07:27 +0800 Subject: [PATCH] 2024-09-24 朱宝民 优化获取交易统计记录接口(由于付款方式变化) --- pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml | 105 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 83 insertions(+), 22 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml index 130b67f..55fe57e 100644 --- a/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml +++ b/pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml @@ -10,16 +10,23 @@ </city> </province> </districts> - <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> + <dictionaries> + <dict code="protocol" title="鍗忚" valueType="2"> + <dictItem> + <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" /> + <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" /> + </dictItem> + </dict> + </dictionaries> + <user name="瓒呯骇绠$悊鍛�" phone="admin" password="dyyjy" supperAdmin="1" /> <payments> <item1 name="鐜伴噾"/> - <item2 name="寰俊鏀粯"/> - <item3 name="鏀粯瀹濇敮浠�"/> - <item4 name="閾惰杞处"/> + <item2 name="POS鏈�"/> + <item3 name="閾惰杞处"/> </payments> <settings> - <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/> - <item2 item_name="lat" item_value="25.70424" remarks="绾害"/> + <item1 item_name="lng" item_value="101.89878161146011" remarks="缁忓害"/> + <item2 item_name="lat" item_value="25.673963608371185" remarks="绾害"/> </settings> <waterTypes> <item1 typeName="鐏屾簤鐢ㄦ按"/> @@ -30,14 +37,14 @@ </waterTypes> <waterPrice price="0.90" /> <irrigateProfile> - <item1 default_value = "10" unit = "2" sort = "1" type = "1"/> - <item2 default_value = "20" unit = "2" sort = "2" type = "1" /> - <item3 default_value = "1" unit = "1" sort = "3" type = "1"/> - <item4 default_value = "2" unit = "1" sort = "4" type = "1"/> - <item5 default_value = "20" unit = "3" sort = "1" type = "2"/> - <item6 default_value = "30" unit = "3" sort = "2" type = "2"/> - <item7 default_value = "50" unit = "3" sort = "3" type = "2"/> - <item8 default_value = "80" unit = "3" sort = "4" type = "2"/> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> </org1> <org2 tag="pj" name="鐗囪" enable="false"> @@ -48,6 +55,14 @@ </city> </province> </districts> + <dictionaries> + <dict code="protocol" title="鍗忚" valueType="2"> + <dictItem> + <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" /> + <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" /> + </dictItem> + </dict> + </dictionaries> <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> <payments> <item1 name="鐜伴噾"/> @@ -68,15 +83,61 @@ </waterTypes> <waterPrice price="0.90" /> <irrigateProfile> - <item1 default_value = "10" unit = "2" sort = "1" type = "1"/> - <item2 default_value = "20" unit = "2" sort = "2" type = "1" /> - <item3 default_value = "1" unit = "1" sort = "3" type = "1"/> - <item4 default_value = "2" unit = "1" sort = "4" type = "1"/> - <item5 default_value = "20" unit = "3" sort = "1" type = "2"/> - <item6 default_value = "30" unit = "3" sort = "2" type = "2"/> - <item7 default_value = "50" unit = "3" sort = "3" type = "2"/> - <item8 default_value = "80" unit = "3" sort = "4" type = "2"/> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> </irrigateProfile> </org2> + <org3 tag="test" name="娴嬭瘯" enable="true"> + <districts> + <province name="澶╂触甯�" num="12" level="0"> + <city name="甯傝緰鍖�" num="01" level="1"> + <country name="姝︽竻鍖�" num="14" level="2" /> + </city> + </province> + </districts> + <dictionaries> + <dict code="protocol" title="鍗忚" valueType="2"> + <dictItem> + <item1 dictCode="protocol" value="p206V1_0_1" name="鑰佸崗璁�" status="1" sort="0" /> + <item2 dictCode="protocol" value="p206V202404" name="鏂板崗璁�" status="0" sort="1" /> + </dictItem> + </dict> + </dictionaries> + <user name="瓒呯骇绠$悊鍛�" phone="admin" password="admin" supperAdmin="1" /> + <payments> + <item1 name="鐜伴噾"/> + <item2 name="寰俊鏀粯"/> + <item3 name="鏀粯瀹濇敮浠�"/> + <item4 name="閾惰杞处"/> + </payments> + <settings> + <item1 item_name="lng" item_value="101.87345" remarks="缁忓害"/> + <item2 item_name="lat" item_value="25.70424" remarks="绾害"/> + </settings> + <waterTypes> + <item1 typeName="鐏屾簤鐢ㄦ按"/> + <item2 typeName="宸ヤ笟鐢ㄦ按"/> + <item3 typeName="鐢熸椿鐢ㄦ按"/> + <item4 typeName="鍏绘畺鐢ㄦ按"/> + <item5 typeName="缁垮寲鐢ㄦ按"/> + </waterTypes> + <waterPrice price="0.90" /> + <irrigateProfile> + <item1 defaultValue = "10" unit = "2" sort = "1" type = "1"/> + <item2 defaultValue = "20" unit = "2" sort = "2" type = "1" /> + <item3 defaultValue = "1" unit = "1" sort = "3" type = "1"/> + <item4 defaultValue = "2" unit = "1" sort = "4" type = "1"/> + <item5 defaultValue = "20" unit = "3" sort = "1" type = "2"/> + <item6 defaultValue = "30" unit = "3" sort = "2" type = "2"/> + <item7 defaultValue = "50" unit = "3" sort = "3" type = "2"/> + <item8 defaultValue = "80" unit = "3" sort = "4" type = "2"/> + </irrigateProfile> + </org3> </orgs> </config> \ No newline at end of file -- Gitblit v1.8.0