From 260cf6834274343aef6334218149c5457137cc5d Mon Sep 17 00:00:00 2001 From: weizong song Date: Tue, 1 Mar 2022 07:40:56 +0800 Subject: [PATCH] up --- .DS_Store | Bin 10244 -> 12292 bytes .../Controllers/Customer/OrdersController.php | 3 +- .../Controllers/Manager/OrdersController.php | 3 ++ ..._01_073747_add_merchant_id_to_recharge.php | 32 ++++++++++++++++++ public/.DS_Store | Bin 10244 -> 10244 bytes public/hyper/.DS_Store | Bin 8196 -> 10244 bytes .../views/admin/project/create.blade.php | 2 +- 7 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php diff --git a/.DS_Store b/.DS_Store index 4d6a3e8359166f1124d5c9b38dfef88363ab22b0..e2604b90a970f7a1fbb66ab09798ccb8bb602d58 100644 GIT binary patch literal 12292 zcmeHNUu+!38UH@pIqxQMyiSvI>?Gx=>&5{S?11x!G{tsIAe8VYcK#43_TJsbUO3-g zZ|`g;X;PPhDx{_$Xxfwqpyeqf4~^6ap{gySQla4i)LNvJB2}oWDqdQ(JXEME{mtz9 zJhOLB-%15L*6z&C_kA@Xn zXqfnGGQKiA;Y|;h>{8huw2SwNr@QUaL^>>wcwVkjw$le(XL{6Hwad$wY&Y)|rLmiJ zpmP5~H=p&U2fcDW>&teA1A*wr9JSUQKi<2gr#rQ^=R|kvc<+sU+q+ZS`}$6tFpbvE z-kp2KCXXIF{~nH<$(?eB?2_Y;TFpL=)q65t{_dhPg(LLAjF&4<<{@dx*ttv@%FaM8 zH|!pB{6i&YrX)&-eXm&BB^3|3uoZQq)=FW2SE1y3dH;Y@^pTt9x#g?duj=T!Zu8bJ z4$L*JXtvCi=Bk5JuJ5LE&i-jPTbj7n_A^dC>*mJ~<5-?Axkp^5XtvZ_=1AV2bmp3x zS6Ip9nl{6*Iu4c7?pMoh>FAubqPc19x@7YHEIi!nWrbDNx@Z`o{<_Z@#(hGztLWgK zl?I>hOqwG;ytQn@lr4qE4ypcEaR^HAx@eUs1+xZUO%XjiY9%Y-;oZ%do zd4`YjG5#h$!jJN|_M3M5Hjc`&x7T zVszgR+Bq|Z;EvTe*S4lLc~$$>?UrDVF(-{X+cy~Cw8c`ovAwh1ssqD?%-q!8V}iz3 zeV}@S*=K;T){;QF&AiD3rLBfQy3@Sb0CTOxTwCj!P`pXO)y`3Up&%yTZt`Fxallitu! z_=VBlXYdnl`R%q3#e=_u=(BWy|-X_0IiCr9)C z><7O^s}T*=e@Ndt-68R>(ptcNaV>2O7bNaW0>p8Tpk8N3JXbU|uc@Jk9u?^#9%~vk zy;U?cPlLloLgJjKtUyoopy6*@9)|~-T=n6xpI;a~)e_FSn5(c2b=DWtQT<3f^Cr5X z71&c9e6KHH1~c@Kd|zFfLH=MBhHpeL6!vk75r`3p5r`3p5m*cXu{AegM{%&*xnaDJ z!M>NLBX}OKjxn_Or~#Ja!cNz#KNs1JDthW}+W7K=&!YE=Ox;QQp4>Ec?Pa->D)NQB zyp~+uL5;tp#E4hS`-dGg`ulez3gK4hcPVk~(uyr`03ITea`bV^Xj!#c0vi`dI%KOO zCAxG5tt(P>tUu|TdH=UyACh{mIJh)A?PLM;uK#D>?Q6-rc0PJb|c z;+?X@q#|9wqgtwAvFwj%biUQd38)di7J-lpoNUVLxQMfi#sL%2mxn*ZthhuZ9f`W@ zcfvwFG1Rb_|DqNgz^WS50HKMO&|r;5RB--&^?PUU*&@NIsks2ul{Gcc=m~U;mr)$? z0Fdt0ogb<))t3X0z0r6e2ze{EYPefVuJ`+#=(h>|dLU{6_u!}_gIqjCrbtp(C0{Me z9PAJ<>ys-MC2gt_vd@|eop`aeL#?K(VZ)7WXjhY~_*~Ccm~W@Gxm+Fq^Ip*lFo=TC`M9jPR^lAbomgm8;m zK!f1KBTue$9o8c`p;(V_@~J@zvDT=hSRQF%5j*+zs&>m@hm$qF4&<>yl+fQy_39~h z3JqlKi;F%Xl5`6__$n$N`}u!~M4P(A@Bgm8~^|S diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index 72e1124..04e63af 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -595,7 +595,8 @@ class OrdersController extends CommonController "customer_id" => $this->customer->id, "money" => request()->money, "order_id" => request()->order_id, - "payment" => "weixin" + "payment" => "weixin", + "merchant_id" => env("WEIXINPAY_MCHID") ]); $recharge = $recharge->getSerial(); diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 1056a29..c8ba9cb 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -1351,6 +1351,9 @@ class OrdersController extends CommonController case "weixin": $res = (new WxMicroPay())->pay($recharge); if ($res === true) { + $recharge->update([ + "merchant_id" => env("WEIXINPAY_MCHID") + ]); return response()->json(true); } else { return response()->json([ diff --git a/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php b/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php new file mode 100644 index 0000000..ab473e1 --- /dev/null +++ b/database/migrations/2022_03_01_073747_add_merchant_id_to_recharge.php @@ -0,0 +1,32 @@ +string("merchant_id")->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('recharge', function (Blueprint $table) { + // + }); + } +} diff --git a/public/.DS_Store b/public/.DS_Store index 5200aaf4323acc38b88c225fd7d7d4a293ebe924..5e1a8f6bca78ce8b7cd625e6eb44aba102156ac0 100644 GIT binary patch delta 315 zcmZn(XbG6$&nUJrU^hRb*k&GqO^nQCMV6Zn3Tm;k-QD{5tDy1Zk76>a5auCA1_lOJ zh75*Eh609EhN6ND!{Frn+ybB|gW%Z>la0i;)w2Voau`Y((it)t@)(M9(h*9SIT?=t zRidfL&3AE0%E?ax%5aFc%y#5V1Y3ilDuoDD1sS|Z)_DqSej+}ZeKWhl6E?CuBZKA$ H6wd$v9jjO| delta 151 zcmZn(XbG6$&nUDpU^hRb&}JTiO^nPDH+(lA6x3p6OF0p?uT_8YM==>y2=kC50|Nsq zLk2@7Ljgl7Ls3D7VQ_MOZUIn~L2&(q$wuPaHdjdWvrlZ8u$f)q2^(1^OsSW-&k(>aeaH`GCcX3I|$xi~R;RyFH6cD?A z*b%?_6sUSr;xrUwARNOd_F;0O__B=+9_)h5KwE%7fg4D;g1oq~@H_KlewjcKCWyy1 cK+=p13_(atbAo@eUjzakk-K=tzhRRj{) diff --git a/resources/views/admin/project/create.blade.php b/resources/views/admin/project/create.blade.php index 84f905c..893d80b 100755 --- a/resources/views/admin/project/create.blade.php +++ b/resources/views/admin/project/create.blade.php @@ -17,7 +17,7 @@ -
+
@endif @endforeach