From c3960cd3e577e0eb90de80f9019593ddd46230f5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 25 Apr 2021 16:39:25 +0800 Subject: [PATCH] fix cashout --- .../migration/V202104130001__for_cash_out.sql | 2 ++ .../支付宝自助积分接入文档.docx | Bin 237057 -> 237107 bytes .../controller/WxCashOutController.java | 11 ++++++++++- .../com/iformall/domain/po/WxMerchant.java | 3 +++ .../resources/mapper/WxMerchantMapper.xml | 7 ++++--- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql index 73a883eb8..59b64b39a 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql @@ -46,5 +46,7 @@ ADD COLUMN `merchant_cert_path` VARCHAR(100) COMMENT '商户自己的证书' AFT UPDATE wx_pay_account SET merchant_cert_path = CONCAT('/opt/iformall/service/merchant_wx_cert/',tenant_id,"/apiclient_cert.p12"); +ALTER TABLE wx_merchant ADD COLUMN `cash_out_last_time` datetime COMMENT '最近提交提现时间' ; + diff --git a/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx b/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx index 27acd6d4c582fc2727c6897d0343863a8c305072..7011391fb7fa747098e6686004de68929fd7d9eb 100644 GIT binary patch delta 8135 zcmYM3WlS8v7KK-ES=_xW4#lld+}+)aQ;HRe6c%@vF0vGNcXun$qQzZ`Ytcf1*Z2Os zKa-QmBsVj;nVfsRpiW3bCnS*{Js5ZcF#`esZb@Qfupb}#xo|_z(;gt2XHnS~+R?Fi z*uQj|6hhr)zBDLSGB(>#Ai0>Al+kwGHuJJ2h@U3@Dsm3yC1p!B2~~_806_J_66ap6 z?q}H(qs(&~*2*awgzDFBC5wqAR%w#Q5?Fv~=uTf%X3u(rve)F<2;4dy3KsEjc$j5k zl+_bb!serMj1nP5r0RGkl;1$n3LBsSF}DD(7i8EG4Y+;RERfU(Ctf$QstO~5zn*?DEsD37Nt%;f?dLg!10H$dg{k zqua%I@hmtYM=f3v|MB+@QbI|=4xHDAOHaG->$XGyOf_m zDp(4!PChgZ;3>-h4VE}z_gj`5jJKhfp$0V9?xMX<6e7?PMperUe}yZua<%^>hm2{b zh`Gyes<_lTx<8N>2U_7xx6ji4o#`3PXIN|0!BA0Q8Uu^m?$Hljo4bM!ajX>7j7&P2 zR2Y?^G~I7R^zQv42#G&PTY&_jYou{p4fBmBvT6AU5qhkht?UNA)>W6GN^YPo zJNvi<5*pA51~_0tLU3VD9QKyaD)#guN}7vl?r%N4J}n`fgS&hkqRk8zJT-8PC?;T$ zH6?Z=&J_W4S%%yahW&=duWiXokxP8A{H@Gg51X-3{A>ITLTv}*;2*=kBadpDTf;M^hVh&1g5?_oF@rwhI6TM>>LV1PBuKm}5^JBTgEkd$smGn^m?_dFDKco5jVDkoQ&UN0cR63jpmH6uiJAp$f4Ns&Z56ecD0fZ;B}+q~GT<^CB!; z!A0%Ar0B?*ze<_0$bcDIHP`9pfzb?6vOEUpNteA`!cxMp{!p1)dIX;9$5({RC~3s$ z*oBs<`Kz=9bQDPnI?DfCGiL%GYn^AgwnrZ`338lbu5KJs{* zTK5@;0WJ!m3kQXyRlV0i#&Qx7J7}*Tv;oZ*%95l}Cb&omgTj(~%DI93O1;*L6?GUsak58sB~#9U(r1 zLNH)u^ga3E&%XR|pE`b78R-sWO=IGB_WXTbgkaUE?JZ6Ec{_?WX1e^I1uIl?_OOS~ zyNG&i*4S+b!Ve=X`S}dTy|_CyhF3m!P;Ib(xx4n&gKz}AVL#rY>BM+T`OJR4lr#+C zyBC~-z<$rw8m9aIC1s4w;X1x|Bj1@N6^~Qy6Im5fM-1=sF{;0FBoBelJbeapoHer_ zp&sn0=M3DNYJd45R=uGbve3|wH;onnxqbB2J)6e^AyJpK-`(U#d|K}7FIiY?c>$-; zNzpefl8d8Ydmyf&V&5ma$hw+1*Qnhu=@I_Vw5++Z#W%Q!2wlyLiCl~xU zo7+swha=tO5@o6f-cFRAP3FJ+p~)$JxHNr)XvBg;Gd}=(vw|GX5RP=Kz{#C>#EG8LMbb44ypMoHGP2B$NsDcqQtj zp@kn?>`#e^4W<1U0}|Et`KmKHtGn*#kp@*Fh9LX6j8+z_r))2I@H1xp8S*to@_90OXfe& zODANP{m=^@AOgxER#S1&D5oCw^qO1;l~BIZ^pOkpUF5&5TQ>U%WbLV;)KL8{K`{EZ z{#Wnnc)vj4<;tZ3nL;@=sI5{#ap`OP_XRW{?0jB_m!Wayk0XD8X&jT=5&|-Wr{I;IbeMlrwZC0p_|(p@MP*`;U|r?UZ|#xl zb`<``YLk0fZs)a+FA7)-dp&$^kxfAA_U+9`6v>O|W;nf5F63@ufTW{3|I*^&KJUU@ zfF|C;)tx|5wz0IX_UpP&WzAdufJK2~vm+drLuKCK0*7}uc6^p`FcpdyhKfUj8Akxc zK1xPmE?%nuz=}K8yzVv8iyeccRwe)MK6MwDEsRIwO5Qf2<_TR9bEKB;AkO;Pmv5Eq zq&0dsYk#DJSV#&I@ZwWy+~1K0pnr4?BN6_s#KSx2$x6vPGaB@*8GU?kmXHRnWg55~ zt)rk%-&v|euP6%L7Vd>%39h(eq@Y_O%3>iFM)M137> zNv<4md%&hLNE~YAIS&1BEw-x~GiygJwtpYmQ-wyHv0pxv-+n)+sfKhF)iHTfwm;m% z#9Q;hZUM$iz44Z?U=(9X;@lP0Quwl-1hs64XIhJgbvy(K1xt?sSXNb=3AdJM+D!F~ z*pU(qpl(C;Gxin1N%m{~CS|xE?%XzjL0OPnvO_1bO3Jb6nn)rMebab@;_EjhA>Y4} z;QQmcX=J#7W1!CcVTR)Aa4=$RsB;KRrV~W#xUCy>gTEblFg=!}zA%!K$3OuSS*`Cc zL-35X6;z8qHTCQ-r*&84bcj8$vN+_>cIhH#5s)!jB$rdmZQ9r(3`ATfj;}B?DW6r4 z*P@R}52X6%XzX!PI!w_fPvni-2mcHSrlpXDO}8d9!%L9vLqg@#W;BnB6(Uya4RWM= zZjARG?IIN1e@08D%32a5Tf;R5hzs#8kSSldRhi!3BGkE!v8ew-hTH%jz$eF*|+eoejn--N|R?+Z>sKJ!e~Lu8lop1gnBlVi+l5 zMQ=vxCN$q!>8h1bQ%3k1>Vk0un5ogJ5enIxV|2j~)d8KRE!J&oH~VvX#4DqHRn(a} z#aawSP;rO>CMn9;P>}L`IsR~^>`hh6!(WQptlO7v>CddWzBI3K{0Gd7y2qq<2mY9R z3*D4#F>w1}lc5%Q%AZxIyS1Dy6h{n(_0_n;SK0vRRtRc%kRj83d2Er$!wGBai`dD; zq4D{32GhfY0Aitqga@(D8zOpB8=S$Sms zRt>Z-M84!|Hr14;Ro)4G<50I_;Vdyi$b~!d2G zPrT(rNQtJsqr+Lqw_7U1oE@gG&#ZktrXf@|Fu%M>7Y#8Sw}EYMQsh61ecBkJI#~GH zCCQ6!ip6{N0nA_1`gvKIlz*3C0&$~c_9y>($iG~A`FcD;am$2<=w@C)Q2tO9O7exY z;4Wom47o&cpraIX!#KO1RLo(<{CWaq_E0i;S$f(Wtnmt|n%Z)viTHXcPGK|pZV&m*#w;sUtqBBvVAiB} zwkPVao-b?08!(=x9uJx@q#xGf{j+*MYX?m4u`&PL`s~+&-)?*rNvwtCj5ppUT`-J) z^YZQT9Ls2@I&g443|*7A(8vY2lRQAIYS@)d?p8`HJESRt$Gv7svUOwW$M#wwB;6VG z$s`vo6GWr_uiA3D?om}Kf@5rBiDnMzmfWB1{Jj{ij{UxMv8(*8o@e|X!fZ<1l7?5J zSIaK&@`KK~j#RR7{k;LKU9L=_s_TtC>xyy3B)NGekvfO8N{3<*CMO zfHJ=?p3UN(sQLUBOGTdoCMqSAmTT;W%tUU)YBE129uz5wCL@Olxi9@lH5W)XmmAeH zZ@gImuY7qR3Lw0#4w#7ZJ9uOC`T*rI(GaNK+~=5v z;EtsrH#S&~2#D$$SWtYS%b$mL^ouTNi!pKR=d3fz<)KmDV3aO(Mas%=^WDNa~dAC-+D^75~gvmK}K^z9TG>MuQW;_W1A`+0LQhLkdlUOE;Y} z8bUPaI-8E$-u)L1L5ha=O!^YD5LDmRtooR@1@R7FP7-D~IC>gVDVwZ;S-!-VC9g zCPgNzIFGo3m=mSG^=P(f? zvZ^$l-fL+==O7YceT06~F;(JlytwCbPPIhgA`QmFch2gih zr##}87^(=T{_bWCWz5(8tn#gWlJRrC-G zwzqev&H`5$cuE^eo_GECIvhwSM}*U41;e-IU2{1$Bc6@-LKZ6u;CXaMT$8t~t|Ure zi&xU|y!uct8Cgkt%{YlX+@B%1zDX7AgfJT&999*;2DXw?@bsnz+3(CmCA9UxNs?Pe zQhV6>8Gcc<<$=q%sg{j5XF5jNGOPU9+n)83H)cgy)1>-ZL9g?4djh{V7-2{^g$Rkh+oywls z%*9jyT#&nNMAQaF0UT0`Fug-PJ1R?;ZPb)nr%=-=zXORQqqqw6bvy*-8MvBOkuKzg z2Cw+1DYwF}NX1rU;>G0OFV}F`?5P|#>(Esw(N(Z#MYOXj@#8iqP8UxV;0|nAyl@;#YbA!lq_+R)fC@gAfO&uWE?&z(C&zKl?Qbe}oJ zY9)1Jm)w>JENEc)du%g9SufV`3Ov{Vq0yW~%mb3rJrc8p5|Gh151Dd(c!tW~i^wL% zrE6|~BQap(rZ_^|3Bx*J=|oQWW5;ktIB`*r*0sL80CXt*iZox8xZ@4wdnbpwlcO)q z8h)fA50JVF)q-{g-1_PXvbjD`0eSpY?2&73S2p=v$#QA66*`53&O47PJUN&rdcF{Y z9KUy~jrD4>xV3hvXl@)P!X{yxR)Q6OX9v}{Bhu~tk6`&{jKPsNt8{2VmfC+>=h8?6 zl+5VLEL@ap*8DH74UW*d_w%N{#YAG6-PR%_eI z_YuNNG~KBREe5F*@+l^aub#lVF9bTelh(r^Ofg=Uu_rE^*MH&&-0k@YnAI^?92wIc zreDS$C7*z1t9$__uh1Ms!}X?Hu9?J>qz~w8d-#(4gD?aVuQa-g0Gc=d^C~PCfH0ch za^mPoD=HO|+^rAkI-~fqwrlv&9=|-Y%RV+0o#rvM z7y5>Ji%z4k?(<$ykdxF+#nT)NHVEBS=i&Txy`rF3m!}fL!-3xHPGxgu zpI5>%$*pq(9MXu+laJ5S`H-4MK`3g|Cta_pdMEhW`$PLU6A6#Yr#Bsa=OJEU<+U|L zr*>f<>F1=|2fYngf+l_Z10++7#kCC~JQOJHpD%WB8etI*7fd~1X*_YNCVIzOde#*t z1&|b~wB%ux4KMliz{E37%XL}Y^*We0vF+ZujG0lfkL&q%0*igEBgN-Wcx*w{mUaLl`LtUZ|>G$j@O*;^`WDY4R8DytW} zA9Cf23;V5=mybdz!2p&WGG3To=ipuWA*M*MUfm8vv9AzS`dIOL3mcp;7)G^n{B3Xf z@2Tfr8@T}+H0zL8{RZB0(%ZKJ6=8SB@i8GFXckJiDXpTCI>*yPK>w0hbY1oai%Llcb?3{CgVq=0rJ%E?ExmR~F?T^jc{TclG z*zR-4oyKo(nD2*|L-mI}Onb@l$qhd0V3+_;iA$HV%WI9*;#U9Q)>EFn54Lx=3jX-p z7tL;j_g4{X=f82U`Pv9~R%ufR`3f`tjejKG80D_id?72jZ_KUMXdM`7bkO;icg6-* z#}J<&b~Bg4mUKnve6+JM3A4OG7id)TT)(cG=BHn(Fl8Q=ozYO=AY$4Ggcq#NC}Eg& zkgG@w6aWRh>xxcXTnBWZb@>AR1t>ooBpMXA*3q>!C~YylU`G{e&R7ukt*{rVfI3&`cj~g19q!?72I6wWFO_9LM zU*-~LF+s?lj5erPFG@KKI z%=>F>WW$oOZkJjHZLmtE8G0(b8|p|8}t- zXUa~gEER?n2$r?v$c>A3ztTTgXV5*8(!;UK)I~gS>MA%hwyRK0=~};=c8K|F3lHq>` zJ_1+wwmjlAPh;%t@}W^lt1+eO&DjaWX3r6u@7;jVp#?VqPj9;3mWV(4*;+1n3x&u_ zwYd)Wi}>$h8=CVaKYhP3^(S|%&1dQz%2@g|JP3_-77fVpY0l0z3GIp<{!Xv3IN7<# zP5q2@N9^qgdzZ|Y{4c!&#%c0xelGpRyPm1guDagJ?#Xk4h8}OcaJxD7cUK9(Wd#2% z`wZTF{%^n|rEk{Bd;plcVVVxeAlrUJ6i;@zYe5jSM%DWrUE$J=1$i&KSV2k>4Hk;p zvY>#ElaZWyZ=SorCzdEDY@?B=^`wX=NEm+K6-on(R40rLKFYz8hz9&W>Q*8m`_ul>aO;P($UflaPVT9G^sBm1>leaJB*9^c9Lvva36e^;;o+cM zdg@h*XmT@Y4Dhui?FM|2tsEH0iT*b+UBbWb$0~-&2C{gmcMO2-Jf>5wx<_&pRvCHp z)XT3?6Y?R!^%ZlHG)w@S{Y?U4v}IkoN@848CznyA_k}5qqehU2K3DJnS{nu8I4X0V z(nQ_w>1g@U&rA=CwI+Xz{Eq(hP6_JpaZZ-^=>$cc&HpSuZCO^SB*`Yh`&TPD>CoRN z@1D-;pRJ3^Yn{LnXjzwGLd&ploIPlq*6Zx^bsO`le8ru7vS9|y^fIW!TrKR1>Ga)q$l zC`tmC6GY!?FxMHeGV#{d#IUtl_^d_#wY>=sR*S?ol;bcu?%%!aPZ@!Y;Is8bU9P?& zOlg)ub&njH2M{A}$r_l4>HKraYYpsg_4qLcfjaSXXiwwPUbrQL2u$Gn?Uu8~3E(xruY5cW`z zpki`3WMu_>;L2RKB`vG%5uRRyVW(Pb;TWG=)VnEjiG&hJsMjhtu!>z)-l_$7n3{BA zR}nuLk#6Y4s!NU~B<_EyBtZ=vEW8)mL*cT*Km0nKLL)`l&?1zF9%A$qVe|xSF?s@V zr8cNZfjUwcq=;K`lfVne;Ndhdye?kzyNqoCYTuhPvK(z1FHZafcD?I z3O|K|g@BWA#&obC2$TXhPX~*FxKiNR>0l+$olwe_5E1-29n1>sg0p0Rt^QBO;i(y5 zex(2MTKJC)@F<8m6`r0676fX-r!v8u6#q~Cf&T-!|1XIHC(i^v%um&ZFoi& zSP1l43O<_!mIUi10O2GEumt$g8U#1`uV|hJ!L$Df;39k-0cQ9=vV>!0gX4f5@XYLg S7ubc*W`mhgU~uriLjM6MZ$Ci* delta 8127 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 diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index e0a9e681b..4dd708161 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -7,12 +7,15 @@ import com.iformall.domain.po.*; import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; +import com.iformall.utils.DateUtils; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -100,7 +103,13 @@ public class WxCashOutController extends BaseController { WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); Map resultMap = new HashMap(); - resultMap.put("cashOutCount", merchant.getCashOutCount()); + //当日提现次数 + Date currDateBegin = DateUtils.stringToDate(DateUtils.format(new Date())+" 00:00:00", DateUtils.DATE_TIME_PATTERN); + if (null == merchant.getCashOutLastTime() || merchant.getCashOutLastTime().before(currDateBegin)) { + resultMap.put("cashOutCount", 0); + }else { + resultMap.put("cashOutCount", merchant.getCashOutCount()); + } resultMap.put("cashOutNumber", merchant.getCashOutNumber()); resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutLimit", mall.getCashOutLimit()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 4c7d2fb93..4467451aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -268,6 +268,9 @@ public class WxMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "当日提现次数", name = "cashOutCount") private Integer cashOutCount; + + @io.swagger.annotations.ApiModelProperty(value = "最近提交提现时间", name = "cashOutLastTime") + private Date cashOutLastTime; @TableField(exist = false) @SortColumn(column = "couponSale") diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 48949a676..27c224dbb 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -37,18 +37,19 @@ + `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, - `introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count + `introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count,cash_out_last_time m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, m.`business_id`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`, - m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,cash_out_number,cash_out_count + m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,m.cash_out_number,m.cash_out_count,m.cash_out_last_time @@ -616,7 +617,7 @@ - update wx_merchant set cash_out_number = cash_out_number-#{cashOutNumber}, cash_out_count = cash_out_count+1 where id = #{id} + update wx_merchant set cash_out_number = cash_out_number-#{cashOutNumber}, cash_out_count = cash_out_count+1,cash_out_last_time = now() where id = #{id}