From e88f113183aa3c1fcc6e379206bdbee7953a09e0 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 16:13:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FinanceRechargerServiceImpl.java | 2 + .../config/wechat/WxPayConfiguration.java | 8 +- .../src/main/resources/static/tabbar_home.png | Bin 1706 -> 1654 bytes .../main/resources/static/tabbar_home_sel.png | Bin 1784 -> 1725 bytes .../src/main/resources/static/tabbar_me.png | Bin 2948 -> 1997 bytes .../main/resources/static/tabbar_me_sel.png | Bin 3112 -> 2135 bytes .../src/main/resources/static/tabbar_text.png | Bin 831 -> 1574 bytes .../main/resources/static/tabbar_text_sel.png | Bin 839 -> 1623 bytes sql/{install_v14.2.sql => install_v1.5.0.sql} | 168 ++++++++++++++++-- 9 files changed, 155 insertions(+), 23 deletions(-) rename sql/{install_v14.2.sql => install_v1.5.0.sql} (88%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index 4b751bc2..ba1d067f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -230,6 +230,8 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { RefundRecord refundRecord = refundRecordMapper.selectById(recordId); RechargeOrder rechargeOrder = rechargeOrderMapper.selectById(refundRecord.getOrderId()); + Assert.notNull(rechargeOrder, "充值订单丢失!"); + log = refundLogMapper.selectOne(new QueryWrapper() .eq("record_id", recordId) .last("limit 1")); diff --git a/server/like-common/src/main/java/com/mdd/common/config/wechat/WxPayConfiguration.java b/server/like-common/src/main/java/com/mdd/common/config/wechat/WxPayConfiguration.java index 1352e8a9..21fb0519 100644 --- a/server/like-common/src/main/java/com/mdd/common/config/wechat/WxPayConfiguration.java +++ b/server/like-common/src/main/java/com/mdd/common/config/wechat/WxPayConfiguration.java @@ -53,8 +53,8 @@ public class WxPayConfiguration { String paramJson = StringUtils.isNull(config.getParams()) ? "{}" : config.getParams().toString(); Map params = MapUtils.jsonToMap(paramJson); String appId = StringUtils.isNull(systemConfig) ? "" : systemConfig.getValue(); - String mchId = params.get("mch_id"); - String paySignKey = params.get("pay_sign_key"); + String mchId = params.getOrDefault("mch_id", ""); + String paySignKey = params.getOrDefault("pay_sign_key", ""); byte[] privateKey = params.getOrDefault("private_key", "").getBytes(); byte[] privateCert = params.getOrDefault("private_cert", "").getBytes(); @@ -92,8 +92,8 @@ public class WxPayConfiguration { String paramJson = StringUtils.isNull(config.getParams()) ? "{}" : config.getParams().toString(); Map params = MapUtils.jsonToMap(paramJson); String appId = StringUtils.isNull(systemConfig) ? "" : systemConfig.getValue(); - String mchId = params.get("mch_id"); - String paySignKey = params.get("pay_sign_key"); + String mchId = params.getOrDefault("mch_id", ""); + String paySignKey = params.getOrDefault("pay_sign_key", ""); byte[] privateKey = params.getOrDefault("private_key", "").getBytes(); byte[] privateCert = params.getOrDefault("private_cert", "").getBytes(); diff --git a/server/like-common/src/main/resources/static/tabbar_home.png b/server/like-common/src/main/resources/static/tabbar_home.png index 5c58118bc5794ec3c9fe5a2ec4797f223d85e295..3bc768b18f3340217a10300b619870ed81088592 100644 GIT binary patch literal 1654 zcmb7Fdpy$#0QZ=g)hvZV_lcOY!#w5@i(fO%Vs6KfO1d-eMyA&#kGUp~l1DRbXU#=e zWsA|rtK1=%nU_3EnHR4joE*~DcCC09cOY)8NyB40c?S7Ar8BpCL(Ss7{Vf-+jM^|-yo zUt1QR`i$N(Qy=*4`+3l2G`AsBrjJ-{Ps#S^3jMapT;J*K;>pI+d!0$Yq6M)tlNFi# zy=4^{iz^!(+3jQx2K)=C8nCDx6*}#KpoLen06nyWj@CVW%bS39u(@#70sF54WLDYM z*7gMBaP?wxXYcsNr#N`0c@O;!?>N;E9!(W@If<913*74Ueu zy1H6mL5G1qtgmMv@_)9;`_<75fWzU-Jv}{99H-x8V9m3ssi`6|lGtIytN{F~xS>eq zXn%jem91arB~NINkBymSUb?hm#e85@ccvz>`)OF-OSY0IlmXFif{lPF(;`718}dLR zkyLnyZq?bK=D&gs~VI3L?>{nxB$DJ2aMk1{<_E*IVBm)CnEBm4;#sVOd$*$^x z!FLB|QFbD48X?MzKy@9#@ zISxSda4)XvRtd1g%FFHZjq}gh21GA7+YtYt1Q}=w3aUctECZ-Cos|hY6u^6KZ((aP z117i08BiA`qU%If>*yye1DWC5K)G1dTk_ouaN+!UFG6Ni5H5RTx)@e$B9*TA7t}cZ zj_3-=ifNKZThQ*ZVp=HW9@5>-?M{s7l*WJtiy$2~Hb0k&CK`Dolcy=g1e!RVj zhi-neT!*mK7FXOPGydP?Ed4mlL3S1CA(O7n&oeaCVR=s8GMC4hV~^xLPWqwcP*J|oIoIwsI#?)YLJf8vcJa@738WJYQY=mnxK1=t;&g@{85aLU zuT9?Ip3dzC(oTu}Vde|T9TpmDisa$(c)3_Cp7b&9W3>{ltXCG2g2O-h z)KI#Y_m+-d>+Ii9ml)1%LBCiepO4CkRIt%^79`d(h`|%bgEnsJ{W+FuwvTn8a(;g6 z2gk_nPrrQA7?~hq?uf9q3RA0>3F(Qm1$2b>)$usjmeaI|bCVlmZ+W>t{=5@z zv?_Hy@M^l@S#+u5m}VjEK%ad7qf#vh>WdTBr1Bc+aIJ#-r19W@&jGj`BMQE}^aW%1 zw*R#h?8~OOE%NxG`H-RXNxr0$r0MH-A8LnfGTDXX&8TtZ1+6zqU)%DXcMStmd-$B^ z#O$o3`xOnftJ1PEjQPm3V54Vk?q)6P{rEH&NQiETXDf9)Vtl$e%#zz1B2VsWom~!% z4|Aw+X_@=PxpUO)`qPUKkD|TB0m29_F?B|GSy8{eCs=cI{>koSuOKAzuuf9=K*m?a z`yReN{_w9Ts(kqR`ycOcBs1Q$*Pq>Fm)xne2v2;P3c9VfBSwmV7@FSbNChPbOwQ_Q zF`h;#chg4`!4cU&<)5!S@jMm#5X+nthfxg}{MY$sxI4<_VGj>j+B^~sf^Q(M9(yYL EZ;a&+1poj5 literal 1706 zcmV;b237fqP)7WD-f5)g$v`tr0M&y za7Ea$kQf&(+_>rcktQa_g)3Hsgo21fjZuLFq^KZ;l499@Nnid?b8m9Fy?5r!%s1TW zWo~lQuf1o^o%zj~GiT0Bze0t-tP&_#)$Wy7c)*s8zytPxEfcV;-dnH-Y?**%_1=O# z;EIaAzP=aM*Vn%Qi}wN^XR52KPYw+YJ+{opSiSQWJTNe@Yi(`q5?WdxZ7qP`SzTRi znVg)wZ%o0W0;d6|!3}v3DgUbSvd<*4QaCqO=|QE6Wbnv%zZ>1M<*sG=8R^iG8J|L zZ~*uFcqkSN%kEWGRTY<)m)Fq|mjHRU0P;h0M)Uai_}^vXq^%}%zyuetF5-Sw(29Qn zwQYEK_#cviE2)Q-Uc|>&1Z5uJSrO62?IfB0{{AM!(Ys{iR#sN7OixdjWO8ZGGX>ny z(Xq3(ww6FO2^ugDn8mm?c6D{_#cGbqiXc6JB_A6b8~Zb^AFIP}@VAc`;NC(f{mPI_ z6v+%QEcZoNEe-WX!BD>kxUKM~8@@Mwb$55~(RCL9{4Ml-Cb{-${cTHi#g@H($Z;I|Uu}5YO78mYiF_T(|(zn&v+fhC4+bl&?sIjAxHvjYmSr zxddzjZU`H|lpyC0uuZrTchLxULE)azk`WoSVuJiEH$FIs7G}|)eS*ni0Yms`(u}V% z!Swd_zJ`hOg2X2;LWU;JLo(fvJ3KNn@{3F^vq|o0SZTfm@hGgjDA;Jc%2$yu{5iqq&2{H@t;NajkED$b3d1|zf z(4%<;tOQvKIDktD>^Hf?B9O~7U^ZkSU<0^$b`eoKy8++bB06cG3b?(!{rS4OItpJ> zEf+Iy34wZDl4T=`*z3a4CC;c5O>&|(2D-17N~Pm7Gc*4sy(<+k_O^ZpyaR#?F5uY- z++XJzFxvJp?k{nR&RzV5y~Kk`fDs#Z!U`t4YuggM%&q#M79x z>4|nePTS+d-{~-7H#SD6lmL@(5@doKCd*;vhw}hf;vzPVP9-JnWpG(>a1?SBE){;3 z08@LTkU4N!fJq2LXb=id2mjGSf%eArtN{*K><5b^?0lUS2$tqyuISir)dN&==MqSThxYL5^iA&@nGCg?Wss#h^br9T?jKZY-IYP%% zDu6RhxO>3z@n_^BJYWy_2?E|l$PI!e;e9X*lfIA#tj~^B(gS8;(iif8_1UpXdcZ79 z`a&MCK08)P5155XU&sU2XU8h(0kbga3wgl$>{ul|U=}8Qq1*r#CET;zwioP(pT;i4 zrz-j2OcU;|0;at)?DW1A2Z`kQANYENr7Z*4)qJq3bK&eNtLhBpbD3~gh2a6K5>u4- zfE9tMihIDS#1!S71uTjp(8jNDJO2gB)EB`SyHAq(CDSlX5=AK5k(=T!pNnvlm}0Fm z1+4JjIf~74M;s?fn@qlF)F=)n3~&?k@KZ0lgQR>lf%V?OS+;r;jpYFR0RVqzQVCbf z0`U6)e8!}H#(?SNh$fm*nJ#>6pab6~70S9SjAadNm_sgO)a2{D!giDeaMn;X*aNmqz_R-P0lP>(qzv7}Y5)KL07*qoM6N<$g1%Q3 A`v3p{ diff --git a/server/like-common/src/main/resources/static/tabbar_home_sel.png b/server/like-common/src/main/resources/static/tabbar_home_sel.png index c0538a7a9de2c3291b6352a80423f9949ffd639a..4ea9fa48229b618374435f99ce9aa09bf5593f1f 100644 GIT binary patch literal 1725 zcmV;u215CXP)@rhJ5Rp;~n zyJyaPoVnM4{$!9=fo7&aX5CQ>RiK$EkXd)sLKSFc3S`zDwNM3` znF5)0CtC}B`?7t1Z48aEfsLoku(N-`3fw(<0AJqenO`$wS#&2mpzmI?pBMve?AZD| zU>0C-bOfC{pP5lkV6y?*XxcNUPQfkg&{hbbv4!?GH_Ww=Jd)F90rZ`ZY-4q`fH~JH zXM(WMfAA1mqnr)Co7Y=pd^7hfBE7I@D*BRqY}L=>QoxKGVviBl z&4LdPVJ9`eniSB&Ujpn`{E+`!JVL#POPigP{Av+7Z$kfpYy z;(?-7uH!8BR%QOuQ+kBj!y&jMeFzo}6k%?aFe~+!o=gE}z$0s52d(v!u#F@G|~EyK!zavyo|)AFp5DH@_upyVMUp4v%HR`r%)B|xPd zd5HyE;g%seP;p0ILaA024M7T2?2(sHsBXPVy=6!OwC)fQsl0sK<(4+M58U!iKQCQ0 zQ1zD-7_ban+FJYnGZ6sE5pW#Hu)~Y~}P^<_J^0c_AI)>xezT^G1$dq69q`2q zKLEc8Q{&Il14aKCH4m6%r$7b7d1pL9~BlcHxH zD)pfga_Eq&L#__F)C%Y0^WEYR8mt1`6Es0fTGpzev2Fw^yU z@)JoD9l;n4w0O()DtwoSV4|BDdvxYH7Y($u(k2$PFIp|(jdOQ$4j;n0?=_BD-5~+0 zP~)GLn5!I5Ce1S*(hL++&X#j99P;%h-yiqA4D*g4N-@y=oV zd^J^|cqKq5+yB-@yRl}VVNSql7{dmBxb5`v*xmG=VifVn{m-MvaQoYv<}S4!q(d%s zc|SH4~jffr`cx-Z%vsu9@f@3RE;|Xt^0u9$pbdJ9PZt@DE TAbcIx00000NkvXXu0mjf{}(a6 literal 1784 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 literal 2948 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 N002ovPDHLkV1j_>`ZfRn literal 3112 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 literal 831 zcmV-F1Hk-=P)KEMT$# zIlMC11Mqk}9%NZ|zuWDGcs(PJ$#r-be8M2d>ukAPzFUJeGkA~tW(DeEJCH9eYjRK3pxo=he?>lbykJ(LRop9`3n0gJ_=GD(%ek@!sDH9jKdSu}F| zF1q6!G{8Vkiv~jj2JS2B&(MVcc@Vgg%7J_(U=p-|Nw9~o0v0e?fE->K+%@3QXf*8g zdWC1*rWV`n_I0&do;gi43-AT@xp@4q~m0`pz zR|;6bzdnR25mrr#Y!`4Opw(T#mQZB7fFl8|?gF-iBHINV321fi6fp5ouF}OM0b40p zuU){wNf}%tTVigN1uWoS0+jV&%UBsqUhJ_BfVcM6T}5~Uw8kS~ODM8kz>$DfcL7^M zk?rn)F`zrl={9m+|K0rwPwYPy{ZeYU;){Rf&zbccHrZwROOg>Zs<^rz) zT)C&cSt3y2wZ(YJK}xd4IDkWe*CzP|$VoQI4{-xBULF8F#B1S3#oSM#tLR~4>O6Q@ z|A8Qk+AI;Srq;s22$+1(1T0{(06DxeSiocfa(HF1fXM>n@Lz)>>xN@?9d`f#002ov JPDHLkV1mr9L$wo>=d;%Xbg7C+ufDvzd%U8o}IM@U2M; zsz!CNrj6KE?u!i1Lu!TMtbYNBWk7R5Gxi@zv=qrJdNKI?O6+kX`&-PhLm~SPo32c5 zz7S$EVHHf^X!{FrELRh1FjlJ%0I{}wwj zR%H%R+m7~44g>kTKE3*2ripnH8@Ee-4FI{Hd>96sd_rq@rD^gd{&2j)-3>yl2wu=L*#@*zI#UQ%t03z5mxzWYH995 zC4Bo$=?7GThS-xWYp1kcRZ7XX(aj}bhcBfeeZj+INV+IDB=eKYXI14wCchwSx~ipR zB}zBzwQ>c+gRr2Tu@@hA%B!INq11v}srfNsOPXP?{-BlA%X4|^hM&*Lx1x<^c#$JK zGc0qrN5*)8m_?P94zLk1ezntt>_UlK6fO4)4k2TXnC9#T?J%}e#nZYeoR=f5FQV_W z#_GHdASFja!p=`n62T0oK+k~KnKouq;CPak2+b<(cHonof*7T9BTWN6?94nse|u5y zgmVM&l3irvSXc)(=9;{sK^|+|_o!sSvabU&D{bkAE`DGs*zudJdom~5q48|eL#Z6G zR>N=g=C0(=4oOr?b}gL*%+mQdmp zh6SndJxXqq`-4%LBQekwMHe()h-=t`falWr1g+@YGQ}-LP`t=l_yn+Q#ej0`<<^%*H4r0x-?3@-{Bjcq`k5eZn+%l=g#lf+_~t(PhJ14A`_5o@_u;((B4o% z*9Tdqzdm;YcMwkAt1AIBooLWTz_FLWO8q=AhPouCd}~4!9qi5!URy7DYF!u+-rg`t z6Ly0TFSpi=qnf4XYF){)tbI^e`2O}-?Yrz5apmaYbLoLkw%D=0Dub){ekFy?Q#JM; zcr9*GYxn3e6X(oZS6ehnnvMQXx=W9@;^>P-DwIv!s7X|K)S(5Zh_@dW;NX50bxE$_ z<~D481U}P-<@-H8RcIUi{`w$g1-dxr5*P65PQdftsO=&BF;}$ z7|({ZsY)Trv96gZt?CNd;@DPUO2OH%ar9XK>ed*F9q_evHF+FB=2qsG45uH`RR;4_NdHL!gqp?WUz5SN2J@2{#;jmOKA( zDNwMg+SmIVyw_#Do*uR{*%aW9>MePQ3k`oXT6ZvhgPLj*or$BhPdb?CO2VMRP6OIfS literal 839 zcmV-N1GxN&P)2!({exL#l8lAy~z~CexFoD4W;PA{~ z0)qv>;hDiT0C!))QtstMf^^QwYjB;a4j+R2*1ngQg`E1Y?w3_rGlP3vcP}?qpgA57 z3wdiH+rX=Ep;`NWj)2xRYc^l{GxuTNc_#4Tv4-JiP@r!v6!;B+feCW;U7zngA7*eS zJ`#ANy$bU!npyukiaS|qMP3b61_vDE`s&PebqHWai2ygkZ2^A@2l7%5z$RtG-^s22;clDgMU=hr>7!NGO`D#iYz+up)^jHsf#(Jc z`5D(1QHQhfMcN?f>M|HP(3oP8Hi1Ez`xutM1TH7QCPFRQ2BRl?jGuAkgSQ(M&tq%FAj{as)Yiaf{I|;BtZ5}Yfx&l* zz*yjo0`J|^-fSXtUV&STM{ZJ)EylS?e*6(AvPpg){@=fO_#^#hbDjPE-~{|i_siiS%> RH{<{S002ovPDHLkV1h)yeuw}7 diff --git a/sql/install_v14.2.sql b/sql/install_v1.5.0.sql similarity index 88% rename from sql/install_v14.2.sql rename to sql/install_v1.5.0.sql index e90d5ee5..ac9df5b1 100644 --- a/sql/install_v14.2.sql +++ b/sql/install_v1.5.0.sql @@ -148,6 +148,34 @@ CREATE TABLE `la_decorate_tabbar` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '底部装修表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Table structure for la_dev_pay_config +-- ---------------------------- +DROP TABLE IF EXISTS `la_dev_pay_config`; +CREATE TABLE `la_dev_pay_config` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '模版名称', + `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '渠道图标', + `way` tinyint(1) NOT NULL COMMENT '支付方式: [1=余额支付, 2=微信支付, 3=支付宝支付]', + `sort` int(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序编号', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注信息', + `params` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '配置参数', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付配置表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for la_dev_pay_way +-- ---------------------------- +DROP TABLE IF EXISTS `la_dev_pay_way`; +CREATE TABLE `la_dev_pay_way` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `pay_config_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '支付配置ID', + `scene` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '场景编码: [1=微信小程序, 2=微信公众号, 3=H5, 4=PC, 5=APP]', + `is_default` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '默认支付: [0=否的, 1=是的]', + `status` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '方式状态: [0=关闭, 1=开启]', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '支付方式表' ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for la_dict_data -- ---------------------------- @@ -254,6 +282,28 @@ CREATE TABLE `la_hot_search` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '热门搜索配置表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Table structure for la_log_money +-- ---------------------------- +DROP TABLE IF EXISTS `la_log_money`; +CREATE TABLE `la_log_money` ( + `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', + `sn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '流水号', + `user_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户ID', + `source_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '关联ID', + `source_sn` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '关联单号', + `change_type` smallint(5) UNSIGNED NOT NULL COMMENT '变动类型', + `change_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '变动的数量', + `left_amount` decimal(10, 2) NOT NULL DEFAULT 0.00 COMMENT '变动后数量', + `action` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '变动的动作: 1=增加, 2=减少', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '备注信息', + `extra` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '预留字段', + `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '账户变动日志表' ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for la_notice_record -- ---------------------------- @@ -323,6 +373,69 @@ CREATE TABLE `la_official_reply` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '公众号的回复表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Table structure for la_recharge_order +-- ---------------------------- +DROP TABLE IF EXISTS `la_recharge_order`; +CREATE TABLE `la_recharge_order` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键', + `user_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户ID', + `order_sn` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '订单编号', + `pay_sn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '支付编号', + `pay_way` tinyint(2) UNSIGNED NOT NULL DEFAULT 2 COMMENT '支付方式: [2=微信支付, 3=支付宝支付]', + `pay_status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '支付状态: [0=待支付, 1=已支付]', + `pay_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '支付时间', + `order_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '充值金额', + `order_terminal` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '下单终端', + `transaction_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '交易流水', + `refund_status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款状态: [0=未退款 , 1=已退款]', + `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '充值余额订单表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for la_refund_log +-- ---------------------------- +DROP TABLE IF EXISTS `la_refund_log`; +CREATE TABLE `la_refund_log` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'id', + `sn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '编号', + `record_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款记录ID', + `user_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '关联用户ID', + `handle_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '处理管理ID', + `order_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '总应付的金额', + `refund_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '本次退款金额', + `refund_status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款状态: [0=退款中, 1=退款成功, 2=退款失败]', + `refund_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '退款信息', + `create_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '退款日志表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for la_refund_record +-- ---------------------------- +DROP TABLE IF EXISTS `la_refund_record`; +CREATE TABLE `la_refund_record` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '退款编号', + `user_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '关联用户ID', + `order_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '来源订单ID', + `order_sn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '来源单号SN', + `order_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'order' COMMENT '订单类型: [order=商品订单, recharge=充值订单]', + `order_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '总应付款金额', + `refund_amount` decimal(10, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '本次退款金额', + `transaction_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '平台交易流水号', + `refund_way` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '退款方式: 1=线上退款, 2=线下退款', + `refund_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '退款类型: 1=后台退款', + `refund_status` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '退款状态: 0=退款中, 1=退款成功, 2=退款失败', + `create_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '退款记录表' ROW_FORMAT = Dynamic; + -- ---------------------------- -- Table structure for la_system_auth_admin -- ---------------------------- @@ -488,22 +601,6 @@ CREATE TABLE `la_system_log_operate` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统操作日志表' ROW_FORMAT = Dynamic; --- ---------------------------- --- Table structure for la_test_category --- ---------------------------- -DROP TABLE IF EXISTS `la_test_category`; -CREATE TABLE `la_test_category` ( - `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '名称', - `sort` smallint(5) UNSIGNED NOT NULL DEFAULT 50 COMMENT '排序', - `is_show` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '是否显示: 0=否, 1=是', - `is_delete` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除: 0=否, 1=是', - `create_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '创建时间', - `update_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '更新时间', - `delete_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '删除时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文章分类表' ROW_FORMAT = Dynamic; - -- ---------------------------- -- Table structure for la_user -- ---------------------------- @@ -517,11 +614,13 @@ CREATE TABLE `la_user` ( `username` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户账号', `password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户密码', `mobile` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户电话', + `money` decimal(8, 2) UNSIGNED NOT NULL DEFAULT 0.00 COMMENT '用户钱包', `salt` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '加密盐巴', `sex` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户性别: [1=男, 2=女]', `channel` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '注册渠道: [1=微信小程序, 2=微信公众号, 3=手机H5, 4=电脑PC, 5=苹果APP, 6=安卓APP]', `is_disable` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否禁用: [0=否, 1=是]', `is_delete` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除: [0=否, 1=是]', + `is_new` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否是新注册用户: [1-是, 0-否]', `last_login_ip` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '最后登录IP', `last_login_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '最后登录时间', `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', @@ -582,7 +681,7 @@ INSERT INTO `la_system_config` VALUES (23, 'website', 'pcDesc', '', 1678963763, INSERT INTO `la_system_config` VALUES (24, 'website', 'pcKeywords', '', 1678963763, 1678963817); INSERT INTO `la_system_config` VALUES (25, 'protocol', 'service', '{\"name\":\"服务协议\",\"content\":\"\"}', 1660620367, 1660620367); INSERT INTO `la_system_config` VALUES (26, 'protocol', 'privacy', '{\"name\":\"隐私协议\",\"content\":\"\"}', 1660620367, 1660620367); -INSERT INTO `la_system_config` VALUES (27, 'tabbar', 'style', '{\"defaultColor\":\"#4A5DFF\",\"selectedColor\":\"#EA5455\"}', 1660620367, 1662544900); +INSERT INTO `la_system_config` VALUES (27, 'tabbar', 'style', '{\"defaultColor\":\"#999999\",\"selectedColor\":\"#4173ff\"}', 1660620367, 1662544900); INSERT INTO `la_system_config` VALUES (28, 'search', 'isHotSearch', '0', 1660620367, 1662546997); INSERT INTO `la_system_config` VALUES (30, 'h5_channel', 'status', '1', 1660620367, 1660620367); INSERT INTO `la_system_config` VALUES (31, 'h5_channel', 'close', '0', 1660620367, 1660620367); @@ -610,6 +709,22 @@ INSERT INTO `la_system_config` VALUES (72, 'login', 'openAgreement', '1', 166062 INSERT INTO `la_system_config` VALUES (73, 'login', 'openOtherAuth', '1', 1660620367, 1662538771); INSERT INTO `la_system_config` VALUES (74, 'login', 'autoLoginAuth', '1,2', 1660620367, 1662538771); INSERT INTO `la_system_config` VALUES (80, 'user', 'defaultAvatar', '/api/static/default_avatar.png', 1660620367, 1662535156); +INSERT INTO `la_system_config` VALUES (200, 'recharge', 'openRecharge', '1', 1680160044, 1680166680); +INSERT INTO `la_system_config` VALUES (201, 'recharge', 'minRechargeMoney', '0.01', 1680160044, 1680166680); +COMMIT; + +BEGIN; +INSERT INTO `la_dev_pay_config` VALUES (1, '余额支付', '/api/static/balance_pay.png', 1, 0, '余额支付', '{}'); +INSERT INTO `la_dev_pay_config` VALUES (2, '微信支付', '/api/static/wechat_pay.png', 2, 0, '微信支付', '{}'); +COMMIT; + +BEGIN; +INSERT INTO `la_dev_pay_way` VALUES (1, 1, 1, 0, 1); +INSERT INTO `la_dev_pay_way` VALUES (2, 2, 1, 1, 1); +INSERT INTO `la_dev_pay_way` VALUES (3, 1, 2, 0, 1); +INSERT INTO `la_dev_pay_way` VALUES (4, 2, 2, 1, 1); +INSERT INTO `la_dev_pay_way` VALUES (5, 1, 3, 0, 1); +INSERT INTO `la_dev_pay_way` VALUES (6, 2, 3, 1, 1); COMMIT; BEGIN; @@ -657,7 +772,7 @@ INSERT INTO `la_system_auth_menu` VALUES (111, 110, 'A', '角色详情', '', 0, INSERT INTO `la_system_auth_menu` VALUES (112, 110, 'A', '角色新增', '', 0, 'system:role:add', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); INSERT INTO `la_system_auth_menu` VALUES (113, 110, 'A', '角色编辑', '', 0, 'system:role:edit', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); INSERT INTO `la_system_auth_menu` VALUES (114, 110, 'A', '角色删除', '', 0, 'system:role:del', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); -INSERT INTO `la_system_auth_menu` VALUES (120, 100, 'C', '菜单管理', 'el-icon-Operation', 0, 'system:menu:list', 'menu', 'permission/menu/index', '', '', 1, 1, 0, 1650341765, 1663301388); +INSERT INTO `la_system_auth_menu` VALUES (120, 100, 'C', '菜单管理', 'el-icon-Operation', 0, 'system:menu:list', 'menu', 'permission/menu/index', '', '', 1, 1, 0, 1650341765, 1680340798); INSERT INTO `la_system_auth_menu` VALUES (121, 120, 'A', '菜单详情', '', 0, 'system:menu:detail', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); INSERT INTO `la_system_auth_menu` VALUES (122, 120, 'A', '菜单新增', '', 0, 'system:menu:add', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); INSERT INTO `la_system_auth_menu` VALUES (123, 120, 'A', '菜单编辑', '', 0, 'system:menu:edit', '', '', '', '', 0, 1, 0, 1650341765, 1650341765); @@ -737,7 +852,7 @@ INSERT INTO `la_system_auth_menu` VALUES (716, 705, 'A', '栏目详情', '', 0, INSERT INTO `la_system_auth_menu` VALUES (717, 0, 'M', '装修管理', 'el-icon-Brush', 47, '', 'decoration', '', '', '', 0, 1, 0, 1661845634, 1664416675); INSERT INTO `la_system_auth_menu` VALUES (718, 717, 'C', '页面装修', 'el-icon-CopyDocument', 0, 'decorate:pages:detail', 'pages', 'decoration/pages/index', '', '', 0, 1, 0, 1661845678, 1663294313); INSERT INTO `la_system_auth_menu` VALUES (719, 717, 'C', '底部导航', 'el-icon-Position', 0, 'decorate:tabbar:detail', 'tabbar', 'decoration/tabbar', '', '', 0, 1, 0, 1661845811, 1663294354); -INSERT INTO `la_system_auth_menu` VALUES (720, 500, 'M', '消息通知', 'el-icon-Message', 9, '', 'message', '', '', '', 0, 1, 0, 1661848742, 1662626364); +INSERT INTO `la_system_auth_menu` VALUES (720, 794, 'M', '消息通知', 'el-icon-Message', 9, '', 'message', '', '', '', 0, 1, 0, 1661848742, 1680157682); INSERT INTO `la_system_auth_menu` VALUES (721, 720, 'C', '通知设置', '', 0, 'setting:notice:list', 'notice', 'message/notice/index', '', '', 0, 1, 0, 1661848772, 1662638112); INSERT INTO `la_system_auth_menu` VALUES (722, 720, 'C', '通知详情', '', 0, 'setting:notice:detail', 'notice/edit', 'message/notice/edit', '/setting/message/notice', '', 0, 0, 0, 1661848944, 1663142853); INSERT INTO `la_system_auth_menu` VALUES (723, 720, 'C', '短信设置', '', 0, 'setting:sms:list', 'short_letter', 'message/short_letter/index', '', '', 0, 1, 0, 1661848995, 1662638165); @@ -800,4 +915,19 @@ INSERT INTO `la_system_auth_menu` VALUES (785, 781, 'C', '文件选择器', '', INSERT INTO `la_system_auth_menu` VALUES (786, 781, 'C', '链接选择器', '', 0, '', 'link', 'template/component/link', '', '', 0, 1, 0, 1673319997, 1673319997); INSERT INTO `la_system_auth_menu` VALUES (787, 781, 'C', '超出自动打点', '', 0, '', 'overflow', 'template/component/overflow', '', '', 0, 1, 0, 1673320021, 1673320021); INSERT INTO `la_system_auth_menu` VALUES (788, 781, 'C', '悬浮input', '', 0, '', 'popover_input', 'template/component/popover_input', '', '', 0, 1, 0, 1673320046, 1673320046); +INSERT INTO `la_system_auth_menu` VALUES (789, 500, 'M', '支付设置', 'local-icon-fukuan', 0, '', 'pay', '', '', '', 0, 1, 0, 1680082358, 1680082358); +INSERT INTO `la_system_auth_menu` VALUES (790, 789, 'C', '支付方式', '', 0, 'setting:payment:method', 'method', 'setting/pay/method/index', '', '', 0, 1, 0, 1680082434, 1680082434); +INSERT INTO `la_system_auth_menu` VALUES (791, 790, 'A', '保存', '', 0, 'setting:payment:editMethod', '', '', '', '', 0, 1, 0, 1680082473, 1680082473); +INSERT INTO `la_system_auth_menu` VALUES (792, 789, 'C', '支付配置', '', 0, 'setting:payment:list', 'config', 'setting/pay/config/index', '', '', 0, 1, 0, 1680083681, 1680083681); +INSERT INTO `la_system_auth_menu` VALUES (793, 792, 'A', '配置', '', 0, 'setting:payment:editConfig', '', '', '', '', 0, 1, 0, 1680083734, 1680083734); +INSERT INTO `la_system_auth_menu` VALUES (794, 0, 'M', '应用管理', 'el-icon-Postcard', 0, '', 'app', '', '', '', 0, 1, 0, 1680157467, 1680157467); +INSERT INTO `la_system_auth_menu` VALUES (795, 794, 'C', '用户充值', 'local-icon-caiwu', 0, 'marketing:recharge:detail', 'recharge', 'app/recharge/index', '', '', 0, 1, 0, 1680158031, 1680158031); +INSERT INTO `la_system_auth_menu` VALUES (796, 795, 'A', '保存', '', 0, 'marketing:recharge:save', '', '', '', '', 0, 1, 0, 1680158056, 1680158056); +INSERT INTO `la_system_auth_menu` VALUES (797, 0, 'M', '财务管理', 'local-icon-user_gaikuang', 0, '', 'finance', '', '', '', 0, 1, 0, 1680169445, 1680169445); +INSERT INTO `la_system_auth_menu` VALUES (798, 797, 'C', '充值记录', 'el-icon-Wallet', 0, 'finance:recharger:list', 'recharge_record', 'finance/recharge_record', '', '', 0, 1, 0, 1680169574, 1680169574); +INSERT INTO `la_system_auth_menu` VALUES (799, 797, 'C', '余额明细', 'local-icon-qianbao', 0, 'finance:wallet:list', 'balance_details', 'finance/balance_details', '', '', 0, 1, 0, 1680169658, 1680169658); +INSERT INTO `la_system_auth_menu` VALUES (800, 797, 'C', '退款记录', 'local-icon-heshoujilu', 0, 'finance:refund:list', 'refund_record', 'refund_record', '', '', 0, 1, 0, 1680171454, 1680171454); +INSERT INTO `la_system_auth_menu` VALUES (801, 798, 'A', '退款', '', 0, 'finance:recharger:refund', '', '', '', '', 0, 1, 0, 1680486780, 1680486780); +INSERT INTO `la_system_auth_menu` VALUES (802, 800, 'A', '退款日志', '', 0, 'finance:refund:log', '', '', '', '', 0, 1, 0, 1680486899, 1680486899); +INSERT INTO `la_system_auth_menu` VALUES (803, 800, 'A', '重新退款', '', 0, 'finance:recharger:refundAgain', '', '', '', '', 0, 1, 0, 1680486916, 1680486916); COMMIT; From 36bb1f7b7d1ec18b99b886642e0efa18db29d9ba Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 16:32:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E6=97=A5=E5=BF=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/controller/LogsController.java | 5 ++++- .../src/main/java/com/mdd/front/service/ILogsService.java | 2 +- .../java/com/mdd/front/service/impl/LogsServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java index d06fb4fe..20f05fdb 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java @@ -2,6 +2,7 @@ package com.mdd.front.controller; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; +import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.ILogsService; import com.mdd.front.validate.common.PageValidate; import com.mdd.front.vo.RechargeRecordVo; @@ -28,7 +29,9 @@ public class LogsController { public AjaxResult userMoney(@Validated PageValidate pageValidate, @RequestParam(defaultValue = "0") Integer type) { - PageResult list = iLogsService.userMoney(pageValidate, type); + Integer userId = LikeFrontThreadLocal.getUserId(); + + PageResult list = iLogsService.userMoney(pageValidate, userId, type); return AjaxResult.success(list); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java index f54d5feb..da77570d 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java @@ -9,6 +9,6 @@ import com.mdd.front.vo.RechargeRecordVo; */ public interface ILogsService { - PageResult userMoney(PageValidate pageValidate, Integer type); + PageResult userMoney(PageValidate pageValidate, Integer userId, Integer type); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java index 25229221..f15c480e 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java @@ -24,7 +24,7 @@ public class LogsServiceImpl implements ILogsService { LogMoneyMapper logMoneyMapper; @Override - public PageResult userMoney(PageValidate pageValidate, Integer type) { + public PageResult userMoney(PageValidate pageValidate, Integer userId, Integer type) { Integer pageNo = pageValidate.getPageNo(); Integer pageSize = pageValidate.getPageSize(); @@ -44,7 +44,7 @@ public class LogsServiceImpl implements ILogsService { vo.setAction(logMoney.getAction()); vo.setOrderAmount(logMoney.getChangeAmount()); vo.setTips(LogMoneyEnum.getMsgByCode(logMoney.getChangeType())); - vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + vo.setCreateTime(TimeUtils.timestampToDate(logMoney.getCreateTime())); list.add(vo); } From 0ba266804b5caaa6c0a07a80dc820b78de484641 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 16:34:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mdd/front/service/impl/LogsServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java index f15c480e..104c58e6 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java @@ -29,6 +29,7 @@ public class LogsServiceImpl implements ILogsService { Integer pageSize = pageValidate.getPageSize(); QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id", userId); queryWrapper.orderByDesc("id"); if (type > 0) { queryWrapper.eq("action", type); From b9f40163ab5a3e7417c4ef0c31111787b58462b5 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 16:52:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FinanceRechargerServiceImpl.java | 11 +++++++++++ .../mdd/admin/vo/finance/FinanceRechargeListVo.java | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index ba1d067f..a3fae9e2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -108,6 +108,17 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { vo.setPayTime(TimeUtils.timestampToDate(vo.getPayTime())); vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); vo.setPayWay(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); + + if (vo.getPayStatus().equals(1)) { + RefundRecord refundRecord = refundRecordMapper.selectOne( + new QueryWrapper() + .eq("order_type", "recharge") + .eq("order_id", vo.getId()) + .last("limit 1")); + if (StringUtils.isNotNull(refundRecord)) { + vo.setRefundStatusMsg(RefundEnum.getRefundStatusMsg(refundRecord.getRefundStatus())); + } + } } return PageResult.iPageHandle(iPage); diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java index d10b211b..c56e346a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java @@ -34,6 +34,12 @@ public class FinanceRechargeListVo implements Serializable { @ApiModelProperty("支付状态: [0=待支付, 1=已支付]") private Integer payStatus; + @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]") + private Integer refundStatus; + + @ApiModelProperty("退款状态描述") + private String refundStatusMsg; + @ApiModelProperty("支付金额") private BigDecimal orderAmount; From 6010b19826bddf4c3da2e888949daa37efb44e4c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 16:56:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FinanceRechargerServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index a3fae9e2..5d2dfb0e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -152,6 +152,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { // 开启事务 TransactionStatus transactionStatus = transactionManager.getTransaction(transactionDefinition); + RefundRecord refundRecord = null; RefundLog log = null; try { // 标记退款状态 @@ -175,7 +176,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { // 生成退款记录 String refundSn = refundRecordMapper.randMakeOrderSn("sn"); - RefundRecord refundRecord = new RefundRecord(); + refundRecord = new RefundRecord(); refundRecord.setSn(refundSn); refundRecord.setUserId(rechargeOrder.getUserId()); refundRecord.setOrderId(rechargeOrder.getId()); @@ -208,7 +209,11 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { requestV3.setRefundAmount(AmountUtil.yuan2Fen(rechargeOrder.getOrderAmount().toString())); WxPayDriver.refund(requestV3); + // 退款记录更新 + refundRecord.setRefundStatus(RefundEnum.REFUND_SUCCESS.getCode()); + refundRecordMapper.updateById(refundRecord); + // 退款日志更新 log.setRefundStatus(RefundEnum.REFUND_SUCCESS.getCode()); refundLogMapper.updateById(log); transactionManager.commit(transactionStatus); @@ -216,6 +221,11 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { // 事务回滚 transactionManager.rollback(transactionStatus); + if (StringUtils.isNotNull(refundRecord)) { + refundRecord.setRefundStatus(RefundEnum.REFUND_ERROR.getCode()); + refundRecordMapper.updateById(refundRecord); + } + if (StringUtils.isNotNull(log)) { log.setRefundStatus(RefundEnum.REFUND_ERROR.getCode()); refundLogMapper.updateById(log); From fe9e4557ab430a63f206eb8c435abd1ea6639810 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Mon, 3 Apr 2023 17:00:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/service/impl/FinanceRechargerServiceImpl.java | 2 ++ .../java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java index 5d2dfb0e..6c0c4b4b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/FinanceRechargerServiceImpl.java @@ -109,6 +109,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { vo.setAvatar(UrlUtils.toAbsoluteUrl(vo.getAvatar())); vo.setPayWay(PaymentEnum.getPayWayMsg(Integer.parseInt(vo.getPayWay()))); + vo.setIsRefund(0); if (vo.getPayStatus().equals(1)) { RefundRecord refundRecord = refundRecordMapper.selectOne( new QueryWrapper() @@ -116,6 +117,7 @@ public class FinanceRechargerServiceImpl implements IFinanceRechargerService { .eq("order_id", vo.getId()) .last("limit 1")); if (StringUtils.isNotNull(refundRecord)) { + vo.setIsRefund(1); vo.setRefundStatusMsg(RefundEnum.getRefundStatusMsg(refundRecord.getRefundStatus())); } } diff --git a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java index c56e346a..e6db53aa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java +++ b/server/like-admin/src/main/java/com/mdd/admin/vo/finance/FinanceRechargeListVo.java @@ -37,6 +37,9 @@ public class FinanceRechargeListVo implements Serializable { @ApiModelProperty("退款状态: [0=未退款 , 1=已退款]") private Integer refundStatus; + @ApiModelProperty("是否有退款: [0=否 , 1=是]") + private Integer isRefund; + @ApiModelProperty("退款状态描述") private String refundStatusMsg;