From 497ce9c14177f4ae518e2a9ca25e4004e84a6dfc Mon Sep 17 00:00:00 2001 From: zhangshengli <18103773227@163.com> Date: Wed, 31 Jul 2024 13:47:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fuint/common/enums/YesOrNoEnum.java | 15 +++++++++++++++ .../common/service/impl/OrderServiceImpl.java | 17 +++++++++++++++-- .../controller/BackendOrderController.java | 2 +- .../main/resources/application-dev.properties | 10 +++++----- .../resources/application-prod.properties | 2 +- .../template/订单导入模板.xlsx | Bin 9001 -> 9225 bytes .../fuint/framework/web/ResponseObject.java | 6 ++++-- .../com/fuint/repository/model/MtOrder.java | 14 +++++++------- 8 files changed, 48 insertions(+), 18 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java index 0d4c355..f54d289 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/YesOrNoEnum.java @@ -36,4 +36,19 @@ public enum YesOrNoEnum { public void setValue(String value) { this.value = value; } + + /** + * 根据value获取key + * + * @return + */ + public static String getKeyName(String value) { + final YesOrNoEnum[] values = YesOrNoEnum.values(); + for (YesOrNoEnum order : values) { + if (value.equals(order.getValue())) { + return order.getKey(); + } + } + return null; + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java index ac0b79c..0df408e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java @@ -3,6 +3,7 @@ package com.fuint.common.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.common.Constants; @@ -60,7 +61,7 @@ public class OrderServiceImpl extends ServiceImpl implem private MtOrderMapper mtOrderMapper; private MtGoodsMapper mtGoodsMapper; - + private MtUserMapper mtUserMapper; private MtOrderGoodsMapper mtOrderGoodsMapper; private MtCartMapper mtCartMapper; @@ -2237,8 +2238,20 @@ public class OrderServiceImpl extends ServiceImpl implem } } String userName = rowContent.get(6); + if (ObjectUtil.isNotEmpty(userName)){ + MtUser m= mtUserMapper.selectOne(new QueryWrapper().lambda().eq(MtUser::getMobile,userName)); + if(ObjectUtil.isNotEmpty(m)){ + order.setUserId(m.getId()); + } + } String isVisitor = rowContent.get(7); - order.setIsVisitor(isVisitor); + if(StringUtil.isNotEmpty(isVisitor)){ + String keyName = YesOrNoEnum.getKeyName(isVisitor); + if(StringUtil.isNotEmpty(keyName)){ + order.setIsVisitor(keyName); + } + } + String amount = rowContent.get(8); if(StringUtil.isNotEmpty(amount)){ order.setAmount(new BigDecimal(amount)); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java index d591330..1ccbdc0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendOrderController.java @@ -615,7 +615,7 @@ public class BackendOrderController extends BaseController { * @throws */ @ApiOperation(value = "上传文件") - @RequestMapping(value = "/importData", method = RequestMethod.POST, produces = "text/html;charset=UTF-8") + @RequestMapping(value = "/importData", method = RequestMethod.POST) @CrossOrigin public ResponseObject uploadFile(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws Exception { String token = request.getHeader("Access-Token"); diff --git a/fuintBackend/fuint-application/src/main/resources/application-dev.properties b/fuintBackend/fuint-application/src/main/resources/application-dev.properties index ae6a85e..457d47f 100644 --- a/fuintBackend/fuint-application/src/main/resources/application-dev.properties +++ b/fuintBackend/fuint-application/src/main/resources/application-dev.properties @@ -32,13 +32,13 @@ system.name = \u674E\u5B66\u6B66\u7261\u4E39\u74F7\u5B98\u65B9\u65D7\u8230\u5E97 website.url=https://www.huamar.com/h5/ # \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740 -#images.root=D:/daima/yshi/fuintBackend/fuint-application/target/classes -images.root=D:/download -images.path=/profile/ -#images.path=/static/uploadImages/ +images.root=/target/classes +#images.root=D:/download +#images.path=/profile/ +images.path=/static/uploadImages/ # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D -images.upload.url=http://192.168.10.110:8999 +images.upload.url=http://192.168.10.70:8999 # \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09 images.upload.maxSize=5 diff --git a/fuintBackend/fuint-application/src/main/resources/application-prod.properties b/fuintBackend/fuint-application/src/main/resources/application-prod.properties index 3aff22f..071a7bc 100644 --- a/fuintBackend/fuint-application/src/main/resources/application-prod.properties +++ b/fuintBackend/fuint-application/src/main/resources/application-prod.properties @@ -36,7 +36,7 @@ website.url=https://www.fuint.cn/h5/ images.path=/static/uploadImages/ # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D -images.upload.url=http://192.168.10.31:8999l +images.upload.url=http://192.168.10.31:8999 # \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09 images.upload.maxSize=5 diff --git a/fuintBackend/fuint-application/src/main/resources/template/订单导入模板.xlsx b/fuintBackend/fuint-application/src/main/resources/template/订单导入模板.xlsx index 8b93e0381b0569231c484868183b85fcaaa0ee09..f7541e1c217fdbb3c8410326f6079ff21c949cb2 100644 GIT binary patch literal 9225 zcma)iWk6iZvM%lf2^JiJJHa8iYX(bj2~GwE7~I{0JA~jG+})kv1PSg=kO08~cSzpZ z*_*rHd9Q!;%&b*kSFfto)iw1sKpqwj1?r&%DXob-eEz2)L%tY;i~x2Z8!#&XB8CIG zfb>gjL`(;o9U2OX4+aVf^Y3DYHa0BIR=|(Z9dfYjn1M&WN0@eH7Vm@OfT0;{l1v&c zeFs3ISw%5Z9j)}9_lO-l#~br>mjtFf8QLcsRy6mc!ppBV+$X;j2Lw+y`M!G6o9e^S zT5YX<{9*HICy9gVP)^qk5q=rwv|(;J_Wcg5M5Q;ABrnrt3f+*uNL8TJx@e593IiFD zqD464YSADe@A+0MwDenkQZnRO%zErW<;y1ytUP~@r+UX_O{^~=AY($`;~J{2V!0Wh_FZb%N;foq*?%4rLiyyU9;W3-~Qkg zh~E2|sYXxa6BRy%9f>a!CewCEQqT@d+N`)Sy&`(D)Jyk6nPt%Dr>vov<1=F& zMyJ;FuW9CSd2^uA80`Uny=7}@EqPP(RCzHJIuvHaoyKQRM@s*Qtm)je?kilqY6(k{N^btvY!%#P55ruk za9tS)`mTgP=VPlOOq~L0o2(b$Tg&GnXWuMR+Z*m@vpHl<;>#pg{x4tqMP3)VD^koy z-Y3oqR1Gv7Hn5+djr@=zS%b!$YKXj-I79!ZD|(4YeCZ*sz=F8q=|5cI0JaBNJvbvb zT35b{4JYsj{$6~*BPFs#S70vU9JL!2ab!_WcCuuQidr^b{PxInh+fY*J2B|{>2dQm zRnZ%EXX#SKGGmnBNS{7xRV&sX^v-kBY%pmR;lK}~vT43gc?{wgm#BzJq)M$u!?!Uf za#jou>m~ZjVe!LH7PT4`^Q+B^iOxw2OZT6#;(mZj#8VCv@1`+|_g=?;qT~EI`zK?i z`T@|)aei{gzG~yC=PAG84L3Z<1Q2K94J%Vr?+q7A+*{=gZR^iIY@yt@zenP{&Zpo* zOSJlF8CRf>e{Pelm7s`&kZF%iM^)vuv0froC(fuWul{J3q)-&6ak%lxqe z2K)QV71!FQRaajy4kPx{J$W;t0Ly|?w1x`n%fPWKtweoOvIoold#HhhSk@W%E6Du2 zz?0tsP9VE?U~>}_`^N!kYqmtH9O9yT1Slwi|0Vki!v5f^cy&ea92;hfQ{KI3wi{3Z z2^t|*Hj~pLHo@ZB7Vm=a-CONaDz@FSBe~8ey~HX{r1V-mTyLsl@_BAvJ{O1zeNUO= zGm{M$D%0IO>wmT#x!DtpovVperGSGufe$z{y|`Pf#y-`|g-Rh8&lF3s)KzlVm!#iN zaLMwAF~g<+=bflqyQ|9?R45K|v@P$W|4cpc|qvo=TP`$>K2GR1gAv zMx|n@sOK83_pI2Q_7!P6Ra4(o&ppjr%UJ8rSeZi;}wS*9>F2Zh&)yAu~XRg4hEi8%<9Y~-ZfISKGjv@{Hm{eSFgGCd1W3y1A0WVwf z3MwQ`Jb}V19UIT0)epB*tPzh;J=ta6m{2?f$1Ag(@Ia+tc&D(h`?&5YNv5_z#HTN0 z+Ne+1$3YByq%-QwR^U>q5DLS2g;B|i4}JXTyGhd(M_G-qt+I-IiA()aQk3Ed?lGw! z#KmPtE=I5t1&N(IP9kIauf53Y227V+MW3mP%))=pR9z?{0*^0m8MSiiQQF$I5 z*6&jiwAicUDs ztv}mEK&AA%K}`3w!#FDP&w=ytp!s3TBNI3H!^zPYsY_#Nm2Y5WG44GMqchHl64f#M zrQ+8S>yqg?S@vO=xK*45p%f(xnK6wfv?mE8h-jo7)aN4o-7-xy5dj@iRgF^p0SD|p zBkcPKY_GamdpB}XFuPPb-dh7WggZt$T1cAp3E69UrYnh3(kDtegH4-Em9SoYk|hc^ z&34eZ;(^NJw)MNn;4)XgLxT#UD6U?4djlkOh`1ice&-V^EZBN;c&E46p?&v*o0p9H zyv&a$qtnX>R+#vLJoL$uH;OwLcGRXt^Go&=)JH|2iEMfsHZiAAs{&dgG~B=-^?UmVJuyergHhS}~#4~3d71_wVD z&c_K}Wmm%HSLNre1Sp%mQE6BMfH55hKUO=mo41?iSHvXX__48zeT~!=rdsBupSOp? z!kz(lcZc~-Wvz@fx_$CQ_ZKr|%XcT+Hw#_dT3D{%f9}_{wRwK;;_>=#7NwIx`!XOmxxU`LUqWZ}ZK}bZ#tNLfn+^uK4fpXX3AXx00Bpqu_a}g}}u|91aU^9@9BACB}qzaPhwO_-T7~JvCi%JZLB+r=( z8UD&)-<=Ga^050xX{c?mMIlTxguKq4#+Z7o6Ja}e;GO<9{!%6akFwepwvc?1-H;fa zk}`L6E86>9OV$f&Z}rv9GwmD}6*~U!S1)@~=lg}y&#_atgbspDL&AURjATf#yAH); zc=j%mWTjJJ@Xn`vGmGQhZPh_a^R=0adkvqpJQP5i*yk^BE}&ITPa|a_GDFg!WZ_uo zh|jT*XX(bf9HDnZB7oJFr$UCZx5!HS?z$QM2btQYP?}jJGSGjx^h`NUIMnXA4S&YSdY6fn(pnBcG{T{A~?k z8CQ{Q{qq8tMa!~pO7U)8+}utJ)X-LLB-qo&EFppzAs2Q4#DRqZ3Ug9yQoK4=GC_wVG6(kVOWZ;|(;2Go+#D^;NlNfvR*a-Hp^Frp zIA=;ePZlxC9ik*V%4lqE#jr)Q3o6j?QkppIjTep8TbBwH#qpon(+z59aLzd`_pRkM zAT&8x86=nBFp1+YX4K61#~|A-q37A?2MJFSTT1VBF`2TvpP|Ilao;M&QRAzeS15#f z6OGeNcN4KRYerEFUrtUVXg`FM4S(;2`o^h|@00o@c_C7Q~mNWyp3e%=iSOR5aGKW1$&gUr06pR$wQ_EUL3??&o znC6xR1bs}eY`!W3*;!Yl1{wLc3PXL))k>eiSO(+({bMzFGz1EicuE?jIt<^hf5sGVsupmkSlo}9*R))m5Oe=K@ z2sBXER@?$ihVhtaymRE+yNK9?Va;@mr!g$_e7Eb!Y^@%7tc2*tvv+Gyr&q(qshh^A zm@_QQbZ}39Jb;QBDdgVrk%Jo5hb_a;3;Lg_Yj*!jho_Kqs!jNO?zQb%ufo5^U^@SRUI-JjZ6<5sNyc-4)lx z+6i?r_$Qy_;$HWi_-JR4yYkO9dF2h53ZJkZ4}~2j%l3wpZS;JVA?i!p{>d}SvHr~M z=(_Mo)+yCy1>t94@wYgWf!#X4i1{O~4YGwwIR{Nb3CA`gH_>H_ezOsg*4F!B&;fcD z$7qAg0dF)M)3slqJFz5fQ|JqGGJ#gXS!AVDA)Q@>Opx?3#{s=x>{x{Wti*;}=xdfY zxXX?=FILO<>%Oy{93JO)#i|G#zdGm_v=ijv?`k$403EeX?;~b-jfP!UUiO_|WBnpPQ^woMco&OX+tjELJj2W91PO_{=e&B|8wPX>wV`v=JUq%CrsMfbns_ z)aWZtpayJwp5=eL{Gw#tKt(#053tu@T<9XYJA$D%ES9cA2}X$ID66#m&TBF2P-IU- zYsH<;#Ago%6lyoB7g27r6rma?<2k`n0rW|f2=r-wev>-PX#S$q+AfBA&peq6UNb8h zhWxv8;A^@h?lN#LVBrCR{gass;N%bC!2#-wMRiP1W>kDwUsyJjw|8Yght=zh$|KG- zM)Vrkn0jF#{EU8j!F);4(^og5WB@lEbcMWUhhkBe;lNrws)jxj=MLxB4i=DkuZJ3W z6SDxL+cG6)7rBON-L{^}&xTd7R*}|8m-?nbL9-;mqEt4)w8KoW(pqf{(rZnL7dh0E zYI=vwT^o~d538@UecL6NVf1%nkP6k|9A-KCqA*!pH09c2P1xAzd4(GV+HQ1UN3{kM?Xm|=eC^@<<`q$;H zxzKldshpNXPdJ`?JvTJn08tHH(v0o7aTKEftGWL|Hs?`5F=YTbhr({d{gb2by#k-T zdSR&LhT~77VHLZEOI2MUp>%lUqQv9tV!U$^G46zunxSceDOvuqrftUdP;abGkXH>m zbc0B_lYxY(pKD`>0Pjo8P5TK|O<^Vm0~CrS;pcu?pYx8r4JxRfr!8O=%;)&?NC?5r zu`(wgBLvP=*C!1*ZJ(X44@%@Lc8hS}W}C*nlaegLPT%HYtq{i%a|H{6ke-FQQy3%J z1x96R1csmW+UOBMu5iDAwkXpPjU`**iRf=f-S2#sjdi$+-Bx?23I5zEIC zazl2ZfDcyMTdMV-Y7@dP<|yV#0@Lqe;n3aRZ9Z=XPOahLzEEbNiwLxw)CYh_`+O&hzlw`~TzHeevy(FRZ_uOVFH zsmh|eaFw=afJEbsKfyCNYG+WJ>j0ROy|aDm;I-^v;Q(GrdB9RGbPFbyhBX}x<_1e$ zI%Z8ByxQaPT@_~F=Bkb6!bI0a+S)WJLL%LD&nTpWpNa|Led$??u7y{3QC`nveP~$o z(AjD(%yn5lbW+XrH9=FAkS?VD2_e34(SC-lXpJ#tDX95^?jS}$)7xx%X*~Ap0t5eq z$Ld6r{Tyyt2get*jJ%ULK*JI9G;m17aZti>?9AJz7^9;7m!LvSPK6B4OJqNb6s+v|$U$M*oXiPD z`jfnK3%M*(aX%FL+zx>ZGxIx-`#rzy^&e!^b^y(6&W+?fdY&+$d!XIP+TLorGN(ARZ-wEiQ#nFfVcnHr3h+sa#K%y@CVk2Vj~Nvv+#+zdo;~ij9Pw?L$m>>8?(@3XQ-n|v&p^D< zdGlsY!*tU7b$9n4!VtHIyp{1!A{4xSVKr)ou80&ezKw6;Mv9(-iT=jP>wIdGmL540 zUNJae9DkI?s|}HWOwh&od_X$ZNjSSapiiuU995v=^<9Em%vR-U1q|#{QJnA|p!02e zzi4}2V-k8KJ>4M;Hw<{fv+$(dSK1C9?L|vWWyd-P3c=~OkX@z3UEIOIQRzlZr)0fM z;7aiBXd^*Hm4@t7jCvm<@@})dH*`d#RgIWc54W8+_QW~mtqu(J#Gq%g6XgZKq z9n0k;cA%Ja8R2oKAP$?gADc?CBZxsYdP7=Sj5Mq$cPA@=n+ ziOWA}_zVJkK7&cgGszf-ei_6i7p&v+2I_6a8*kjtBEer3$^hIiO&P_8erwgn`Yjl_ zfFi~6aj1PvNQ{-f>qE$7h2Tojy8U4${-PW!x3TN3;H^8Xgs}B_pc`#4+xtL;NPX$i z$aY?Mwr{CYWf&{A7?%lwne$Ozp0mZth(QUjKP7%RkI58>kI}Rsjbo51aj2zJibkKl*@PvQJKu5%zJJ_m|N^w z4k&g0{#SYKPlSvQuu6#RMj4?LW&4rb3;25V^w=Q3v07qNu)!}vK)*kPVbT5 zl3{WY47da}L}TWC25kYNhW#MC({w8Po)YVAVsb!=UQ&j#tUrxRiuLu2ksZA&6h#G` zV#lkG%U7-75w_6#1tfVhwor$sSM9a)uvEb?rT}SLAsc(=@)}es1x}nVoix5eHqh+H zMf>kidL`EM{5{AeWQ<=W*pkDcqc;sBNu&~gP!@l#BlXIdI7Ey&SR51kIn$BzOTDjS z_Ha4g&&2&l&td2T&n5{L?wJcvrqu%qzB|TleXjZzJPjtQPR;7^r)$W|W^g09M@mtc zsHg7EqkO6!-S(5xFP^_y)0nAv=-_%-X*o3OeZ>5vtaxxhyn~h`Klu6M}?x-Lnd6TMUmcydV&@P^#-fB z+FHzCO)r|TDA^o|hbK3RYq~dHI)_l!CX+$TemLsgJgS<};A#fuAU$CglZBE>bh>5d zIXNYA*IZ5+!yFw!ncQH%VFA)gUPD*Sz|9c3fyS<)C>K5D&a*ew8@R_5QTa4{%BI$^ zqmC4z`k~E~_K>mJy#% zX}8}{ku@&y=B<8gVRuQYLM!C!|IoRM+gnatb*tw)a@O5mv6x{LRn@BAShqrD0p~@1 z_oAYuy=E&pRufEHUP7fg#4J4g@;)|J4|IF*gEs)2uhB{*sR*WzqdRB9=OWBIw$2#A zJ|BnMkL7g3E<>m(7q3FShDm_6q5oNi*r_`gZx?b$cG7V`|NQB|S3}B^YwM)3n`xwi~i)u?~TusleX#Ei;yvtjl=aCTd*icYv#U+q~b4-}0(ypt5}$7r6$Xdbq< zh$=IEX+(@nzS{b*>~7pdv`DVUo)^*V>!9o_0_t~cRX%oi)>!nFDQ=m9by2hFglpP6 zeS72YxAih^j)f{(*Ii}oMUVh}ti|}Q8bBmnfJ-u;PuS?WA9ss2zlKFYzkp%(qo0T_iF=I5S0+lF~AiGaX2YUd#I`N&Bw zsJO(G8C_B*AW1cJVN<8gmMOVUM~N(yI%D`sWO8!5vm<(3yZW;Xzdv=>{yo);zV3|# z7a=Zv8M{;FBB%dnrS;#;xp|yLa0oGDBgCA9kWWaE{4MrCRQzYb{l~hNU2JHOP}$-) z?qNF-&Mx&)uQy|+#0|=b(aZcTqP+Hpy7c}`%?$fQ9kg`+wj*gE#aXgY@ zxZ;j5-+(h!FZWbG0^X)Vu&92Jiw=A&|S!HE{w3=)sfAtmVt3Qb!aWNmL^ZLhE9Vq*f;%ORglD}%FGa{EZY~}dzwI!P-V!Q7rlIdbu z`j<8lmC%gkr_jX13Le#z<7^|&n073t?I5=n0hSi|6_sQybZ+989coMp3~6u9+}5dl zMPI+P#;Yw(3Be3Ypo~^+wcqnru|~#K-{P9x@#Zo1JIVHU+;VEK{T7}Tq9w|X$KHY> z&s~3NN9-Y@6!@u4J!1B3vM@n}5LF&aZLGFfB;JRLf(BhU?cP|PY}M|PCA;?e?HWvM zT_OhtVS?tC!sVb1Py+5ejq;<+fkGdqC>;Z^|CnkKgS<*+cu=Nrivvdwf>mLHM^m+P}m8&&h?yCVEW8|3L>rUg^J-{)d=< z41Y`?|AAvccIQ9vzsThO_RtS3>F@UN(C^@W#hd>I_@|YSNd6X}9#8afBzw^F+e)l| zhyAa(_IRAfY2%-9P$0bQza^26M|fPe{4>H3q>A}4!e2$q|Nm!CL;MB(4_o%nH{>y2 z_D5sS-(i2)v&U0@oN@gbpc_KLL8kn7v;DV8KhWI2+k=P0etY;Ir1w8({+RZD!2b4H b{r|%LA;AIi@V^!-7UXaVB1G;d;bN1@I) literal 9001 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 diff --git a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java index 8bcb287..bdb499b 100644 --- a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java +++ b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/web/ResponseObject.java @@ -1,5 +1,7 @@ package com.fuint.framework.web; +import java.io.Serializable; + /** * 返回数据结构 * @@ -7,8 +9,8 @@ package com.fuint.framework.web; * * CopyRight https://www.fuint.cn */ -public class ResponseObject { - +public class ResponseObject implements Serializable { + private static final long serialVersionUID = 2515641477316172528L; private int code; private String message; private Object data; diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java index 102b6c7..9afef18 100644 --- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtOrder.java @@ -36,7 +36,7 @@ public class MtOrder implements Serializable { private String payType; @ApiModelProperty("订单模式") - private String orderMode; + private String orderMode ; @ApiModelProperty("订单号") private String orderSn; @@ -57,7 +57,7 @@ public class MtOrder implements Serializable { private String verifyCode; @ApiModelProperty("是否游客") - private String isVisitor; + private String isVisitor="N"; @ApiModelProperty("订单金额") private BigDecimal amount; @@ -90,19 +90,19 @@ public class MtOrder implements Serializable { private String remark; @ApiModelProperty("创建时间") - private Date createTime; + private Date createTime = new Date(); @ApiModelProperty("更新时间") - private Date updateTime; + private Date updateTime = new Date(); @ApiModelProperty("订单状态") - private String status; + private String status ="B"; @ApiModelProperty("支付时间") - private Date payTime; + private Date payTime = new Date(); @ApiModelProperty("支付状态") - private String payStatus; + private String payStatus="B"; @ApiModelProperty("操作员工") private Integer staffId; From 7004c068211476218e72fa54a7243c3c3d2fd4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=9F=E6=9D=83=E4=BC=9F?= <872046794@qq.com> Date: Wed, 31 Jul 2024 13:50:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fuint/common/bean/WxPayBean.java | 18 +++++++++++ .../service/impl/WeixinServiceImpl.java | 31 +++++++++++++------ .../main/resources/application-dev.properties | 9 ++++-- .../resources/application-prod.properties | 2 ++ 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/bean/WxPayBean.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/bean/WxPayBean.java index 44cbe3a..1004b31 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/bean/WxPayBean.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/bean/WxPayBean.java @@ -19,6 +19,8 @@ public class WxPayBean { private String appSecret; private String mchId; private String apiV2; + private String slAppId; + private String slMchId; private String certPath; private String domain; // 填写完整的回调地址 @@ -70,6 +72,22 @@ public class WxPayBean { this.domain = domain; } + public String getSlAppId() { + return slAppId; + } + + public void setSlAppId(String slAppId) { + this.slAppId = slAppId; + } + + public String getSlMchId() { + return slMchId; + } + + public void setSlMchId(String slMchId) { + this.slMchId = slMchId; + } + @Override public String toString() { return "WxPayBean [appId=" + appId + ", appSecret=" + appSecret + ", mchId=" + mchId + ", apiV2=" diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java index f81fafb..0fc1bd9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java @@ -607,8 +607,10 @@ public class WeixinServiceImpl implements WeixinService { getApiConfig(storeId, platform); WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); Map params = RefundModel.builder() - .appid(wxPayApiConfig.getAppId()) - .mch_id(wxPayApiConfig.getMchId()) + .sub_appid(wxPayApiConfig.getAppId()) + .sub_mch_id(wxPayApiConfig.getMchId()) + .appid(wxPayApiConfig.getSlAppId()) + .mch_id(wxPayApiConfig.getSlMchId()) .nonce_str(WxPayKit.generateStr()) .transaction_id("") .out_trade_no(orderSn) @@ -924,8 +926,10 @@ public class WeixinServiceImpl implements WeixinService { getApiConfig(storeId, platform); WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); Map params = MicroPayModel.builder() - .appid(wxPayApiConfig.getAppId()) - .mch_id(wxPayApiConfig.getMchId()) + .sub_appid(wxPayApiConfig.getAppId()) + .sub_mch_id(wxPayApiConfig.getMchId()) + .appid(wxPayApiConfig.getSlAppId()) + .mch_id(wxPayApiConfig.getSlMchId()) .nonce_str(WxPayKit.generateStr()) .body(reqData.get("body")) .attach(reqData.get("body")) @@ -1007,8 +1011,11 @@ public class WeixinServiceImpl implements WeixinService { WxPayApiConfig wxPayApiConfig = WxPayApiConfigKit.getWxPayApiConfig(); Map params = UnifiedOrderModel .builder() - .appid(wxPayApiConfig.getAppId()) - .mch_id(wxPayApiConfig.getMchId()) + .sub_appid(wxPayApiConfig.getAppId()) + .sub_mch_id(wxPayApiConfig.getMchId()) + .sub_openid(reqData.get("openid")) + .appid(wxPayApiConfig.getSlAppId()) + .mch_id(wxPayApiConfig.getSlMchId()) .nonce_str(WxPayKit.generateStr()) .body(reqData.get("body")) .attach(reqData.get("body")) @@ -1017,7 +1024,6 @@ public class WeixinServiceImpl implements WeixinService { .spbill_create_ip(ip) .notify_url(wxPayApiConfig.getDomain() + CALL_BACK_URL) .trade_type(reqData.get("trade_type")) - .openid(reqData.get("openid")) .build() .createSign(wxPayApiConfig.getPartnerKey(), SignType.MD5); String xmlResult = WxPayApi.pushOrder(false, params); @@ -1067,8 +1073,11 @@ public class WeixinServiceImpl implements WeixinService { sceneInfo.setH5Info(h5Info); Map params = UnifiedOrderModel .builder() - .appid(wxPayApiConfig.getAppId()) - .mch_id(wxPayApiConfig.getMchId()) + .sub_appid(wxPayApiConfig.getAppId()) + .sub_mch_id(wxPayApiConfig.getMchId()) + .sub_openid(reqData.get("openid")) + .appid(wxPayApiConfig.getSlAppId()) + .mch_id(wxPayApiConfig.getSlMchId()) .nonce_str(WxPayKit.generateStr()) .body(reqData.get("body")) .attach(reqData.get("body")) @@ -1119,6 +1128,8 @@ public class WeixinServiceImpl implements WeixinService { String apiV2 = wxPayBean.getApiV2(); String certPath = wxPayBean.getCertPath(); String appId = wxPayBean.getAppId(); + String slAppId = wxPayBean.getSlAppId(); + String slMchId = wxPayBean.getSlMchId(); logger.info("微信支付店铺信息：{}", JsonUtil.toJSONString(mtStore)); if (mtStore != null && StringUtil.isNotEmpty(mtStore.getWxApiV2()) && StringUtil.isNotEmpty(mtStore.getWxMchId())) { mchId = mtStore.getWxMchId(); @@ -1131,6 +1142,8 @@ public class WeixinServiceImpl implements WeixinService { } } apiConfig = WxPayApiConfig.builder() + .slAppId(slAppId) + .slMchId(slMchId) .appId(appId) .mchId(mchId) .partnerKey(apiV2) diff --git a/fuintBackend/fuint-application/src/main/resources/application-dev.properties b/fuintBackend/fuint-application/src/main/resources/application-dev.properties index 457d47f..f2a687a 100644 --- a/fuintBackend/fuint-application/src/main/resources/application-dev.properties +++ b/fuintBackend/fuint-application/src/main/resources/application-dev.properties @@ -84,15 +84,22 @@ aliyun.oss.domain = https://wine-east-img.oss-cn-zhangjiakou.aliyuncs.com ################## \u5FAE\u4FE1\u76F8\u5173\u914D\u7F6E ########################## # \u516C\u4F17\u53F7\u914D\u7F6E +# \u516C\u4F17\u53F7\u914D\u7F6E weixin.official.appId=wxf4327ef05c27a0 weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3 # \u5C0F\u7A0B\u5E8F\u914D\u7F6E wxpay.appId = wx53b5ac263b9cdb5b wxpay.appSecret = baa127ca662344cf9b0b8e52b26bac9d +# \u5FAE\u4FE1\u652F\u4ED8 wxpay.mchId=1485526382 wxpay.apiV2=f5aacf8f7ff800f4cd039f2514c5d7da +wxpay.slAppId=1485526382 +wxpay.slMchId=f5aacf8f7ff800f4cd039f2514c5d7da +wxpay.certPath=D:/apiclient_cert.p12 +wxpay.domain=https://yanghaodong.51vip.biz + #\u5FAE\u4FE1\u5C0F\u7A0B\u5E8Fappid: wx53b5ac263b9cdb5b #\u5FAE\u4FE1\u5C0F\u7A0B\u5E8FAppSecret: baa127ca662344cf9b0b8e52b26bac9d #\u5FAE\u4FE1\u652F\u4ED8: 1485526382 @@ -101,8 +108,6 @@ wxpay.apiV2=f5aacf8f7ff800f4cd039f2514c5d7da #\u5FAE\u4FE1\u652F\u4ED8apiv3\u5BC6\u94A5\uFF1Af5aacf8f7ff800f4cd039f2514c5d7da -wxpay.certPath=D:/apiclient_cert.p12 -wxpay.domain=https://yanghaodong.51vip.biz ################## \u652F\u4ED8\u5B9D\u652F\u4ED8\u76F8\u5173\u914D\u7F6E ###################### alipay.appId = \u5E94\u7528\u7F16\u53F7 diff --git a/fuintBackend/fuint-application/src/main/resources/application-prod.properties b/fuintBackend/fuint-application/src/main/resources/application-prod.properties index 071a7bc..6c81ec5 100644 --- a/fuintBackend/fuint-application/src/main/resources/application-prod.properties +++ b/fuintBackend/fuint-application/src/main/resources/application-prod.properties @@ -88,6 +88,8 @@ wxpay.appId = wxb6af3741234162bc wxpay.appSecret = 76a538bfa5b55a4564d5f2be5540 wxpay.mchId=1636980812 wxpay.apiV2=34354320201030y323e432342343 +wxpay.slAppId=1485526382 +wxpay.slMchId=f5aacf8f7ff800f4cd039f2514c5d7da wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12 wxpay.domain=https://www.fuint.cn/fuint-application