From b6d754172702df4cd094195c6ff09fc042e852f4 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sat, 28 Sep 2019 17:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E5=8F=8A?=
 =?UTF-8?q?=E5=85=B6=E4=BF=AE=E6=94=B9=E7=AE=80=E6=98=93=E6=95=99=E7=A8=8B?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/~$系统运行简易教程.docx                   | Bin 0 -> 162 bytes
 doc/商城系统运行简易教程.docx                 | Bin 22288 -> 22472 bytes
 .../shop/controller/PayController.java        | 104 ++++++++++++++----
 .../modular/shop/service/IOrderService.java   |   2 +
 .../shop/service/impl/OrderServiceImpl.java   |  46 ++++++++
 ruoyi-api/src/main/resources/application.yml  |   7 +-
 6 files changed, 136 insertions(+), 23 deletions(-)
 create mode 100644 doc/~$系统运行简易教程.docx

diff --git a/doc/~$系统运行简易教程.docx b/doc/~$系统运行简易教程.docx
new file mode 100644
index 0000000000000000000000000000000000000000..eb358bbc801a134d767712a9ae2498827b3d4538
GIT binary patch
literal 162
gcmZQIGc+)_WFQf+GMF(KG8izJGmxy6M4K2G01@^A82|tP

literal 0
HcmV?d00001

diff --git a/doc/商城系统运行简易教程.docx b/doc/商城系统运行简易教程.docx
index dee0aced2f063a42ee5016af9f4d114775b6f4f5..b407efd3199499c0dd567c37a4c75f305e46a9e8 100644
GIT binary patch
delta 10101
zcmb7~RdAiXvZl?<5HmB!j+vR6?U*5EX37^s%oHy(vlBBj#EdaBGczya$=?5**;A*^
z&FDh9km^yFs=D>I)bW*&LsgLRTri}Kn{_|<lz@(@cJ$`g!?s<LEFEdKY046tApLad
zqczHaUl(;g>5t^@RQv@lKS(D_nqID<w8wSb#qw10zu!mIqjs-jY+FWkT>2z>Xf_Vq
zQA!?q_SrYdZ)g2@CiNhXo+jvy`_|e`TSwP>d+2>b`nFKd?mBevJ_}C-?e?>#DGOnU
zER2uWa6NSrny*GRZ5=6KbHeXN2NE1ujU{mVLO4|OEygA0AUa7jmPWI}Sv<5^%%~d7
zd7q8wt;*jB5{CQ$xL}M!%&WWW_M1LxyORcHMs&aZ=~`S~MJ)(8c~2<tC&FEBz;%_?
zoL=HRk_{?q$V#B>3){??<M(;uU$#@*y%M<QV=AtC=)XX0d(yJB_cXMekz2AD&9@+6
zDRY%SNUXI*w6KS{I<!mlE9nUw^oTZH?LE4E!B$m(hQWbAg@8bS2vgn`J&~Eyjt6Z*
zk^*81#OyeO7qDHu@z070dUjqtrwEMMjIwQJE1zYv?VM>pQM)V%A%D;JzCM=1Xurd@
z?uynH2~9gacaPd;_j!N0_8T5uP$}gg46Z4ihnB<+qMXc6mXCw8c4{VhP_rOeNJwc2
zg-j2UI_Vz?GvHL5h4WNe`{sgVzbm)QF$JJZ=DDHvE=EfHY*z9Yf8G{zU_5`Bj&|<t
z$0UPPM%3%Y<z;QzX@(t8l96;P#38BW<F<s54a^Hcs;^6>#d#m)|CkhTBl?q>hH0-j
z=EA13Z7kVL`*fO4+oOBfB0<qttoK>t#o^#)VbZqT{aG7I^@jpxrFjp87daKWNgZ(V
zA?bB}f8Lo0mm$wa(MIt}BE3ed2Lb$JN6PkVC+xUx14AeA!iE;nk>~OSeT#>{+W{KR
zP>fBD^l%CDU=?zfJ{Nk|MRGrN)XZDFMR^K)ZR>6$1Pot^0b>8n(x2Yfxtacp!IPP=
zHW8JSCIHA1dJ`mjo|2#56hv+ufWsUpC27x>5r&&_q$+>QsoI9Ei-k6UL{chf_xXYj
z0fFOD_XzV94w&<6&@}f<A767b%|~fVza0%y`g5`U$zRFvbF_X4MBBH3*gGvxb1vrl
zFdKf4V?$Q;1AkN91siqWiF!?@<%3N1DtGgp=E0FgA7L|0BC_i{D5agarLoVjX*TX#
z>x;mu%^aFIh#&@|89ag#SXfD5PP8)kN0()}<erSj3P@WSEDc!(R?Fw|18m=w<k$)j
zo{c9=V!&-q`j4&XZJ8v#zGoS(JUMV4`C$PXa0eJ9njdLg*1y6hd`x?X3+SO-!ts2L
z|JAb_6(rM^pSnt+`cYTl*vwTvO|Q+?LZZg7M&HdrCwIPZ1@|Y{vnQ;rQm<j4{*8-F
zu4msWF3{J9#MdDgdLC)H9ZHOB7vXqY?UWxzY>h2wp|n0r`FppR(MLl~5v??V2e*Hh
zgv3XqhJIJ6zn0dCF`mmuBd~lp1L^NdO>(<yTBxNTJh=Y?P9zOw{2Qo1^LJSUsVjL>
zdxYp29&4>j9B;2}OVHF`R_<T02Pg(r7;$2bFojOZu~Zv0fyxT7*NBh16^;BafcxEw
zrIl*a>*D-WV$Hwg$YBBg>tZvte{J@U3B^!)ARgSI^!8t(^SeqgwNy@w2;bX(>C!q5
z@oD|Pw)_ia-1xttfd5YxCc?P02D-xzUB;GNX!Qy6_a?`I4$FJEPaENIGR;@mN4shE
z-aAx+4KbrvcmbQ)2du<lCE1CzJfhp9GX2_9r{g3w?2bMkZn)>yne}h7fJ&F$lyh&d
zbi-6h=T>q~_<$5MXMWO@Sf?Yw_PeQ1A8zXQRCU0o<UVP}@hiU*QU+g~g<UkbCtS8n
zczj~Me^!}j(Tgg0G-7Rx&AC*-c7hwcZ@HQW8~$QEMqn(MBYH{n`|^!$`&af4cw>vt
z-)LDg+aBr+@Rn{cj07fp(||LZ;1vEF1=pK~rMl`k(g4<g+vu7-Y-_x#EA$d)6#1Z>
zgd%}G`1Qc$mphK|)-43Gs5Uq617u;;D{K)S%hi=NnfV>Eb)ze6?5#}<pEsF$dGOxM
z0grhJ79F-^7BRB>Tng1uaZg%*Qcv18A*aIiu<8kROT64oME!l!0f6ljU2q%mLha9S
zytBAGPM6AtD$H;yGB#6I-PJsA|9%8DWH(|=6f!yOqBBQQ+)Lzm{=JWv<1_ILd~2!P
z3eE-vr@K=Z7Ry`{dWAqz(HH(JShpTPd5vj^>@Z^UwdH}*uOGWp@Jr|WqEv!X0nI8*
zNrRbkWQG-+!H*N+4B&=#bL9=K*yhMD_nZ^y_L|-Cex4h`Q&WIS*cJ5_u9N-iUOWA`
zu9lD5!?Yy>!Ctfs&5%7-A;zvK+V<QQYh62WjV3J=iL8I^=Lig`lx@M{1WK-Y;rR4a
zX#N?|X<v3`w~ZTm2%$@X&pD@Bw?nb?tm{Tjc_9{;p7OFhi2yRZ4`n5O=Cw-)TbPiC
z0p7yT$}(E7JJh%jj0%zU>MbUVf66>muL^y!jF7)uI3Lf*z>!tcWyhibfg075+s_%W
zTWnOkf4pZmk_t*)(Q8r2urHH?DKeW`wz=)t5ZCskLi%g%wUd86S*HvmOTM!VjGFdW
zw`YzTMLC)3{sN>6Oj91duvf9WbxN;X7bI;e`F>nY>=I{IV0%n$Cw}NVC1m8IAFdT+
zv!ksm+YVm22KA|VA88BD;aRDbQK0~smAri=>w3q{>VuPslvVnM=#H8TW?afRuD!zJ
zIwwdil()#B%D7S*uX8^>y0V;flD2Lbv@e@A)N%9^l>qrs>5iFAV-o0NxS6KsFN~A2
z;ICZ?R_QZr#~r#Faa>;vlp;63A?Z^pkcdab6sx%&4xqjUk72Y5z&%sh2(FRzb_ntL
zAD`o&k;<Y?t<?zd+aDgSBjk_$9DQ@1oSX?3<7S_^gGQO3oOv4`|0<#LED#ok8gTZ2
zo;S-?Is=f2dJ#DioJ**ue<nCPONK9{WEh>(8F%$@sJnbLeOc0no)84rLH2{+IdG$p
zm)7>k5LJ<>J>HnL=m&l)IyHP5sRSq6QLGBi$|F<8##u3vF_j?Cm$+aPC{#5uwORB}
z2Su|ZAPuH3eL&6DTGh%?K(|_5j&wjiunfuPj{`U##t#gy2U#?EG{?*4G%Q>6o!(lI
z{**rt^oUNi94nT(Q|cX54v#PpwR&!D3`fX5Yk8_^>s1697RY)q7AYbsz`r<(mQb3(
z)mp1jNgLQHuM)K?>L4=XWZoEK{VM0yDZyI+yx%iK-sX=42CKKJ#t>-~JB{={iC}eE
zd;@+pLP9H6=Q#mlH4PD^*swPFc>|KJ37YM}(S&QsNrl0Yyvz7E_}kX1EK^<JTe2z<
zu&6nuo?nXMEWXfpbwk=^2O;!fZPEkLUsW5=S<(!Ap#g(QrD*F5WG^RA7eMFRt<C~j
z2k<(4KzLR=V|fYh%$;;<+o6HD$|~H+4iK=zI(iHfl96Zc#T~<t%n2{olxlA-Aed;T
z-<TV!Ty2daBuIDkfIn#KZOV*VxXf2yFYrf~A=j@?<$S$=8bz-H-q*|G-pj6<%MaxG
zv>3v;?xbwQ83!^xE8p1uqWrX7@L(KpMHJ&wn{>RQ5LQ0hrG~z#Y3+6g!Q7a_0H`c(
zmjPdg%b-XL=F)S&q^06;F5^!vz~D|Fnib6#su|jKzHNV!EnRqj8(nyR_J&ZqdAbon
z6gV2JA7PeeB@%msW|?In(xMM>`<^X6FVjDE@O<zR4bMHU^4n}%P2Ub~PJ8$c9M3Ww
zpOEX4j<~iVnZGKpr(2O_9B|2__fgo+o-ReGQ=@T|vF*hrB<AW{7W-*}z&rduQuDu+
z=7$iq3rI8wh!;>K4iVr)J?QZjJ^uYSh8za8QO${wQWRFJ<NR`4EqP@*JQez%G+Ms(
zv?DQ<3H37a-;2qn3@({4;Z?1>aPU5ySik4_4UiXg-jT=AQ@b{2-1Jx*HtbQJBmVGf
zl_+QVW%1u!mt91M`k|M8;r}@(^L$!l4^$C89KV_Pd)B|tcen$i=NC#VuB&Wecg_6E
zfUeTt6W&vK-`$JqwV7+=bZC{KADHP?yRd$5cc2S{ho4#Z;bJUdn*-S@{+?+iNMd<i
z$s~y$*?+TlEz^mkwG`kbK!HE&h0eD01%iu(mvgvwdQl@k7l>8;D!H>+Vc{!RQGxHU
zy|HS`2M636Rskp;PTZvfXSRdE#e`U>ciz6jsftaD(f~a-|2Fu;a4;UpcDHqNmRENz
z-k(+ChkVB;6`dF1T@PehrM0qR4XjD)X5sUn#L+qVrq_IuDtfP2HBTlT4`N}F$#wR3
z9!g;M$5mhQvj&_C6y@|<y{I&t+yb*%f%X9I%8Y9ZSwP;Sd-sj0Q0-#=&iZ28S)EG=
z3+tD8@)?=?w>J}hf@E~Vr8Z!Gw$A1Ku{~3h^G;08z51>Yn=%Q9Z?<aT?5bSvk6#6&
zjlF<NFshQG$C@xt%|>49!eph_3H+S9(unl;b!%&}Dh;w8qZqkCKdlmdndi^xWizha
z_7_QXgMfq3QUW>n!)hWPbtW56@Y_OJG0E-7)>Yx@)TAe)#?!!&aal%p+g&qD*p{yY
z^-92_dw&f0bN&0osmtqt{i>Z6lg6X%TyzeNX-u`35f*m12oaKy+SF|CSz{JEPodq!
zrd}1%f*0J*2$z-*pr2U@7GM^bxIPE7yg$8t0J?MD=Xl=shXG+Q7-Vet2XN(jw`K<b
z_V>2_m**%j`iC1pf9&0o{e8;p?dp0;B_&SSK={eq2fTiL{kpe@o}BXD<o~jDT?ZI{
zy}vnlaL0`((!j1i%6aX_>wKKvN_o33f1NG^UYk_jc7_2Fa6icS_1>@Rb<_5(w+sNs
zRql&)qyzq3?^R`Bw#xl?H?H@MGH_MZ`t$hQbC<zbS3@e`$NoNU_SS9o_7DXYVcvgl
zPJO>Id+Y6g8H@tcjj8}GFSiSShdO^wV_{z>@S)YH3>gbqKyCZW{Pp$9=;#G2TUS&2
zi-`~Tb&lX`WBZG<54dV{bZ`_HyxH4{OO6vU5`MD)FLhPKxvx8EKatK8as}+|JvlEE
zK%_|u**%aFYhT2#YrTpoe9<IBdn#~sHFvKvZrq#de9S-nNV=-4{BBGv+|}Q|wJhVc
z&qLE+uD;gpVPy$LM{`xDLjuZ2VS1>p5Er5nIPY91y<NG9$%;Q){WSu>YgskSnDPm+
zwPLuUMqen>R}$x-E3fdBC1<`NY2J77Wi)23w`-%0kFTtl*XC}08eMlB85ZKdTnWDS
zFLGJH-$>W4$!zR*SB=%tf7rKgW?xyVm%kd1H0IggAbl9NjygK2o06NGjNra+O_z*{
zG<}}y_SWCX5z^YTik}9yzsMF&=dYNHyI6g6&|z9=7ci2MRsZe6M=8=ox+dAt=FxS`
zY%-6M?N%gUc%=cNhyw@341MO>)#YyuopX71mYpVQ8VvR-Gh2N}y7Cfraksn#U|`uO
za|yi!fSB#~jxZ3T7R_)9N0`V<GuyKLUh$0c#})zds*Q4~r$N9`TH3_{B9ZiN_>>i`
zEslplb5cw@k8U)GgL{C>hvb$p!IEGHzo$?qgZHw9OHqM^oO`_C54+@Ew`e$q93R4u
zv>|TBTRtR<<ivhE?_$1Cd`zqmdRpFf85b6$_E0>6{S0mPtsDFuP}rhtQkoL^>#Cd^
ziPxzH{RDL1J}mIyO;)AXV;8jfp$d^7Hx*t@rWga3StI}3qV5-q5F89@+zjR;T6BDd
zq~HYeph+<ylOVpZ8pJ%@MD9HfpH65q4&<Ug<+TKf+;y~rPXkB{)w`)XzVPUo!};IZ
z?|b%Bp{o4*)Gr5^n7<GCf1Caiv4>K*6%Aj$kZGkX(dh#G@Hu7hK0v<|7AJ(W*->{x
zeMQq@w1{^ya7+5gU4gZBr=53FOzY}k4;et&RCuY1BsgIo$l$!{gK|~qI9cmG6tn?}
zsVHW1L*5>!-9vQ+uaO0lhOr%JB8VHm5G0o*CO{*rPHg^(VKbl=nWtX5J0{kfY}kgX
zIZl0dk6rSwXf0xiR)w=g5Ni+d$KFMC9>Z!u5U9o#)JcW^E=QU(dxdW*h^q{T?x5^l
zNm;z?Hkf;kP$d*h$OeUuHOh%U_)(@{yh(0LX%tJ2=yXSl1M(RojXkaoB25h<gf1ys
z0L?+nHOaJ!8CFU(ItC|D0`*5?p7W3zgWeB`PB{i3CMW@<9tP8plI#u5CCO-mQm;XX
zu8TDNMNwQSQCpH(<0yJx6}t!z)2<z5K;OEAV;E|Mfxxq85eJNj=p!0$ARe3W$%MB`
zT`>&miKM?scJf0a`COoWQK7qTSz-c|mH2L{dT5P}_9F=fYYm-F;@ReynA(^;eg+rP
zGl>=uA1WH711qIzeK&Gq2EPF{(Fj|Z@g@p8O=2y=7!L$L6`So-6_Za1!RK%yQsi=#
zN{(agQ}B<{%ZSxTT17Gpk^K3TV;VlB{>`(LYX(ujpcn;q(4>Na({#E1if`ac>L|rV
z{g#@Tz+Cd#&_?}UphT>#f)VMHT9yV($eR*yz>hZ><l*(+U60F%lM1iA9PYDO-%}$A
z!gEvIs9z8lt(eaCrwoNDa#=0*%N|TCjUCwvSN`c8+rUU*MZTdZ-HD{1Y%1>%wZv0V
z6TFFFjc*u#B`mnIHH^wLA~sAwK^ZF&8q^WexgdL1O~xhP_HE&CYzslw6&X=}#kvS^
z`C?T+47>kxYgoL4d;a4ox?;CrY<=;j&F8fDO#ee^o7}2=#j*2vhBYphdf1)1Z%p`!
z5lbivvE%~0gh~CLwh5D1>JFdIsAlal2v|+r8x_x*b38HZ?~)aQFAlY<!!O3Qk-|<W
zwB^4$tf-HC_c2L|<Rz*v>>wN&WCZO2svFGgGNLg}i8nrnI~7Gg5xLg)$IgBy&zwOI
zFlR(TZDcu^B1JLK(}%6W%3&&Gcn8~g&RfAfGoBoY!&gkfCG$q(bJItiB>NN>ga{51
z-0)HrkH*P;<i_gTI?UA2i<BsJ`@$Pr!k5<AQ?J&KVr9^x>Nw~F;{#)T*HSnFKou*E
z5HIw*O2MI6rW4UPf5@6qq7BQYY)bU#$)tP`+%DBTFY42CCoLS{suZ*a<%VJuUZ!%F
zR+=b{$+=yw@x^I!^(80>n#3j2nR4DHOVKh{zTiaTLY-?|GMg?Vji-gK7hy0Cat(>s
zpgf<5XM|tWe`nXsmjZj3>Q%=B3sRLNooqPSMliWv3_p<~cWf{%0?h+3kKo`sEXBOm
zh;75oHHAW#a!+gxFfs~kCBJEJA8Ns9Y*J6usJKVM`lnFv*t)Rp*CP-_a~PJ6<(~77
zgzUz0(QffjG1`AN0NmW!t|mY8n-f=Z@@KeYR$yDmSh#9`AzelnJ7j<bZ1U^)*>YoB
z4b)wrD=Cr&TT+=0_aL9t4i5JbUNdge`m|IJ8hRSf+8LZ3di$eye5<0;+Ytm+I72YR
z{0Fc)Q@nl0y4h^A?fUbyr`)u^<ZWDu%lbcGCR|L~1>x{&6djC{TySLDa{YA;9?iHg
z{$n==mRtDj_1nvpFt!k&SBv-prq{!jj7Cc<59crdO-5hkE*>JlESDc~d>Tp!XD21^
zw{DMzCF3W3;w)$@TCq~-6e-9%7H8b+aAiW685DiFc+K*_1Z4Ry&2R)i-;&Lj53e2b
zN)}&xNTUlAXbYF+zf(!)o}wxUOfo@zEkXV6x~Kyy^Pn*XT@?uhoIrMvY`0qG9t(e!
zK+`Pw-O!EE(Eso>R2$+JIpk%dRfrJIw4ydltg}B9Aw^77FihPzAiDsY$tS6x<wQSY
zeIx}T9i3W7qSdRbIs<b{F{ObGH`{c0RO5@+XM!AS@sroA?>B1Yr1UZJ??#N^DP2FR
zIcF4M6|=Mu7glvoAj%JsUT(Hof<~PSv+KSnniMA2sN|dm%XhDjrgxp@YCPlzEOy~<
zEeT)YJG5m3%Cr7yWgLrY2fAOLtL#`wKb*7J_M$b>)U!sRRy<ub4}&p<_$)6g$knF9
zPTq!*<2FhWv7D30eF(0UC}Gd8R{SFMV%^>)@6?DD)Yaj-0E}WuFDr{~Mke<_-za=T
zE`nPDO#;PPMp*mqY3Q(rpC!~KJr(ldPTAE{btt(kt%vk=P&Mofm~yxhCGfK>^GT?`
zWbEA+xq`Z;?7LbA+B&9MKaZspfWD}nubt`l+sqwa7Pef#?XbL9%vC)x?|OUI!mhVA
zz$wb?Ij8<41H6!Ri<}Cy;y69RD<{z|lK(7mt^bLJi@h(KsS@m;yED}Jlk&^Uw|4z3
zsFh^_)nnxhzoV<tG?@L)Cbn^BW@-4!b1rqcBL`Bg_kMwtb1gsE?p{^LYr)8HY<by<
zC>(w^Ofevc^J=@gXal2s`NM_k;ALZ3CE<qeNwXbQIlvu|y`sH6m#|*VcmCB^b&Z7%
z<Uw>ZOdzmK<{491{&{{H2zWy5InDun>I}TXjea{ZDFa4~29eS`z=yQuA~y5;JHCqc
zgMD}ST#Ho)!zb(wBpM6mz5>!Bfw|HKwkfCj@)sH^hxc_vA{Al1Px;4PjU<B0fa6c|
z%h0kW!oiNMa^oLQw<qhj_m9m*WG3z}U2jVROkL1*rj)OE0H<%?1{nebL^m%41SSLo
zgqM@61)GJFxrc+LqdTj&gZ&wip~kB8^=s+5i2cz~CF5!Bw}8}<gxYRTHIIY*Xbm65
zKk{{L=F~A93A#IU#PCG+y$L47#5;9Y3oYti$X;@g+$Qg7BsM<R#<CO9^=<wGF5|Iz
z_2^7CvuiUmz^ApD<D<9RI)&sk!tODe*>RgC_qODoMrBkpJh$ZoyzzPuJB9^`#y~~e
zolNdX!?U_|k@uq+*Elhcjh@C7D6Ga64bR(5?Q6jjI*`j9R%3idWBB+_1!N=r67A3r
zNRoqT9G23>1wt#V7sS#Yr>&F5WVJH!Wm3E4YqLLt0f)mf(X{V^JW6`(<`mqg0uG{U
zVx+^^AnyXvwpVY((0$IFB_T`+2h>m)`8YHB);@gu1^W9#9n*Umtaza>_}qc;wrw=q
zoMBg$vnJt1sYO46;n>a6*bSD3J<pD-*ms-Kg1?52e8g1>Y8yJEK#`!(D^3Vb-PkWb
zFMQ;N0h%<zkMzSAQ3uu?a#`|68p)_<tt}Cx(+x>i`kw=9&*D$oiWJ~Ak00oV^rQny
zx??52k~Kj3HH#@&-#cxVzdlyxwRA=NW?ds=q=4sHbXgVNxcfO5Cpeq?nKfm`a!~2S
z(?V9io^2&9P)CWH#qvl9S}KDhk;l}2&t9iA6A((qLdw4jIvde2*EApj^9=Rv<!3WK
zM3a9iIWn31IKz>j^eg2Qr9lV}LcZ_bl~B6UYnnzjIQdby<m&j(@_u>GsKTj#4pY_n
zUaF^6nD2$rIrgpv;F1w>YPK4B);JN?2<kGhJrSU*{)GA2*@N<aJxHs665gb2b?5H7
z1+aVRc7L4lZGOvr^DXZ5W-5<`y{YS7UAqJ;u|uiENW7KVSf@pqMrXM_Cg3R)7$Pch
zzGp2qQ?&eC6O;0fH0AV1>OKGFWs(#jHX85|h)x$UTIwu<ksbRXw2q3;?$4dz2W^_V
z$Vzfw#QQz%F^ED&SaneenU)3psquXH0}v-)Y$>70W=0GqC2@_9eO6JJ+`r)iXVSqf
zMVJ}D?D48Z(m4I*rcSh@I)D-ymAyrP=?;g^MywsNF+8g-D+{~nRE76PJjza>uj$7?
z4r$58uvZ4<#vF8FndL5HHj$1E$$@YjTFzvmbgIj(Ut3Gbb?A1X9^oc`NQnxm08NK#
zM}=qS&m7vdukjuWD^cZGDiUD+R-BTG5xk}j<2`5!vZC&$pWYtqnJoiW#Xgo`wy~0e
zLR5l}O+Y}Mivq(}=L6V{pO+&GcQs{L-*gUo|2QSlK+u0g@wa7toS3N~%emZphr3a@
zTX=YU)ac|Jr7H<Kh<bT@XlTfQ0QCF}Q60NX7K?<TOW1>n2dP`#TbEJxv8jY?)3(qz
zVBAK#HIuqBD>{r&Dw#W$QX%xWc$k6=EQ=e#@l|hZ2340usE4%PkCg2?dl_z%Vb4hf
zt1U*Kjki>cepAH<CG!x0au9aYjxN_Hx^FeO7=`b!tC(p*nb|EOC<OYnfp(iA(K??!
z_QlAda6TBEcas9Du|ISb`w+iHgrgu>6=vdo93!nSsNI-jEx;ILc|Ei8Mph2jRRsgA
zA#BDA^N#ed<vJ<gvWupHlAb@u^LL*=Kah3rj~i=sOKgtfK2mS7F*P(CZQiRp1PHe`
z4Gfz4b#)KwJPzRJ=-K`b0lXHP&W(0>NN1}YgDM~nns5U2Qd0v*a}98|(Ku`$TT^aQ
z<GN$1wZ;5b11_sF`WUITDPlLhJBBEZ?ab^<%im6ss+8x+;xcAOX0~##NxWZkC+~{p
zp6<vf3^2!-LqtTL=(Ttvw5V$$9|-6LgV4lw3kL;W2b)OV)0OGI0?)!z4<fXs$?zmU
z@}B8mYCg%9QCV3<>zB}4qSkv}MFstcadu$p-;WR@&Ru1)K1wFUv|Z~9kKlC*Omz-*
zk$#gz4?8W}{1~Y%jaevQssSA~qwq2{=fDkzX1~52vXB0$JxpWYCr^3(Cv+HM&lDcr
z$5`I>*!gxGZ%Pl#65!2PTC&`|W<Ud@_yUcNF6cWzhy41w?7&;0{NV|HgQZ`*O2=5N
zdC0Te#3Nhh!s!poWm%F%3*BhPs@tT`&DN??ccp;#NWW3!7Nv_2cRCh>7;E88KdQ|)
zS-<do%%ml+2uA8sXLl_~EPp|Z^kGVs58x@o-LWPOI8wO}K0xhI+&(3`lZX@XI@)c{
zewhmR(e@)B@<D6&Xxil#Zqf^E8d19|oo<>cgfm><LUuQ%OS4N!=dFYPx?hwC7_X{Q
zbX&)Pq*h8&nuuI~JUou#7b?~oxgWExzk#1mhKj+;)45pY4mT!^j)H7j7~2JhF<6o;
z)G*ZND8b5M1F$8xf4C~?r!_sIW?oAeS`X*wkkTc@O4zV#^}|vOU;~j$tX=Uf4|hX$
zR*zl8{pw5SArfg;oOmQ<Uqh*h2xKc_YZdU15-jS?x3`l`6-uQxlaxE)#<JNm&Mqp6
z7cP&LHd~zGP%soLJ*?!6VVxIB>NM^d`h6<MY67=s2k`b&>v5Y9&k+8-G-fLg&ym-c
zV0fG%!Cw+-jdO7r#qV>`zkhK-@g?f%6msXnyhLck6?sm0Uoo0gc9FHHPsuZ4^Ak^O
z71KgmCA&C3)!xnA7Qw*wSA$<}Yqd}o!N!HYT&yUCyq*n4%GkHV#?xPCym!-os3|9}
zdK|T(Q&n~kAI!f9<Rr9&bgrdAYco(AgqVXPQQwa@LFmI3QDvZy#D<aK&}SRL$`w~m
zqDH||fxj21OQ=VKg|8*2%tvc85gc_c8}ZzvtrR+ag^eeyyBD*90hUNNenUe**kM3G
zVEwnO_~PW~u4!s!Z}~4>v8OZTIP(!FKxUgPzrBvvrqKd-t=<FXDhLDmDtvX;fyJz?
zb|xtR5*>j$q|fRS8sX~Gw?1QM2Rg&$Rzqlew&v31^~I+9VZMX)RgtfMkS>B`rC=|>
zTcp=QJ#Oqkq5tYlj>zbFQD=$#SXeVg=Ix6@{>x55o7ee78&$W$Ubk;$EAs^yRGaA;
zEV_r?Q@xC>(X+KJD;uit$S?@mdp&3G%Z6tkslcBL%fc3nkO$o*PvtdCDNU6Q`t)N0
zf2&B3Ojcb~x_d4}Su4w-Q=zdXzV{anpBmEm7*YlhXF7ss)8oy8S<r$bA3Y+(t7zhd
zbEsJ@D7jC><R7=UCS%S@O^WkvO)&bk0EyRWeJ@q)lE6~ZCvJGvj}d?WOAn4)o-BeJ
ztMk;28cY@Rtk^Sss29wJnaE_?HDYpPVpPOXs7&hAc5SRYXkjd8n&a<N3NrJr^;E-x
zLwr_XY!>3qznO-fPY!!Sx+gnFTr!RktGoCV!Z%ebOR8^dSc&u#%@~IeJY{@|zU4iE
zE>Z=>_0G-8g|Ubu1SJeP1_Z`D8y&_`AToj=)Aty*t&h}Hf=nYG_@#e5D^0?uIcKK0
z@V|9`HVrpbTSN=R6P00+*poEtS~l3}jev;+-YBr{S~7U1v!5d|?uh9q(m9v2Fz9~I
z^hAh<C<mg~V1|E?tCz#iLx$xlkzYb?!`z0<B@wFjhbw|W2?(b?dOISdKx@JjuY+Vc
zq72Rp_T|ZNzd9KWJ8R{IVRn?j+h>(7k)Hn$s=Pdr@YS;xNx~bt^)M=}P||jE^>+je
z@Uk^oEtX-q8i}ol60!RpgyV8Xq_f-%sh(+E8|WNmPG&2G01-kDX(oBeRCAzTL8u(H
zsL567Hmd*Lbcz{ZFd0}#g#RP0*5(DWxn_zcbFZ#L;amHHA!Q^enKiHMvR2{n8|jKc
zejLH(Hy((*XZRJF!>{=y7!?G0XILbhz!^vAC#fsS{3KK5mY+YzOHBiL?N_AR{oZe8
zGA@ie#Y9Xee@lV!^;zk4i_1zY7dx#hwrT^U{h7X&nobwEPKaou6+#?yx$uvUV}X1W
z^lEt9{k;i2dVaE~@`Fd5eWTkb?3^0!07G;w-QJ@@oLzP)-GikLOq+O{4ylD`Yp@98
zC7<SIrgs2+(mFPSK_(xac^;d((cN5`_Z&~{)e&_pmw>mru5Tf@SGlveZ-ai!zL~@!
z-Q=(&ON+U_>!>7spxK5wzkaG??)`JbajEgID_8j;La!NzZJ1N60d=3!Ry~hfqQCy0
zFMk6IrKSQ(Q5As_RRArjazI%qfKb$Upw`7fQfk~#k&2)IH9@FmMG&zfIcP<V5eiNM
zL@tgCB35UFdXoUjs+<11+6+{o&JX)fq136mCS){7OhXi*4d$Pu1f;4)0!r6LgQ`{n
zHEQrcE`iQ9*ogjT`tmo_KtMu}|Lx;JyqYvb|04|jXIfPT<gF<TsRwG(6oM23-Tm$J
zK%caPP>JaNPZDHpX=(w2)WQQLY7s)tgQ~QIpa`Tu=UUW6|M!QD{hyraKU5bGi#9dU
oe@clUApTYq{k#2R)H=vsTM)7i^h=u;auu|#O%F$<_OI#x0wt@g-2eap

delta 9886
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
HNB#c*vepAT

diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java
index e498b57..49d0a41 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/controller/PayController.java
@@ -6,11 +6,22 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.itmuch.lightsecurity.jwt.UserOperator;
 import com.ruoyi.app.common.R;
+import com.ruoyi.app.common.persistence.dao.StoreGoodsMapper;
+import com.ruoyi.app.common.persistence.dao.StoreOrderGoodsMapper;
+import com.ruoyi.app.common.persistence.model.StoreMember;
 import com.ruoyi.app.common.persistence.model.StoreOrder;
+import com.ruoyi.app.common.persistence.model.StoreOrderGoods;
+import com.ruoyi.app.modular.member.service.IMemberService;
 import com.ruoyi.app.modular.shop.service.dto.OrderDTO;
 import com.ruoyi.app.modular.shop.service.impl.OrderServiceImpl;
 import io.swagger.annotations.Api;
@@ -19,11 +30,15 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.sound.midi.SoundbankResource;
+import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +55,8 @@ public class PayController {
     private final UserOperator userOperator;
     private final OrderServiceImpl orderService;
     private final WxPayService wxPayService;
+    private final IMemberService memberService;
+    private final StoreOrderGoodsMapper storeOrderGoodsMapper;
 
     @PostMapping(value = "/shop/pay-confirm-money")
     @ApiOperation(value = "支付前检测获取的价格",notes = "支付前检测获取的价格")
@@ -60,10 +77,16 @@ public class PayController {
         return R.success(map);
     }
 
+    /**
+     * 调用统一下单接口，并组装生成支付所需参数对象.
+     *
+     * @param request 统一下单请求参数
+     * @param <T>     请使用{@link com.github.binarywang.wxpay.bean.order}包下的类
+     * @return 返回 {@link com.github.binarywang.wxpay.bean.order}包下的类对象
+     */
     @PostMapping(value = "/shop/pay-do-pay")
     @ApiOperation(value = "开始支付",notes = "开始支付")
-    public R doPay(@Validated @RequestBody String jsonStr,
-                   WxPayUnifiedOrderRequest orderRequest){
+    public R doPay(@Validated @RequestBody String jsonStr){
         JSONObject jsonObject = JSON.parseObject(jsonStr);
         String orderNo = jsonObject.get("order_no").toString();
         //1-余额支付 2-微信支付
@@ -87,31 +110,70 @@ public class PayController {
             orderService.payYue(storeOrder);
             return R.success("余额支付成功");
         }else{
-            return R.error(4000,"微信支付开发中");
-            //todo 微信支付
-//            try {
-//                //WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
-//                orderRequest.setBody("主题");
-//                orderRequest.setOutTradeNo("订单号");
-//                orderRequest.setTotalFee(1);//元转成分
-//                orderRequest.setOpenid("openId");
-//                orderRequest.setSpbillCreateIp("userIp");
-//                //orderRequest.setTimeStart("yyyyMMddHHmmss");
-//               // orderRequest.setTimeExpire("yyyyMMddHHmmss");
-//
-//                return R.success(wxPayService.createOrder(orderRequest));
-//            } catch (Exception e) {
-//                log.error("微信支付失败！订单号：{},原因:{}", orderNo, e.getMessage());
-//                e.printStackTrace();
-//                return R.error(4000,"支付失败，请稍后重试！");
-//            }
+            //判断库存
+            QueryWrapper<StoreOrderGoods> wrapperGoods = new QueryWrapper<>();
+            wrapperGoods.eq("order_id",storeOrder.getOrderId());
+            List<StoreOrderGoods> orderGoodsList = storeOrderGoodsMapper
+                    .selectList(wrapperGoods);
+            for (StoreOrderGoods storeGood : orderGoodsList) {
+                int storeCount = orderService.checkStore(storeGood.getGoodsId(),storeGood.getSpecKey());
+                if(storeCount < storeGood.getGoodsNum()){
+                    return R.error(4000,"库存不足");
+                }
+            }
+            //System.out.println("11111");
+            WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+            StoreMember member = memberService.getById(userId);
+            orderRequest.setBody("商品购买");
+            orderRequest.setOutTradeNo(orderNo);
+            BigDecimal bigDecimal = new BigDecimal(100);
+            orderRequest.setTotalFee(bigDecimal.multiply(storeOrder.getOrderAmount()).intValue());//元转成分
+            orderRequest.setOpenid(member.getOpenid());
+            orderRequest.setSpbillCreateIp("127.0.0.1");
+            orderRequest.setNotifyUrl("https://app2.dayouqiantu.cn/shop/notify");
+            orderRequest.setTradeType("JSAPI");
+            try {
+                WxPayMpOrderResult orderResult = wxPayService.createOrder(orderRequest);
+                System.out.println(orderResult);
+                return R.success(orderResult);
+            } catch (WxPayException e) {
+                return R.error(4000,e.getMessage());
+                //e.printStackTrace();
+            }
 
         }
 
 
-       // return R.success("");
+
+    }
+
+    @PostMapping(value = "/shop/notify")
+    @ApiOperation(value = "异步通知",notes = "异步通知")
+    public String payNotify(@RequestBody String xmlData){
+        try {
+            WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+            String orderNo = notifyResult.getOutTradeNo();
+            QueryWrapper<StoreOrder> wrapper = new QueryWrapper<>();
+            wrapper.eq("deleted",0).eq("pay_status",0).eq("order_sn",orderNo);
+            StoreOrder storeOrder = orderService.getOne(wrapper);
+            if(ObjectUtil.isNull(storeOrder)) {
+                return WxPayNotifyResponse.success("处理成功!");
+            }
+            orderService.notifyHandle(storeOrder);
+            return WxPayNotifyResponse.success("处理成功!");
+        } catch (WxPayException e) {
+            //System.out.println(e.getMessage());
+            log.error(e.getMessage());
+            return WxPayNotifyResponse.fail(e.getMessage());
+        }
+
+
+       // return WxPayNotifyResponse.success("处理成功!");
+
 
     }
 
 
+
+
 }
diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java
index fd9d6ad..53bcd31 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/IOrderService.java
@@ -40,4 +40,6 @@ public interface IOrderService extends IService<StoreOrder> {
 
     public void payYue(StoreOrder order);
 
+    public void notifyHandle(StoreOrder order);
+
 }
diff --git a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java
index 4159b23..6f3e43a 100644
--- a/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java
+++ b/ruoyi-api/src/main/java/com/ruoyi/app/modular/shop/service/impl/OrderServiceImpl.java
@@ -482,6 +482,48 @@ public class OrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOrder>
         return storeOrder;
     }
 
+    /**
+     * 订单处理
+     * @param order
+     */
+    @Override
+    @Transactional
+    public void notifyHandle(StoreOrder order) {
+        QueryWrapper<StoreOrderGoods> wrapperGoods = new QueryWrapper<>();
+        wrapperGoods.eq("order_id",order.getOrderId());
+        List<StoreOrderGoods> orderGoodsList = storeOrderGoodsMapper
+                .selectList(wrapperGoods);
+        for (StoreOrderGoods storeGood : orderGoodsList) {
+            //更新库存
+            storeSpecGoodsPriceMapper.decCount(storeGood.getGoodsId(),
+                    storeGood.getSpecKey(),storeGood.getGoodsNum());
+            //增加商品销量
+            storeGoodsMapper.incSaleNum(storeGood.getGoodsId()
+                    ,storeGood.getGoodsNum());
+
+        }
+
+        //更新订单状态
+        StoreOrder storeOrder =  new StoreOrder();
+        storeOrder.setOrderId(order.getOrderId());
+        storeOrder.setPayStatus(1);
+        storeOrder.setPayMethod(1);
+        storeOrder.setUserMoney(order.getOrderAmount());
+        storeOrder.setPayTime(OrderUtil.getSecondTimestampTwo());
+        updateById(storeOrder);
+
+        //增加流水
+        StorePointsMoneyLog storePointsMoneyLog = new StorePointsMoneyLog();
+        storePointsMoneyLog.setUserId(order.getUserId());
+        storePointsMoneyLog.setTitle("购买商品");
+        storePointsMoneyLog.setMoneyNumber(order.getOrderAmount());
+        storePointsMoneyLog.setType(2);
+        storePointsMoneyLog.setCreateTime(OrderUtil.getSecondTimestampTwo());
+
+        storePointsMoneyLogMapper.insert(storePointsMoneyLog);
+
+    }
+
     /**
      * 余额支付
      */
@@ -541,4 +583,8 @@ public class OrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOrder>
         storePointsMoneyLogMapper.insert(storePointsMoneyLog);
 
     }
+
+
+
+
 }
diff --git a/ruoyi-api/src/main/resources/application.yml b/ruoyi-api/src/main/resources/application.yml
index 0448095..8be212a 100644
--- a/ruoyi-api/src/main/resources/application.yml
+++ b/ruoyi-api/src/main/resources/application.yml
@@ -6,6 +6,9 @@ light-security:
     - http-method: ANY
       path: /oauth/access_token
       expression: "anon()"
+    - http-method: ANY
+      path: /shop/notify
+      expression: "anon()"
     - http-method: get
       path: /doc.html
       expression: "anon()"
@@ -150,8 +153,8 @@ wx:
     subMchId:
     keyPath:
   miniapp:
-    appid: wx604d2ea4702620d2
-    secret: 0beb4dad95fbd97cbaf2a0a4dec51575
+    appid:
+    secret:
     token:
     aesKey:
     msgDataFormat: JSON
\ No newline at end of file