diff --git a/src/main/java/com/qs/serve/Application.java b/src/main/java/com/qs/serve/Application.java index 5655c84f..d3fa2959 100644 --- a/src/main/java/com/qs/serve/Application.java +++ b/src/main/java/com/qs/serve/Application.java @@ -42,7 +42,8 @@ public class Application extends SpringBootServletInitializer { SpringApplication.run(Application.class,args); long end = System.currentTimeMillis(); double diff = (end-start)/1000.0; - System.out.println("启动时间："+diff+"\n ____ _ _ __ _ _ \n" + + System.out.println("启动时间："+diff + +"\n ____ _ _ __ _ _ \n" + " / ___| | |_ __ _ _ __ | |_ _ _ _ __ ___ _ _ ___ ___ ___ ___ ___ / _| _ _ | || |\n" + " \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\ / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n" + " ___) || |_| (_| || | | |_ | |_| || |_) | \\__ \\| |_| || (__| (__| __/\\__ \\\\__ \\| _|| |_| || ||_|\n" + diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 3cd4e9fe..57f2c547 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -534,6 +534,7 @@ public class GoodsSpuController { vo.setOrderFlag(a.getOrderFlag()); vo.setCostFlag(a.getCostFlag()); vo.setGoodsSaleType(a.getGoodsSaleType()); + vo.setCateCode(a.getCategoryThird()); vo.setCateName(a.getCateThirdLabel()); return vo; }).collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java b/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java index f213af62..47972479 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java @@ -53,6 +53,9 @@ public class GoodsSpuExportVo implements Serializable { /** 商品销售类型:0-普通商品；1-赠品 */ private Integer goodsSaleType; + /** 三级类目：系列编码 */ + private String cateCode; + /** 三级类目：系列名称 */ private String cateName; diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 37e1d998..285f1ded 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -465,6 +465,15 @@ public class VtbVerificationController { return R.ok(); } + @LimitSubmit + @GetMapping("/compensate123") + public R cer(){ + String[] ids = new String[]{"65433","65434","10471112","10475470","10476180","10476037","10476038","10479680","10480197","10491771","10492045","10492728","10492773","10492774","10492781","10492789","10492726","10492939","10493429","10493533","10493557","10493461","10493505","10493588","10493587","10493552","10494037","10494075","10493922","10494262","10494434","10494308","10494012","10493466","10494267","10494512","10494619","10494707","10494716","10494462","10493258","10494246","10494313","10494649","10494648","10494650","10494653","10494697","10494698","10494702","10494681","10494759","10494747","10494748","10494749","10494640","10494639","10494583","10494637","10494638","10494630","10494631","10494753","10494611","10494602","10494310","10494449","10494836","10494025","10494890","10493741","10493742","10494856","10494565","10494564","10495083","10495022","10495099","10494937","10494220","10494198","10494935","10494922","10494003","10494002","10494930","10494874","10494299","10495300","10495303","10495305","10495260","10495166","10495154","10495148","10495290","10495502","10495499","10495483","10495495","10495635","10495459","10495454","10495746","10495296","10495304","10495319","10495330","10495331","10495334","10494853","10495730","10495731","10495734","10495741","10495758","10495509","10495513","10495362","10495658","10495451","10495453","10495447","10495696","10495681","10495496","10495493","10495488","10495487","10495482","10495481","10495271","10495092","10495095","10495267","10495143","10495365","10495269","10495124","10495132","10495367","10495266","10495235","10495237","10493964","10495245","10495265","10495366","10494622","10495349","10494185","10494187","10494194","10495149","10495003","10494998","10494970","10493999","10494835","10493997","10495661","10495765","10495529","10495525","10495774","10495578","10495583","10495579","10495586","10495595","10495594","10495339","10495753","10495725","10495705","10495414","10495653","10495609","10495436","10495427","10495486","10495626","10495779","10495782","10491301","10494872","10494865","10495645","10495641","10495634","10495775","10495257","10495255","10494786","10494787","10494788","10495333","10495263","10495338","10495340","10495341","10495049","10495056","10495510","10495364","10495258","10495325","10495298","10495294","10495288","10495280","10495283","10495491","10495497","10495500","10495250","10495380","10495680","10495735","10494889","10494008","10494007","10495064","10495335","10494165","10495606","10495738","10495345","10495221","10495115","10494979","10495112","10494987","10494969","10494964","10494960","10495769","10495768","10495602","10495585","10495827","10494546","10495322","10495316","10495312","10495311","10495293","10493980","10493981","10494070","10494071","10494079","10494342","10494334","10494490","10494145","10494730","10493194","10495885","10495662","10495256","10495254","10495252","10493970","10495747","10494590","10494601","10493971","10494608","10494612","10494620","10494613","10494886","10495123","10495133","10495740","10494662","10495060","10494663","10495369","10495607","10495883","10495608","10495835","10495884","10495798","10494219","10494201","10495733","10480694","10492794","10492795","10492796","10492797","10495879","10495886","10493936","10495949","10495951","10495950","10495954","10495955","10495973","10495974","10495975","10495977","10478007","10493523","10480882","10480885","10480886","10480887","10480889","10493852","10493855","10493856","10494876","10494878","10494880","10494882","10492735","10495046","10495984","10496000","10495880","10495838","10495829","10495830","10495831","10495832","10495796","10495795","10495789","10495784","10493631","10495990","10495989","10496040","10496043","10496049","10477128","10496007","10496015","10495052","10495053","10476875","10476879","10478443","10493897","10493891","10493892","10493903","10494869","10494870","10496076","10479471","10479472","10479561","10495063","10495068","10495078","10495392","10495401","10495776","10495767","10495766","10495686","10495689","10495693","10495700","10495701","10495702","10495996","10496098","10496102","10496103","10496100","10496099","10496078","10496077","10496075","10496074","10496070","10495841","10496061","10496063","10496053","10496052","10496051","10496050","10496047","10496048","10495843","10496046","10496045","10496042","10495845","10496041","10495868","10496036","10495869","10495871","10495892","10496017","10496025","10496026","10496028","10496032","10496039","10496044","10496054","10496107","10496124","10491281","10491876","10491290","10491291","10491292","10491297","10491298","10491359","10491360","10491362","10491562","10491564","10491568","10491878","10488300","10489122","10489379","10490617","10492537","10491493","10491500","10491516","10492992","10496109","10496112","10496113","10496114","10496115","10496116","10496117","10496118","10496119","10496228","10496231","10496232","10496233","10496224","10496225","10496226","10496229","10496230","10496227","10496234","10496235","10496236","10496237","10496238","10496064","10496188","10496241","10496253","10496266","10496267","10496255","10496254","10496085","10496016","10496018","10496270","10496362","10496359","10496360","10496361","10496243","10496223","10496373","10496368","10496271","10496274","10496244","10496356","10496357","10496358","10496345","10496344","10496343","10496324","10496379","10496380","10496384","10496388","10496374","10496375","10496376","10496377","10496378","10496382","10496383","10496385","10496387","10496389","10496390","10496418","10496419","10480708","10496371","10496446","10493735","10493733","10493737","10493732","10493736","10493318","10496348","10496347","10496342","10496538","10492305","10496564","10496565","10496567","10496568","10496391","10496392","10496556","10495080","10494813","10494820","10495084","10496566","10496573","10495241","10496575","10496577","10495522","10491924","10494254","10491155","10495281","10490969","10491804","10491729","10491587","10496584","10496607","10496606","10480067","10496589","10496590","10496591","10496605","10496600","10496604","10496660","10496661","10496645","10496670","10492414","10495654","10496676","10496680","10496683","10496608","10496675","10496420","10480709","10480861","10480870","10480881","10480921","10480928","10480931","10480938","10496609","10496610","10496630","10496663","10496714","10496713","10496712","10496716","10496717","10491248","10491425","10491427","10491428","10491569","10492053","10492280","10492281","10492978","10492979","10493240","10494172","10494174","10494175","10494184","10494444","10494447","10494897","10495230","10495231","10495246","10495370","10495555","10495559","10495569","10496641","10496640","10495611","10495640","10495651","10495655","10495666","10495631","10496662","10496669","10496650","10496654","10496656","10496586","10495668","10495670","10495675","10496642","10496643","10496651","10496649","10496425","10496741","10496739","10496738","10496735","10496755","10496756","10496757","10496758","10491184","10496529","10496530","10496771","10496772","10496774","10496759","10496791","10496792","10496793","10496794","10496795","10496797","10496798","10496799","10496802","10496803","10496806","10496807","10496808","10496809","10496784","10496698","10494632","10494635","10495348","10495350","10495351","10495511","10495571","10495573","10495574","10495576","10495613","10495677","10496749","10496431","10496659","10496853","10496858","10496829","10496828","10496934","10496581","10496938","10496939","10496940","10496811","10496813","10496839","10496840","10496841","10496911","10496912","10496913","10496914","10496915","10496916","10496917","10496919","10496921","10496922","10496929","10496924","10496927","10496918","10496908","10496877","10496978","10496983","10496966","10496965","10496964","10496930","10496937","10496987","10496986","10496935","10496936","10495375","10492727","10479860","10492723","10479467","10479859","10496737","10496736","10479850","10479554","10479553","10479552","10495660","10478385","10495582","10495394","10495664","10478369","10491659","10496800","10496804","10496805","10496994","10496995","10496997","10497071","10497072","10497076","10497077","10497078","10497079","10496976","10497053","10497054","10496971","10496970","10496747","10497117","10497119","10497083","10497082","10497080","10497081","10497086","10497095","10497096","10497137","10497097","10497118","10497128","10497165","10497143","10497136","10497144","10497138","10497141","10497139","10497140","10497187","10497173","10497164","10497158","10497157","10497202","10497205","10497020","10497021","10497023","10497103","10497239","10497240","10497242","10497245","10497244","10497243","10497251","10497279","10497284","10497285","10497254","10497256","10497257","10497260","10497263","10497268","10497270","10497283","10497276","10497275","10497267","10497265","10497262","10497255","10497206","10497231","10497233","10497234","10497246","10497247","10479953","10478251","10478247","10479962","10492929","10475983","10475748","10479126","10479125","10474744","10497273","10489199","10496820","10492558","10489355","10496276","10497274","10491244","10491246","10491249","10491250","10491256","10491257","10491258","10497277","10497127","10495015","10495617","10494732","10497098","10497152","10494481","10497027","10497026","10491259","10491284","10491429","10491432","10491433","10491536","10491537","10491646","10491647","10491648","10491650","10491654","10491713","10491720","10491721","10491752","10491756","10491758","10491760","10491799","10491935","10491947","10491430","10495674","10495671","10495665","10495575","10497196","10493494","10497339","10497341","10497358","10497359","10495006","10497363","10497288","10497289","10497291","10497292","10497293","10497295","10497296","10497297","10497298","10497299","10497300","10497301","10497302","10497303","10497304","10497306","10497307","10497308","10497309","10497311","10497312","10497369","10497327","10497375","10494442","10495811","10495810","10495809","10495374","10497386","10496065","10496988","10496989","10494936","10497407","10494929","10496522","10494806","10492757","10494931","10494314","10497195","10494554","10495118","10495317","10495787","10495438","10495119","10497112","10497290","10497294","10497305","10495315","10497310","10497316","10497322","10497323","10495314","10497436","10497324","10497334","10497338","10497212","10497214","10497216","10497221","10497222","10496824","10496826","10497166","10497167","10497168","10497169","10497170","10497174","10495981","10497391","10497393","10497403","10497406","10497415","10497417","10497418","10497420","10493229","10495284","10495323","10495722","10497502","10497321","10497433","10497506","10497509","10497516","10497518","10497533","10497525","10497530","10497421","10497537","10497536","10497534","10497526","10497544","10497558","10497557","10497555","10497554","10497574","10497414","10497517","10497578","10497515","10497514","10497582","10497584","10497587","10492722","10497591","10497593","10497595","10497439","10497596","10497601","10497605","10497602","10497606","10497599","10497532","10497600","10497573","10497552","10497586","10497585","10497583","10497581","10497579","10497576","10497620","10497615","10497650","10497510","10497659","10497542","10497672","10497674","10497559","10497675","10497678","10497663","10497614","10497633","10497638","10497642","10497658","10497660","10497662","10497694","10497693","10497692","10493502","10493554","10497208","10497424","10497209","10497425","10497428","10497084","10495972","10497469","10480584","10497473","10496033","10497478","10497429","10497431","10497482","10497484","10497437","10497486","10497438","10497487","10497444","10497568","10497630","10494731","10497440","10494722","10497679","10497680","10497682","10497681","10497683","10497684","10497697","10493559","10492484","10493857","10495697","10497049","10497050","10497051","10495603","10493459","10497713","10494239","10496754","10494263","10496715","10493589","10496339","10497723","10497724","10493514","10492906","10493617","10497232","10494229","10494237","10495650","10497747","10497746","10497745","10497751","10497750","10497749","10497754","10494234","10493654","10495751","10495748","10496089","10493620","10496088","10496087","10497775","10495061","10493473","10497238","10497237","10496086","10495059","10495044","10495219","10495523","10495217","10497210","10497211","10497217","10497218","10497223","10497224","10497325","10497326","10497471","10497376","10492750","10497689","10493655","10493769","10497570","10497569","10497566","10497572","10497571","10493613","10497806","10497810","10497798","10497817","10497818","10497819","10497820","10497821","10497827","10497419","10497401","10497801","10497802","10497764","10497859","10497862","10497863","10497808","10497640","10497636","10497626","10497607","10497592","10497556","10497445","10497435","10497388","10497389","10497390","10497580","10497594","10497598","10497608","10497612","10497779","10497782","10497789","10497791","10497795","10497621","10497524","10497523","10497521","10497519","10497511","10497508","10497882","10497881","10497880","10497879","10497878","10497877","10497405","10497409","10497489","10497490","10497701","10497702","10497703","10496695","10497740","10497726","10497725","10497387","10493495","10497665","10497664","10497654","10497644","10497632","10497842","10497841","10497890","10497887","10495278","10495277","10497235","10495275","10497551","10495157","10497549","10493832","10497546","10495151","10497853","10493771","10497535","10495146","10494789","10497539","10493809","10493779","10495940","10497943","10495155","10497939","10497937","10497936","10497934","10497930","10497929","10497928","10497927","10497926","10495638","10495465","10497786","10497787","10497790","10497797","10497628","10497637","10497700","10497442","10497443","10497441","10493869","10495286","10495455","10497396","10497833","10497834","10497835","10497836","10497837","10497838","10497843","10497844","10497845","10497846","10497847","10497849","10497397","10497851","10497854","10497855","10497856","10497634","10497416","10497448","10497449","10497873","10497450","10497872","10497451","10497871","10497453","10497870","10497869","10497455","10497858","10497458","10497857","10497459","10497830","10497464","10497829","10497828","10497505","10497826","10497465","10497823","10497466","10497822","10497468","10497816","10497400","10497494","10497809","10497531","10497752","10497538","10497645","10497543","10497656","10497545","10497597","10497548","10497550","10497351","10495276","10497577","10497623","10497365","10497565","10497360","10497395","10497588","10497563","10497356","10497604","10497562","10497575","10497589","10497564","10497162","10497590","10497625","10497617","10497618","10497154","10497156","10497155","10497647","10497718","10497163","10497643","10492759","10497803","10497800","10497734","10494541","10494538","10494459","10496035","10496037","10497894","10497892","10497984","10497891","10497889","10496038","10494470","10497896","10497799","10497794","10497793","10496024","10497792","10497788","10497776","10497778","10497748","10497947","10497924","10497547","10497932","10497769","10497767","10497925","10497756","10497908","10497730","10495610","10497983","10497498","10494469","10497982","10497981","10497980","10493618","10497978","10497976","10497975","10497974","10496269","10497972","10497971","10497970","10497969","10495587","10497958","10497954","10496027","10494840","10497915","10497913","10497911","10497910","10496030","10495750","10497956","10497631","10497997","10497992","10497989","10497987","10497968","10498007","10498006","10498005","10497967","10497966","10497965","10497963","10498014","10497962","10497961","10497946","10498015","10497945","10497931","10497922","10497920","10497916","10497973","10497735","10497616","10497897","10497901","10497898","10497899","10498023","10498034","10497985","10497917","10494831","10498044","10494885","10498021","10498022","10494881","10494877","10496644","10493656","10496031","10492618","10497372","10496029","10496020","10495076","10497371","10492752","10493612","10495302","10492753","10493726","10496091","10494847","10496022","10497651","10496023","10494244","10495387","10494573","10494572","10497641","10496268","10493283","10494212","10494210","10494976","10494206","10497639","10495067","10497629","10494207","10495066","10495540","10495544","10498057","10498070","10498069","10498068","10498067","10498017","10498001","10498056","10496265","10498029","10495562","10492927","10498095","10493653","10496252","10493178","10496220","10494084","10497368","10498096","10498092","10498090","10498089","10494674","10498107","10496222","10496352","10496351","10496350","10498110","10496349","10492800","10493973","10496603","10496601","10496602","10496354","10497741","10491273","10491267","10493765","10493522","10493764","10493854","10497990","10497496","10493329","10497497","10497500","10497504","10497507","10497512","10496369","10497520","10495105","10497522","10497527","10496106","10497529","10497708","10497719","10497729","10497731","10497737","10497738","10496409","10497744","10497753","10498012","10498013","10496410","10492496","10493333","10496957","10496411","10494441","10496412","10494149","10496413","10493105","10496414","10497933","10497041","10496415","10497040","10496417","10496416","10497335","10498104","10497374","10495570","10495895","10496426","10497783","10498087","10494499","10498088","10498106","10498105","10498091","10498098","10498100","10498101","10496404","10494491","10496403","10497848","10496402","10496401","10496400","10496399","10496397","10496398","10496393","10496396","10496395","10496394","10496569","10498082","10498084","10498086","10498093","10498094","10498117","10495833","10494664","10496652","10493760","10493998","10495287","10496653","10496719","10493591","10497627","10493590","10495328","10498097","10498136","10498145","10498146","10498148","10497942","10497998","10497995","10497996","10498024","10497993","10498166","10498165","10496973","10496969","10496962","10496968","10496967","10497052","10496664","10496665","10496732","10497146","10497150","10497151","10497249","10497250","10497382","10497661","10497669","10497671","10497676","10497690","10497691","10497883","10497884","10497885","10498019","10498035","10498038","10498108","10498109","10498037","10498039","10498118","10498121","10498171","10498169","10498185","10498112","10497902","10497960","10498111","10496770","10496742","10498102","10498103","10495318","10498150","10498149","10498181","10498183","10498190","10493989","10496776","10498163","10498164","10498138","10498137","10496783","10498041","10498040","10498042","10498043","10498045","10498046","10498132","10498126","10498122","10496786","10497921","10496787","10496789","10496920","10497378","10497379","10497394","10497426","10493525","10497480","10497481","10497483","10497485","10493585","10497488","10497774","10497781","10493763","10497784","10491177","10497785","10497864","10497865","10497867","10497868","10497912","10496699","10496810","10496700","10496686","10496687","10496688","10496689","10496611","10492124","10494137","10496704","10496705","10494968","10494997","10495397","10498221","10493883","10496707","10496708","10496709","10495434","10496762","10498016","10496763","10496764","10498225","10496766","10498224","10492873","10498223","10496769","10496768","10496767","10496777","10496778","10496779","10496780","10496782","10496781","10496123","10494768","10498241","10494134","10494771","10494772","10494773","10498252","10498208","10498206","10498258","10498025","10498026","10498027","10498028","10498060","10498061","10498063","10498064","10498018","10498020","10498160","10498161","10498162","10498167","10498168","10498170","10498259","10498178","10498226","10498232","10498254","10498260","10498261","10498269","10496761","10496570","10497758","10497759","10497770","10497771","10497760","10497761","10492508","10497763","10497772","10497839","10497765","10497773","10497840","10497381","10496667","10497739","10497385","10497383","10497850","10497860","10497852","10497906","10497914","10498288","10497919","10497935","10497907","10498290","10497938","10498291","10497909","10497940","10498292","10497941","10497950","10495291","10497951","10497952","10497953","10497955","10497957","10496666","10497959","10497991","10497988","10497811","10498049","10497812","10497813","10496830","10496831","10497814","10497815","10498246","10498270","10496760","10498271","10498272","10497009","10498273","10498274","10498275","10498276","10497012","10498277","10498278","10497011","10497460","10497010","10497462","10497008","10497461","10497467","10494465","10497470","10497472","10497476","10494464","10497029","10498283","10498285","10497030","10497031","10497032","10497033","10497135","10494802","10498157","10493089","10498158","10493090","10497037","10497038","10498159","10498306","10497688","10498073","10498075","10497667","10497668","10497673","10494041","10497677","10497685","10497686","10497687","10493091","10498311","10493256","10495718","10497159","10497160","10497161","10497652","10497653","10498316","10497655","10497766","10498310","10497768","10498301","10497824","10498194","10497825","10498320","10498193","10498047","10498048","10498050","10498321","10498051","10498062","10498322","10498065","10498066","10498144","10498147","10498154","10498156","10498172","10498323","10493257","10497732","10498324","10498217","10498219","10498220","10498222","10498227","10498228","10498229","10498230","10493259","10498231","10498326","10498233","10498234","10498235","10498236","10498237","10498238","10498239","10498240","10498242","10498243","10498328","10498245","10498250","10496821","10496822","10498329","10498325","10498212","10498211","10498186","10498189","10498203","10498187","10498085","10498188","10498201","10494189","10497330","10497331","10497329","10493901","10497236","10494580","10493743","10495004","10498333","10494618","10494542","10495225","10494720","10495908","10497101","10498340","10498327","10490843","10498319","10498341","10498315","10494815","10498309","10493979","10498342","10498339","10495107","10494017","10497028","10498344","10495907","10494001","10495910","10495909","10495548","10495226","10492433","10497036","10498257","10497035","10494225","10497039","10498354","10497042","10491809","10497045","10497047","10493672","10497048","10494027","10492941","10493619","10493974","10497380","10498355","10497271","10495781","10497272","10497886","10498000","10497207","10498002","10496928","10498074","10498152","10498072","10498153","10498071","10498174","10498143","10498356","10498142","10498357","10498358","10498361","10498059","10498058","10497804","10496859","10498364","10496685","10498365","10498366","10498367","10497964","10498053","10498140","10498141","10496684","10498179","10498182","10498054","10498180","10498184","10497888","10498004","10498293","10498369","10498350","10493902","10498119","10498115","10498114","10497905","10497893","10497807","10498386","10497699","10498385","10497657","10498287","10498338","10497649","10498289","10498336","10498334","10498330","10498296","10498359","10498332","10498299","10498360","10498331","10498300","10497648","10498304","10498307","10498308","10497646","10497622","10497619","10497613","10497611","10498392","10497610","10498394","10497609","10498248","10498295","10498268","10498267","10498266","10497944","10497900","10497895","10497282","10497281","10497280","10497066","10496870","10496867","10496866","10496722","10496721","10496720","10496657","10496655","10498406","10498407","10498370","10498408","10498372","10498380","10498384","10497755","10497757","10497475","10498414","10498398","10498343","10498391","10498345","10498376","10498346","10498351","10498362","10498363","10498374","10498383","10498382","10498381","10498371","10498426","10498218","10498353","10498434","10498424","10498425","10492725","10498442","10498450","10498451","10498420","10498416","10498404","10498403","10498264","10498431","10498447","10498473","10498477","10498470","10493254","10498490","10498318","10498317","10498314","10498313","10498312","10498497","10498499","10498432","10498501","10498423","10498422","10498389","10498388","10498387","10498134","10498133","10498120","10498055","10498011","10498010","10498505","10498400","10498452","10497986","10498401","10498402","10497979","10498508","10497977","10497320","10497241","10498509","10498510","10498436","10498512","10498445","10498513","10498455","10498457","10498468","10498474","10498514","10498516","10498419","10498368","10498528","10498191","10498198","10498199","10498281","10498286","10498530","10498294","10498297","10498196","10498298","10498543","10498545","10498548","10498534","10498536","10498542","10498519","10498517","10498518","10498526","10498525","10498521","10498520","10498375","10498373","10498500","10498216","10498215","10497999","10498177","10498176","10498175","10498135","10498582","10497861","10498378","10498377","10498583","10498572","10498584","10498587","10498588","10498443","10498390","10498393","10498395","10498396","10498397","10498399","10498586","10498409","10498410","10498415","10498569","10498421","10498537","10498535","10498532","10498347","10498349","10498593","10498496","10498495","10498494","10498602","10498265","10498151","10498155","10498009","10498604","10498008","10498003","10497736","10497603","10497463","10497145","10497100","10497102","10497192","10498605","10497099","10496958","10496993","10496926","10498606","10498607","10498563","10498615","10498562","10498561","10498579","10498577","10498570","10498601","10498538","10498599","10498623","10498449","10498568","10498630","10498633","10498629","10498620","10498619","10498634","10498613","10498612","10498610","10498609","10498608","10497258","10497259","10498253","10498251","10498247","10498244","10498475","10498476","10498478","10498479","10498482","10498483","10498485","10498486","10498488","10498639","10498640","10498642","10498646","10498647","10498649","10498651","10498655","10498571","10498658","10498659","10498660","10498627","10498661","10498662","10498663","10498669","10498671","10498672","10498656","10498654","10498653","10498644","10498674","10498677","10498673","10498679","10498682","10498685","10498687","10498689","10498690","10498692","10498693","10498694","10498637","10498664","10498665","10498666","10498667","10498680","10498678","10498681","10498684","10498695","10498699","10498616","10498617","10498697","10498618","10498696","10498701","10498703","10498704","10498705","10498706","10498707","10498708","10498709","10498710","10498712","10498715","10498210","10498213","10498214","10498515","10498524","10498720","10498722","10498723","10498728","10498729","10498730","10498731","10498733","10498734","10498735","10498738","10498739","10498740","10498741","10498700","10498657","10498626","10498597","10498427","10498429","10498435","10498440","10498441","10498444","10497479","10497491","10497492","10497493","10497495","10497499","10497501","10497503","10497513","10498079","10498077","10498078","10498076","10498458","10498503","10498504","10498507","10498554","10498555","10498557","10498580","10498581","10498433","10498437","10498439","10498446","10498448","10498453","10498454","10498456","10498459","10498460","10498461","10498462","10498464","10498465","10498466","10498467","10498469","10498471","10498472","10498484","10498487","10498489","10498491","10498492","10498493","10498498","10498502","10498573","10498574","10498575","10498585","10498600","10498603","10498632","10498635","10498668","10498335","10498337","10498506","10498511","10498523","10498527","10498529","10498531","10498533","10498539","10498540","10498541","10498544","10498546","10498547","10498564","10498565","10498567","10498590","10498591","10498592","10498596","10498691","10498636","10498676","10498686","10498675","10498209","10498197","10498207","10498205","10498204","10498202","10498628","10498732","10498724","10498721","10498719","10498717","10498716","10498702","10498711","10498713","10498718","10498556","10498481","10498480","10498352","10498348","10498430","10498428","10498726","10498727","10498742","10496838","10496972","10493778","10494028","10494029","10498652","10498650","10498648","10498631","10498624","10498622","10498621","10498595","10498566","10498553","10498551","10498522","10498463","10498405","10498305","10498303","10498256","10494476","10492732","10498438","10494059","10498284","10498280","10498688","10498683","10498714","10493975","10498099","10498116","10497635","10497204","10497252","10498670","10494790","10497203","10498589","10498576","10495432","10497116","10495433","10497113","10497107","10497104","10495389","10494287","10497111","10498750","10495110","10497034","10497384","10494290","10495421","10497398","10495550","10498594","10498578","10495422","10498751","10495896","10495424","10495893","10497225","10494520","10497226","10495426","10492729","10497227","10497228","10495390","10495761","10497186","10495485","10497412","10497213","10495492","10495728","10492911","10494547","10497180","10497805","10495659","10497220","10497413","10497219","10495627","10495019","10497215","10495605","10497427","10497088","10497124","10497432","10497125","10497126","10497408","10495415","10497188","10493664","10495418","10495393","10497189","10497190","10493121","10495391","10497370","10493122","10497367","10495564","10497866","10498749","10495448","10497179","10497456","10497319","10497454","10497452","10498249","10497178","10497318","10497177","10497392","10493193","10497399","10497404","10497447","10497994","10493978","10497344","10496069","10496068","10496067","10498752","10495995","10495994","10497317","10498558","10498757","10497315","10498736","10498737","10497314","10497342","10497269","10497266","10497743","10497353","10497354","10497355","10495678","10497357","10497361","10498560","10497362","10497105","10497106","10497108","10497541","10497540","10495420","10494068","10498755","10498725","10498598","10498638","10498698","10495797","10495120","10497184","10497176","10495104","10497175","10497172","10498262","10494361","10495732","10494359","10494360","10497742","10497110","10496034","10494030","10497350","10497185","10497340","10494318","10495553","10490844","10498761","10497477","10498762","10497006","10494688","10497181","10495699","10495656","10497434","10497182","10497201","10497183"}; + for (String id : ids) { + vtbVerificationOperationService.compensateNext(id); + } + return R.ok(); + } /** * 获取费用相关信息 diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index 491a4847..341d7c43 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -8,6 +8,8 @@ import com.qs.serve.common.util.*; import com.qs.serve.modules.data.entity.DataAffairCommit; import com.qs.serve.modules.data.mapper.DataAffairCommitMapper; import com.qs.serve.modules.seeyon.entity.CtpAffair; +import com.qs.serve.modules.seeyon.entity.SyAffairStateResult; +import com.qs.serve.modules.seeyon.enums.SyAffairState; import com.qs.serve.modules.seeyon.service.SeeYonRequestService; import com.qs.serve.modules.sys.entity.SysPostUser; import com.qs.serve.modules.sys.entity.SysUser; @@ -30,6 +32,7 @@ import com.qs.serve.modules.vtb.entity.*; import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl; import com.qs.serve.task.TbsTask; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeansException; import org.springframework.stereotype.Service; @@ -51,6 +54,7 @@ import java.util.stream.Collectors; * @author YenHex * @since 2023/2/14 */ +@Slf4j @Service @AllArgsConstructor public class VtbVerificationApplication { @@ -69,6 +73,7 @@ public class VtbVerificationApplication { private SysUserService sysUserService; private SeeYonRequestService seeYonService; private VtbFundFlowService vtbFundFlowService; + private VtbVerificationOperationServiceImpl verificationOperationService; public R commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){ //临时测试 @@ -85,6 +90,7 @@ public class VtbVerificationApplication { List verificationSubjectCenterList = vtbVerificationSubjectCenterService.listByVerificationId(verification.getId()); List verificationSubjects = vtbVerificationSubjectService.listByVerificationId(verification.getId()); //检测参数的金额 + log.debug("checkParamAmount 检测参数的核销金额"); this.checkParamAmount(affairCommit, verificationSubjectCenterList, verificationSubjects); boolean isBackCommit = affairCommit.getState()==2; R result; @@ -94,24 +100,41 @@ public class VtbVerificationApplication { result = R.ok(); } if(result.getStatus()==200){ + //提交审批 + log.debug("提交审批到致远，{}",JsonUtil.objectToJson(result)); // 判断是否含有下个节点 try { - Thread.sleep(3000); + Thread.sleep(500); } catch (InterruptedException e) { e.printStackTrace(); } - String summeryResult = result.getData(); - if(!result.getData().equals("stop")){ - VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); - summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); - if(devFlag){ - summeryResult = "finished"; - return R.ok(); - } - }else { + //verificationOperationService.runCompensate(verification.getId()+""); + + String templateCode = verificationOperationService.getTemplateCode(); + SyAffairStateResult stateResult = verificationOperationService.checkAffairState(verification.getId()+"",templateCode); + SyAffairState affairState = stateResult.getState(); + String summeryResult = affairState.toString(); + if(affairState.equals(SyAffairState.backed)||affairState.equals(SyAffairState.refuse)){ summeryResult = "refuse"; } + //提交审批 + log.debug("提交审批到致远，检查单据[{}]状态：{}",verification.getVerificationCode(),affairState); + R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult); + +// String summeryResult = result.getData(); +// if(!result.getData().equals("stop")){ +// VtbVerificationOperationServiceImpl verificationOperationService = SpringUtils.getBean(VtbVerificationOperationServiceImpl.class); +// summeryResult = verificationOperationService.checkAffairSummery(verification.getId().toString()); +// if(devFlag){ +// summeryResult = "finished"; +// return R.ok(); +// } +// }else { +// summeryResult = "refuse"; +// } +// R r = commitAffairSuccess(affairCommit, verification, isBackCommit, summeryResult); + try { //解决同步冻结时有过期的活动 TbsTask tbsTask = SpringUtils.getBean(TbsTask.class); @@ -182,6 +205,8 @@ public class VtbVerificationApplication { @NotNull @Transactional(rollbackFor = Exception.class) public R commitAffairSuccess(TbsAffairCommitBo affairCommit, VtbVerification verification, boolean isBackCommit, String flag) { + log.debug("单据[{}]状态：{}，",verification.getVerificationCode(),flag); + String userId = AuthContextUtils.getSysUserId(); SysUser sysUser = sysUserService.getById(userId); try { @@ -226,8 +251,10 @@ public class VtbVerificationApplication { //释放费用 boolean isRelease = affairCommit.getReleaseFlag()!=null&&affairCommit.getReleaseFlag().equals(1); if (isStop){ + log.debug("单据[{}]状态：{}，中止审批",verification.getVerificationCode(),flag); backCommitAndStop(verification, isBackCommit); if(isRelease){ + log.debug("单据[{}]状态：{}，中止审批并释放费用",verification.getVerificationCode(),flag); vtbVerificationService.release(verification.getActivityId(),sysUser.getCode(),false); } }else if (!isFinish && !isNext){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index a3d0355b..38a9c711 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -94,7 +94,7 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi @Override public Object compensateNext(String targetId) { VtbVerification verification = vtbVerificationMapper.selectById(targetId); - if(!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ + if(verification!=null&&!verification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){ VtbVerification vtbVer = new VtbVerification(); vtbVer.setId(verification.getId()); vtbVer.setVerificationState(VtbVerificationState.Commiting.getCode()); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8404295f..18d6ec1e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -26,6 +26,7 @@ project: - /web/* permits: #忽略登录 - /thirty/** #第三方接口 + - /portal/flushToken #第三方接口 - /common/upload #支持API上传调整 - /common/validToken #验证token - /api/**