zoujiajian 3 rokov pred
rodič
commit
050195d6c2

+ 6 - 1
netflix-service/src/main/java/com/cyksj/service/register/impl/RegisterOrderDonServiceImpl.java

@@ -429,7 +429,9 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
                 .setAlgorithm(Codec.DoDigest.Algorithm.MD5)
                 .setStringData(time + String.valueOf(registerOrderDon.getId()))
                 .toHexString();
-        refundReq.setRefundMoney(registerOrderDon.getMoney());
+        if (refundReq.getRefundMoney() == null) {
+            refundReq.setRefundMoney(registerOrderDon.getMoney());
+        }
         weChatService.refundWxOrder(weChatConfig.getAppid(),
                 Optional.ofNullable(registerOrderDon.getShopId()).orElse(ShopConfig.WX_DEFAULT_APP_ID),
                 registerOrderDon.getTransactionId(),
@@ -478,6 +480,9 @@ public class RegisterOrderDonServiceImpl extends ServiceImpl<RegisterOrderDonMap
         AlipayTradeRefundModel model = new AlipayTradeRefundModel();
         //支付宝交易号
         model.setTradeNo(registerOrderDon.getTransactionId());
+        if (refundReq.getRefundMoney() == null) {
+            refundReq.setRefundMoney(registerOrderDon.getMoney());
+        }
         model.setRefundAmount(refundReq.getRefundMoney().divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_EVEN).toString());
         model.setQueryOptions(List.of("gmt_refund_pay"));
         long time = System.currentTimeMillis();

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/register/CmsRegisterController.java

@@ -179,7 +179,7 @@ public class CmsRegisterController {
      * 注册 统一退款
      */
     @PostMapping("/unified/refund")
-    public Result<String> unifiedRefund(@RequestBody @Validated OrderRefundReq refundReq) throws Exception {
+    public Result<String> unifiedRefund(@RequestBody OrderRefundReq refundReq) throws Exception {
         registerOrderDonService.unifiedRefund(refundReq);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
     }