From ba915abf9f2f69a2c7f14d86036a2f90b2221088 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 30 May 2025 12:29:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=AC=AC=E4=B8=89=E6=96=B9=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=A4=9A=E6=AC=A1=E9=80=80=E6=AC=BE=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/third/HardThirdPayServiceImpl.java | 57 ++++++++++-------- .../mapper/order/HardOrderMapper.xml | 1 + .../thirdparty/vo/pay/PayRefundVo.java | 28 +++++++++ .../pjcloud/thirdparty/vo/pay/PayWaterVo.java | 26 +++----- .../src/main/resources/doc/第三方支付文档.wps | Bin 160768 -> 169984 bytes .../java/com/bsd/pjcloud/admin/PayTest.java | 8 +-- 6 files changed, 75 insertions(+), 45 deletions(-) create mode 100644 pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayRefundVo.java diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/third/HardThirdPayServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/third/HardThirdPayServiceImpl.java index 60e70ff26..3123c354a 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/third/HardThirdPayServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/third/HardThirdPayServiceImpl.java @@ -35,10 +35,7 @@ import com.bsd.pjcloud.thirdparty.dto.pay.PayDetailDto; import com.bsd.pjcloud.thirdparty.dto.pay.PayDto; import com.bsd.pjcloud.thirdparty.dto.pay.RefundDto; import com.bsd.pjcloud.thirdparty.dto.pay.WaterDto; -import com.bsd.pjcloud.thirdparty.vo.pay.PayBaseVo; -import com.bsd.pjcloud.thirdparty.vo.pay.PayVo; -import com.bsd.pjcloud.thirdparty.vo.pay.PayWaterVo; -import com.bsd.pjcloud.thirdparty.vo.pay.RefundVo; +import com.bsd.pjcloud.thirdparty.vo.pay.*; import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum; import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity; import com.bsd.pjcloud.wallet.api.feign.RemoteMchService; @@ -285,22 +282,18 @@ public class HardThirdPayServiceImpl implements HardThirdPayService { item.setName(v.getUsername()); item.setSignPhone(v.getUserMobile()); item.setPlatformOrderId(String.valueOf(v.getId())); - if (ObjectUtil.isNotEmpty(v.getAfterSaleId())) { - item.setPlatformRefundId(String.valueOf(v.getAfterSaleId())); - } item.setThirdOrderId(v.getOrderNo()); - if (ObjectUtil.isNotEmpty(v.getAfterSaleNo())) { - item.setThirdRefundId(String.valueOf(v.getAfterSaleNo())); - } item.setOrderStatus(v.getOrderStatus()); item.setOrderPrice(v.getPayPrice()); - item.setRefundPrice(v.getRefundPrice()); if (ObjectUtil.isNotEmpty(v.getPayTime())) { item.setPayTime(LocalDateTimeUtil.format(v.getPayTime(), DatePattern.NORM_DATETIME_PATTERN)); } - if (ObjectUtil.isNotEmpty(v.getRefundTime())) { - item.setRefundTime(LocalDateTimeUtil.format(v.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN)); - } + // 查询退款列表 + List refundList = getRefundList(v.getId()); + // 总退款金额 + Integer reduce = refundList.stream().filter(i -> ObjectUtil.isNotEmpty(i.getRefundPrice())).map(i -> i.getRefundPrice()).reduce(0, Integer::sum); + item.setRefundList(refundList); + item.setRefundTotalPrice(reduce); list.add(item); } } @@ -338,22 +331,18 @@ public class HardThirdPayServiceImpl implements HardThirdPayService { item.setName(order.getUsername()); item.setSignPhone(order.getUserMobile()); item.setPlatformOrderId(String.valueOf(order.getId())); - if (ObjectUtil.isNotEmpty(order.getAfterSaleId())) { - item.setPlatformRefundId(String.valueOf(order.getAfterSaleId())); - } item.setThirdOrderId(order.getOrderNo()); - if (ObjectUtil.isNotEmpty(order.getAfterSaleNo())) { - item.setThirdRefundId(String.valueOf(order.getAfterSaleNo())); - } item.setOrderStatus(order.getOrderStatus()); item.setOrderPrice(order.getPayPrice()); - item.setRefundPrice(order.getRefundPrice()); if (ObjectUtil.isNotEmpty(order.getPayTime())) { item.setPayTime(LocalDateTimeUtil.format(order.getPayTime(), DatePattern.NORM_DATETIME_PATTERN)); } - if (ObjectUtil.isNotEmpty(order.getRefundTime())) { - item.setRefundTime(LocalDateTimeUtil.format(order.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN)); - } + // 查询退款列表 + List refundList = getRefundList(order.getId()); + // 总退款金额 + Integer reduce = refundList.stream().filter(i -> ObjectUtil.isNotEmpty(i.getRefundPrice())).map(i -> i.getRefundPrice()).reduce(0, Integer::sum); + item.setRefundList(refundList); + item.setRefundTotalPrice(reduce); baseVo.set(ThirdPayVoStatusEnum.SUCCESS); baseVo.setData(item); return baseVo; @@ -376,6 +365,26 @@ public class HardThirdPayServiceImpl implements HardThirdPayService { return null; } + // 查询退款列表 + private List getRefundList(Long orderId) { + List afterList = hardAfterSaleService.list(new LambdaQueryWrapper() + .eq(HardAfterSaleEntity::getOrderId, orderId) + .eq(HardAfterSaleEntity::getType, HardSaleTypeEnum.AFTER_SALE.getType()) + .eq(HardAfterSaleEntity::getStatus, HardSaleStatusEnum.COMPLETE.getStatus()) + ); + if (ObjectUtil.isEmpty(afterList)) { + return null; + } + return afterList.stream().map(v -> { + PayRefundVo item = new PayRefundVo(); + item.setPlatformRefundId(String.valueOf(v.getId())); + item.setThirdRefundId(v.getNo()); + item.setRefundPrice(v.getRefundPrice()); + item.setRefundTime(LocalDateTimeUtil.format(v.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN)); + return item; + }).toList(); + } + private String getOrderType(ThirdPaySoureBizTypeEnum type) { switch (type) { case LB -> { diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index 925b1ad82..d984a1298 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -207,6 +207,7 @@ and s.no = #{dto.afterSaleNo} + group by a.id order by a.create_time desc, a.user_id desc diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayRefundVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayRefundVo.java new file mode 100644 index 000000000..82dbc5a3f --- /dev/null +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayRefundVo.java @@ -0,0 +1,28 @@ +package com.bsd.pjcloud.thirdparty.vo.pay; + +import lombok.Data; + +@Data +public class PayRefundVo { + + /** + * 平台退款id + */ + private String platformRefundId; + + /** + * 第三方退款id + */ + private String thirdRefundId; + + /** + * 退款金额(分) + */ + private Integer refundPrice; + + /** + * 退款时间(yyyy-MM-dd HH:mm:ss格式) + */ + private String refundTime; + +} diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayWaterVo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayWaterVo.java index 572fc0264..70736683a 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayWaterVo.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/PayWaterVo.java @@ -2,6 +2,8 @@ package com.bsd.pjcloud.thirdparty.vo.pay; import lombok.Data; +import java.util.List; + @Data public class PayWaterVo { @@ -25,21 +27,11 @@ public class PayWaterVo { */ private String platformOrderId; - /** - * 平台退款id - */ - private String platformRefundId; - /** * 第三方订单id */ private String thirdOrderId; - /** - * 第三方退款id - */ - private String thirdRefundId; - /** * 订单状态 * 1创建订单(未支付) @@ -53,19 +45,19 @@ public class PayWaterVo { */ private Integer orderPrice; - /** - * 退款金额(分) - */ - private Integer refundPrice; - /** * 支付时间(yyyy-MM-dd HH:mm:ss格式) */ private String payTime; /** - * 退款时间(yyyy-MM-dd HH:mm:ss格式) + * 总退款价格(分) */ - private String refundTime; + private Integer refundTotalPrice; + + /** + * 退款列表 + */ + private List refundList; } diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/doc/第三方支付文档.wps b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/doc/第三方支付文档.wps index e0cf241cf897bb327d6a852d176c0b02f58f9b85..a8d465388ebe11990a9d2126977c1e38cb543bc2 100644 GIT binary patch delta 6400 zcmdVfe{7Z29mnx=p59XVRoe=sl-}D5Em#W{e<0LSOF_hf6_Fs4+7(13P#e}@C9Ywm zf?~%yQ+XJV5<)t|kTAv=7kf!ZNJTURJAw-m=Mb?HM!E(WB6Ena_vf~-;;@$OuhqP` z=ehkpr{_LD&iOpo>Qg^?LTqGJV0BUmo8tvtTzkTn2ae1k6++ywyT{K zXJ@(_aMJpgI_>-MZ&9rKLUh0_b4sEYCK}U^t>J;17-QO^jH&2t%!uf#wdO7U&?}ab z3DFq?jB!-#|D>NW>C`-zV9WwKzMt2-*siCzKNTyYe@e%{@y1WG;m}E6uI*v_Q)$EF z3!K$9)EHCI-(8>9%dNU4!>vo}XE4bqw%^EQ?uO# zLtpo%O|rW~c39NL-ExKoj=j0Nw1Mn*+2Dq6H_=iZ-0anf7kZ(7XgE#h5rGAb=o-q=W+VTWnwm?Q|5O z1XZZUO4LwO!=I|5y$ZEhk9zDx1NMachd#IdJv5uJ7yHnRLpXtxA^(xd);<1Cv^#R) zn2y)SgC^!Azih*4oW(g@#3eZXP@t6YIeue$U>Gtm3Zs#Y9BP)d*jsaGPr?+;!+b18 z1(x9W+i$FR`oTZGb-Jt$MZVm->SOju@b9Lk2kOxThQ{(#+T+7 zwD<9!`{%i}OH$n9v!dN)vj=kjXpgPfhTUkwVI09xw7k3NDGa(-y6xzW zKXu=jo3uwhW?~g;u@3985u30T+rW`qzq+QX;xY9-%FRES@8&;{=WeSicK07^44Pgl z+JT+ejXl_l_i!u_3QXh_9;1C6Z8(iHIE%bgVt2t;VC^&_4IFF0C1Se>W4}I`ylc}$slRwyf)Jb&9 ztMWok1$owOni@HBL35L8Vv&GE1Q5h9WCTNj20mE^?M#e7Hgb`VDJZ077d3^nXQ2qi zC_xQsv4)yy)U2Vs7H?o9HeoXw&`8a0YB<_vFZSU8nsEq!!pGF?q2^=SM{yh{a0X{_ z31)C8&_slI|G>*fo$YrDyC7hkD6(;i&26(n2RN-#B0>N zN6l-r*I^SjV+*!o7j{##pPJpY590`0Z~`ZB3g@X|$_$*ReF1SpI3EZgh#^QH5(+d^ zlTLdCvM>P?F%{D=iyG$4z%1IuD92(vk4h{>RYyNnv};j^4XDRfY{PbHG-+<9y#uGv zhCXRrE9i&Bw8*3xNTi*FWMm=>6EG2l)Es*8+9~minS;3G3;FF-Ov7{(p#+Oj!CprS zuH9?oLQSL<{I(KHQH|wTg<90HmnPCW+H0^A4cLo)cn|xj(L}nR_F;U4vp5HZ4+lPU zXChTy5A;J4vTz4RBO5n1k!p_|GiCUXnmA&%tLpKLGCYDanH<88oeTxMgvlPm1Nu(#blY;XJC4&zLeI@*A( z*yhC_v3@UWrS0qfB04?%#18iU{^59UhwQlcZS1%ghj19JVLJK3##Cx*U4u~^8b)oz?9~J({arZJ??PzcR zGCQUlx2CeD@?#BF=@Z`AotdD_sl2J=sMNT}ugl`JjorhB;-jMDvFi`)_AZW9l)|He zV={>=5*)pFU;F6Z^+x{QzSY%~@vB;t(S3TQSc_01EruDi>e^L3e<7$~>57-24D`P5ODqH5K zh7;!M@Z}Txlp~cP%TmMKPiJjk1xba-lQ`wYCtP#3=G$M}M5RY1N2Nw3MkT?1!Ej=} zZM8l7v7t!VF@UKWfVP8BBpiX9pcmM0M~Clgwt11O?k6|uWW1) z@04H_YJ=g}S&TBimJOvsB|@daUE%m7huLu#?M5gGHd9<`ldRV~(SF1V(ad{Fgh$cB z?+WRtXA2vOgPm@#tS&AYt6IfIMMcHL*um}BV$WD*Fm$&g)hbsiODad^(9v?8l^iw{ zC>0`026r5ZA6#z~H5D_TN2M2^dCh6-#w-_K$&TxwEUFyZ7^V}BXd`XqP-V~)-5!pT zs#5CLxbR;L$A5tx6=xM?6<-xy6jgn7GE)MDKS?-d3br+jW1Qo&&tlLBjdYvty<0dYtZQ)=yI)6t@5_A zw(|86{Eusux==({Ja^I~2mZTjRc06Wca-A1B6=c{(!;Sk?7A+K<7Jy4PpMM8^0=~i zVS2~%RLF)xxdM6F^~ciHToa{8t~kCK?Qz^=_Pfm+yVCCJ&id5U{@CTj4-j~@n(fS$+oWs4A=_@%UM}4QJaHlWD6sh(=k;h^ERL;zTe0A43zVo~bq6>6ut_jh<VZucj2@_T*!2LjGd(hmb&Dat8|UCCSuJ_;`iAj%rb3tIE9tg>1_wO(pPyt44+@R^E&W?AG*3@t}m zc3Pm7CP7!3t`wbY zJ)qSYV_r4k3FXcd$Cqx6@#+>kBU106btmq^-53Rj@5v)SMX}+uBIi>Z6Zhep{x3g# zGu*S-DRhSRt+wX3eNBYwEdOa+KUZF7c$Fp26H#xceeE4CalTFZL-IG5`=@?$c}3~B zmsM93tABZX`E0iHbK5Z28E^efq3H*+AF=uR#pd{%|JnGL_V)Y7mX&-EE_upHjIk5E z=SrOyZK-#m)T!(}n$czsP`&Zu%bbyJU35aY=^3ZF$G<<~kFNI-?_o#%kBKq7X5(Ju eU@UTRAM!8``4|t?-_PsBj<&WR^gdYZ{Pka=AG_`V delta 4518 zcmbu@e^6A%0SEBiY?l=w=HHc^vH3aEN3@RZfI=15&hMd+Ks)V^xwVFxs z;_p~T@s{|ISc=g&jyl#Bhes)6(OAb4hM0~f3}qr>$5_W0>o^_9Nwwea9WwZ%{!^Tf z?t5?F+xKI4zl(trQGx42sBUg>o)nl^M*oAs}O0upTF;4p&(YhrqN*AVP>Sc~PojE32?@5V^9=i~?R+YQ* zi`~De(f1sybk(SMoY&Bk(jD=CUPJe!hEJNCY>G zhUt(ES3dn@^G|1w=anOUH?m<3%JZ%z}LI!U9+hrBDu`lV3~6$>}(m zPui+?o;=B?#Zf<0z$(}PTVNmHX}jji(4)lsel?n@!_I?n2oA#$Xo41K12nVs?b+dG zJmvM;HJdN`0`Ap?vst4ZI-v`?;cJL<;HlyA=>wbl&#v->pN=PozL-lyvQh?QLN??; zE_h&#qrutUD?Mvaeiz<@DhNUyoP_Ie1Mb0nP);E%aQV__r$64ftYl$)scuj2HI>z?4h97lV0pDXf4p@WU#24=UkuYyJC6 z^4xeG4(+LWU+?;{L%a6Y>A)WY={&v(w!k*n4tt;$>Hw{-XQPwPzTD7r*D1qIM)J^M zI0B8(1kKO_*MO(J^+Vq4DDBD4)vZMy9VqYN04mg7{G@;dd>ruHDJCDI}XoeOz1+8$=rJcdn@a*UB zLFJ3s*$MxKdtgb$YlOiNm5LtOic8OSp=K2J#6u!vLk`S=0w_ey`d*n{h_V+JLkX;b zwXg}cK`I>6Evr4XXl*$shTHsoLGxb+Khu| z;T)WYHt2+IxC76hi&*0>2se5WSilN47!J>$i_knPjfSz11ydj!a$y0m`Jc@VPuCuF z#hoW_vpeEU9$g5Fp%_ZQ2jx%!&u<#9ihHC48lOXAeV{ua1u;EKTy6$Z|Iss%0&b^wWNc6mUVnRRC82On(MDL%k^3bQY*yX)D48 z)1ArgPky`!<~TEa6KpYKl==wI^r>7F%Rpy#Gq;)9&B=zdQ%-G|Va=6>f4*Ed%+ieA zjBy5ZS90j(n0PtO;kPneL@=?L*6|LewP`ye@5optGSiqz%oJYhc;dpPmbKXZD3BS( z3}A*YBlLB2!2X}P{UsFg2X4GFaAW$wjhFg2jL-MVEYpZqZ-no7gs`#&1~kK&!R$8d z$;x477RbNJA#UtoBKP%2Kl>xMna)gR=5U?UjICgQtiuKanPJ@KxPc?3xCJ|tk}0WN;dG2Q?Nb!SKs>e+zzq{z zrfnN4$1nw%ZrR{5>=|kTdd54Up0RkSi11){9t;?|c5XA_N?<9J@%pATd~s@8l%))N zm~#Wph~+k;j4{Rtt8w)W_8M%|0%NNMw={6Dw_sl@dPVw&ZRzn-wY)NQWtbT z>#7dM6a$Fi!{A|_FiWODj_D{+S7l5N%FGj{MX?!EsJ`kSjSLQkh94^2rcJ5ZzOl}9 zU@|ZjmCiXU854{M#sec^S=tj9wpo^8cYjJ4 z_C?Aeb1~m9Fjg;?@urSe^TQ7?QA9i$B5h*8&xZrbLgNbG?+Gf4F>SL}uTGpO`MV6KIsT%-nTfv(a1!9^o8y@)X0CfV)VLVsl9DUKOkihT1MG=h z8?i5ORl~2&r3M!a{6-4^uXqHKHvEp5kW9f?VOIVUIc2U|r|RW;W*cLSam7Gl_%K)) z9gGRyHz$0~=bX1WMRN}3G|PMEw8?vaG*58~;$*|Q<`oLBS5sF3s-CZpx0xj>aCvzQfMJ@6XT8@5vA4Pcsv%Rk<3f@LvO=pQae| zXr;O=Bcm^EJ@WCT+2-zmDpX@+K#CWY2w^>mKiuZeqkrccYNLA7Sh7)lKYZhg|2*We zrWpP$^3Bzo)UT!XSgRYisF~6szVg{$o+mv#Sb9q|Hvc_T4ou7J{>5L-lC3H}Qf3*e zcdAV?-?+b1y*qTYM7PI(ap1?WSE)(3R;<~&OSM}q{2vy>SE({avNRbLrvS_Jk}=9q J-|Y6!`7dS)DgFQe diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java index d90252169..3ea4a9c5a 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java @@ -29,8 +29,8 @@ import java.util.Map; @SpringBootTest(classes = ThirdPartyApp.class) public class PayTest { - private final String baseUrl = "http://123.156.230.15:8089/api"; - // private final String baseUrl = "http://127.0.0.1:9999"; + // private final String baseUrl = "http://123.156.230.15:8089/api"; + private final String baseUrl = "http://127.0.0.1:9999"; private final String walletInfoUrl = "/third/third-pay-api/user-wallet"; @@ -152,8 +152,8 @@ public class PayTest { public void detail() throws Exception { ThirdKeyManageEntity config = getLbConfig(); Map paramsMap = new HashMap<>(); - paramsMap.put("thirdOrderId", ""); - paramsMap.put("thirdRefundId", "10"); + paramsMap.put("thirdOrderId", "1748517531534"); + paramsMap.put("thirdRefundId", ""); String body = JSONUtil.toJsonStr(paramsMap); // 发送请求 String res = HttpRequest.post(baseUrl + detailUrl).contentType("application/json").header(apiCountersign(body)).body(body).execute().body();