From 5a946e16de1b30f6bf27bf1ec93e960159469008 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 21 Nov 2020 15:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/jsonconf/RechargeCommodityConfig.txt | 51 ++++++++++++++++++- .../jmfy/controller/OrderInfoController.java | 20 ++++---- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/conf/jsonconf/RechargeCommodityConfig.txt b/conf/jsonconf/RechargeCommodityConfig.txt index dc668b2..82cfc1a 100644 --- a/conf/jsonconf/RechargeCommodityConfig.txt +++ b/conf/jsonconf/RechargeCommodityConfig.txt @@ -85,6 +85,11 @@ int string string int int int mut,int#int,2 mut,int#int,2 int mut,int#int,2 mut, 2004 tcxhw.project.zlb328 每周礼包四 5 15 328 null 16#3280|81114#1|1001#25000|19#16 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb328 ljtcx.ioshw.zlb328 2005 tcxhw.project.zlb448 每周礼包五 5 15 448 null 16#4480|14#5000000|1001#40000|19#24 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb448 ljtcx.ioshw.zlb448 2006 tcxhw.project.zlb648 每周礼包六 5 15 648 null 16#6480|12025#50|1001#75000|19#32 0 null null 1006#512 1 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb648 ljtcx.ioshw.zlb648 +2007 tcxhw.project.zlb68a 每周礼包七 5 15 68 null 16#680|21#4|1202#100000|19#2 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb68a ljtcx.ioshw.zlb68a +2008 tcxhw.project.zlb128a 每周礼包八 5 15 128 null 16#1280|21#8|1202#200000|19#4 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb128a ljtcx.ioshw.zlb128a +2009 tcxhw.project.zlb328a 每周礼包九 5 15 328 null 16#3280|21#20|1202#500000|19#10 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb328a ljtcx.ioshw.zlb328a +2010 tcxhw.project.zlb448a 每周礼包十 5 15 448 null 16#4480|21#28|1202#700000|19#14 0 null null 1006#512 3 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb448a ljtcx.ioshw.zlb448a +2011 tcxhw.project.zlb648a 每周礼包十一 5 15 648 null 16#6480|21#40|1202#1000000|19#20 0 null null 1006#512 1 1 1 0 null 0 1 1 20200907 000000 20300115 235959 7 null tcx.hw.zlb648a ljtcx.ioshw.zlb648a 3000 每月免费礼 5 16 0 null 16#100|14#300000|60#5|19#2 0 null null null 1 1 1 0 null 0 1 1 20200901 000000 20200930 235959 0 null 3001 tcxhw.project.ylb30 每月礼包一 5 16 30 null 16#300|81112#1|19#5|60#5 0 null null 1006#512 1 1 1 0 null 0 1 1 20200901 000000 20200930 235959 0 null tcx.hw.ylb30 ljtcx.ioshw.ylb30 3002 tcxhw.project.ylb68 每月礼包二 5 16 68 null 16#680|81113#1|19#7|60#10 0 null null 1006#512 1 1 1 0 null 0 1 1 20200901 000000 20200930 235959 0 null tcx.hw.ylb68 ljtcx.ioshw.ylb68 @@ -215,10 +220,51 @@ int string string int int int mut,int#int,2 mut,int#int,2 int mut,int#int,2 mut, 381 tcxhw.project.zqbg198c 珍奇宝阁198 5 23 198 null 16#1980|81145#1|46#10|20#2 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg198c ljtcx.ioshw.zqbg198c 382 tcxhw.project.zqbg328c 珍奇宝阁328 5 23 328 null 16#3280|46#12|20#3 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg328c ljtcx.ioshw.zqbg328c 383 tcxhw.project.zqbg648c 珍奇宝阁648 5 23 648 null 16#6480|46#30|20#5 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg648c ljtcx.ioshw.zqbg648c +384 tcxhw.project.xsss128a 限时商市128a 5 22 128 null 16#1280|87#12|81143#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128a ljtcx.ioshw.xsss128a +385 tcxhw.project.xsss198a 限时商市198a 5 22 198 null 16#1980|87#10|20#2|61#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss198a ljtcx.ioshw.xsss198a +386 tcxhw.project.xsss328a 限时商市328a 5 22 328 null 16#3280|87#25|81143#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328a ljtcx.ioshw.xsss328a +387 tcxhw.project.xsss648a 限时商市648a 5 22 648 null 16#6480|87#32|11041#50|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648a ljtcx.ioshw.xsss648a +388 tcxhw.project.xsss128b 限时商市128b 5 22 128 null 16#1280|1002#12|81144#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128b ljtcx.ioshw.xsss128b +389 tcxhw.project.xsss328b 限时商市328b 5 22 328 null 16#3280|1002#25|81144#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328b ljtcx.ioshw.xsss328b +390 tcxhw.project.xsss648b 限时商市648b 5 22 648 null 16#6480|1002#32|81129#1|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648b ljtcx.ioshw.xsss648b +391 tcxhw.project.zqbg6a 珍奇宝阁6 5 23 6 null 16#60|1005#10|91#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg6a ljtcx.ioshw.zqbg6a +392 tcxhw.project.zqbg30a 珍奇宝阁30 5 23 30 null 16#300|1005#90|87#3 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg30a ljtcx.ioshw.zqbg30a +393 tcxhw.project.zqbg68a 珍奇宝阁68 5 23 68 null 16#680|1005#150|87#6 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg68a ljtcx.ioshw.zqbg68a +394 tcxhw.project.zqbg128a 珍奇宝阁128 5 23 128 null 16#1280|1005#300|20#2 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg128a ljtcx.ioshw.zqbg128a +395 tcxhw.project.zqbg198a 珍奇宝阁198 5 23 198 null 16#1980|1005#560|20#3 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg198a ljtcx.ioshw.zqbg198a +396 tcxhw.project.zqbg328a 珍奇宝阁328 5 23 328 null 16#3280|1005#720|20#4 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg328a ljtcx.ioshw.zqbg328a +397 tcxhw.project.zqbg648a 珍奇宝阁648 5 23 648 null 16#6480|1005#1500|20#8 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg648a ljtcx.ioshw.zqbg648a 21 tcxhw.project.5xczl30 5星成长礼 5 8 30 null 16#300|14#1800000|3#1080000|4#360 0 null null 1006#512 0 0 1 0 4#0#30#2 0 1 4 0 0 7 null tcx.hw.5xczl30 ljtcx.ioshw.5xczl30 400 tcxhw.project.5xczl68 五星成长礼2 5 8 68 null 16#680|14#3400000|3#2040000|4#680 0 null null 1006#512 0 0 1 0 4#31#47#2 0 1 4 0 0 7 null tcx.hw.5xczl68 ljtcx.ioshw.5xczl68 401 tcxhw.project.5xczl128 五星成长礼3 5 8 128 null 16#1280|14#9600000|3#3200000|4#1280 0 null null 1006#512 0 0 1 0 4#48#77#2 0 1 4 0 0 7 null tcx.hw.5xczl128 ljtcx.ioshw.5xczl128 402 tcxhw.project.5xczl328 五星成长礼4 5 8 328 null 16#3280|14#24600000|3#8200000|4#3280 0 null null 1006#512 0 0 1 0 4#78#9999999#2 0 1 4 0 0 7 null tcx.hw.5xczl328 ljtcx.ioshw.5xczl328 +500 tcxhw.project.xsss128a 限时商市128a 5 22 128 null 16#1280|87#12|81143#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128a ljtcx.ioshw.xsss128a +501 tcxhw.project.xsss198a 限时商市198a 5 22 198 null 16#1980|87#10|20#2|61#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss198a ljtcx.ioshw.xsss198a +502 tcxhw.project.xsss328a 限时商市328a 5 22 328 null 16#3280|87#25|81143#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328a ljtcx.ioshw.xsss328a +503 tcxhw.project.xsss648a 限时商市648a 5 22 648 null 16#6480|87#32|11073#50|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648a ljtcx.ioshw.xsss648a +504 tcxhw.project.xsss128b 限时商市128b 5 22 128 null 16#1280|1002#12|81144#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128b ljtcx.ioshw.xsss128b +505 tcxhw.project.xsss328b 限时商市328b 5 22 328 null 16#3280|1002#25|81144#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328b ljtcx.ioshw.xsss328b +506 tcxhw.project.xsss648b 限时商市648b 5 22 648 null 16#6480|1002#32|81129#1|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648b ljtcx.ioshw.xsss648b +507 tcxhw.project.zqbg6a 珍奇宝阁6 5 23 6 null 16#60|81154#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg6a ljtcx.ioshw.zqbg6a +508 tcxhw.project.zqbg30a 珍奇宝阁30 5 23 30 null 16#360|1004#2|87#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg30a ljtcx.ioshw.zqbg30a +509 tcxhw.project.zqbg68a 珍奇宝阁68 5 23 68 null 16#680|1004#3|87#5 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg68a ljtcx.ioshw.zqbg68a +510 tcxhw.project.zqbg128a 珍奇宝阁128 5 23 128 null 16#1280|1004#5|20#1 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg128a ljtcx.ioshw.zqbg128a +512 tcxhw.project.zqbg328a 珍奇宝阁328 5 23 328 null 16#3280|1004#12|20#3 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg328a ljtcx.ioshw.zqbg328a +513 tcxhw.project.zqbg648a 珍奇宝阁648 5 23 648 null 16#6480|1004#30|20#5 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg648a ljtcx.ioshw.zqbg648a +514 tcxhw.project.xsss128a 限时商市128a 5 22 128 null 16#1280|87#12|81143#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128a ljtcx.ioshw.xsss128a +515 tcxhw.project.xsss198a 限时商市198a 5 22 198 null 16#1980|87#10|20#2|61#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss198a ljtcx.ioshw.xsss198a +516 tcxhw.project.xsss328a 限时商市328a 5 22 328 null 16#3280|87#25|81143#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328a ljtcx.ioshw.xsss328a +517 tcxhw.project.xsss648a 限时商市648a 5 22 648 null 16#6480|87#32|11023#50|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648a ljtcx.ioshw.xsss648a +518 tcxhw.project.xsss128b 限时商市128b 5 22 128 null 16#1280|1002#12|81144#4|81114#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss128b ljtcx.ioshw.xsss128b +519 tcxhw.project.xsss328b 限时商市328b 5 22 328 null 16#3280|1002#25|81144#10|81115#1 0 null null 1006#512 6 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss328b ljtcx.ioshw.xsss328b +520 tcxhw.project.xsss648b 限时商市648b 5 22 648 null 16#6480|1002#32|81129#1|81127#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.xsss648b ljtcx.ioshw.xsss648b +521 tcxhw.project.zqbg6a 珍奇宝阁6 5 23 6 null 16#120|50002#3|81153#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg6a ljtcx.ioshw.zqbg6a +522 tcxhw.project.zqbg30a 珍奇宝阁30 5 23 30 null 16#360|50002#6|87#2 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg30a ljtcx.ioshw.zqbg30a +523 tcxhw.project.zqbg68a 珍奇宝阁68 5 23 68 null 16#680|50002#12|87#5 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg68a ljtcx.ioshw.zqbg68a +524 tcxhw.project.zqbg128a 珍奇宝阁128 5 23 128 null 16#1280|50002#16|20#2 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg128a ljtcx.ioshw.zqbg128a +525 tcxhw.project.zqbg198a 珍奇宝阁198 5 23 198 null 16#1980|50002#24|20#3 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg198a ljtcx.ioshw.zqbg198a +526 tcxhw.project.zqbg328a 珍奇宝阁328 5 23 328 null 16#3280|50002#36|20#4 0 null null 1006#512 9 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg328a ljtcx.ioshw.zqbg328a +527 tcxhw.project.zqbg648a 珍奇宝阁648 5 23 648 null 16#6480|50002#72|20#10 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.zqbg648a ljtcx.ioshw.zqbg648a 6001 tcxhw.project.bbsh98a 天赐幸运礼包 5 24 98 null 16#980|19#8|60#12|81131#2 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 1 null tcx.hw.bbsh98a ljtcx.ioshw.bbsh98a 6002 tcxhw.project.bbsh198a 天赐豪华礼包 5 24 198 null 16#1980|19#14|60#22|81151#3 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 1 null tcx.hw.bbsh198a ljtcx.ioshw.bbsh198a 6003 tcxhw.project.bbsh328a 天赐至尊礼包 5 24 328 null 16#3280|19#20|61#10|81152#3 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 1 null tcx.hw.bbsh328a ljtcx.ioshw.bbsh328a @@ -250,4 +296,7 @@ int string string int int int mut,int#int,2 mut,int#int,2 int mut,int#int,2 mut, 7102 tcxhw.project.ssts328 兽潮推送礼包328 5 26 328 null 16#3280|20#6|19#25|1001#75000|66#3000 0 null null 1006#512 0 0 1 0 3#78#120#4 0 1 6 0 0 0 null tcx.hw.ssts328 ljtcx.ioshw.ssts328 7103 tcxhw.project.ssts448 兽潮推送礼包448 5 26 448 null 16#4480|20#10|19#32|1001#100000|14#30000000 0 null null 1006#512 0 0 1 0 3#121#150#4 0 1 6 0 0 0 null tcx.hw.ssts448 ljtcx.ioshw.ssts448 7104 tcxhw.project.ssts648 兽潮推送礼包648 5 26 648 null 16#6480|20#16|19#40|81129#1|81128#1 0 null null 1006#512 0 0 1 0 3#151#9999999#4 0 1 6 0 0 0 null tcx.hw.ssts648 ljtcx.ioshw.ssts648 -7105 tcxhw.project.jsts68 灵兽特权礼包68 5 17 68 null 99#1|21#10|1202#100000 0 null null 1006#512#3003#3004 1 1 1 0 2#75#9999999 0 1 5 0 0 30 null tcx.hw.ssts648 ljtcx.ioshw.ssts648 +7105 tcxhw.project.lstq68 御兽特权 5 17 68 null 99#1|21#10|1202#100000 0 null null 1006#512#3003#3004 1 1 1 0 2#75#9999999 0 1 5 0 0 15 null tcx.hw.lstq68 ljtcx.ioshw.lstq68 +8000 tcxhw.project.sytj648 神衣天降648 5 27 648 null 16#6480|20#6|87#40|13023#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.sytj648 ljtcx.ioshw.sytj648 +8001 tcxhw.project.sytj648 神衣天降648 5 27 648 null 16#6480|20#6|87#40|13026#1 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.sytj648 ljtcx.ioshw.sytj648 +9000 tcxhw.project.lsth328 灵兽特惠328 5 28 328 null 16#3280|1204#30|1202#300000|21007#25 0 null null 1006#512 1 1 1 0 null 0 1 3 0 0 7 null tcx.hw.lsth328 ljtcx.ioshw.lsth328 diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 8f02ad9..ef4a9f4 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -202,17 +202,19 @@ public class OrderInfoController { corder.setCurrency_code(cgPayOrder.getCurrency_code()==null?"":cgPayOrder.getCurrency_code()); corder.setCurrency_price(cgPayOrder.getCurrency_price()==null?"":cgPayOrder.getCurrency_price()); - int[][] baseReward = config.getBaseReward(); StringBuilder builder = new StringBuilder(); - if(baseReward!=null&&baseReward.length>0){ - Arrays.stream(baseReward).forEach(n->{ - if(builder.length()!=0){ - builder.append("、"); - } - builder.append(itemMap.getOrDefault(n[0],"")).append("*").append(n[1]); - }); + if(config!=null&&config.getBaseReward()!=null){ + int[][] baseReward = config.getBaseReward(); + if(baseReward!=null&&baseReward.length>0){ + Arrays.stream(baseReward).forEach(n->{ + if(builder.length()!=0){ + builder.append("、"); + } + builder.append(itemMap.getOrDefault(n[0],"")).append("*").append(n[1]); + }); + } } - corder.setProductContent(builder.toString()); + corder.setProductContent(builder.length()<1?"":builder.toString()); corder.setRecharge_type(cgPayOrder.getRecharge_type()); cgPayOrders.add(corder);