feat:refund

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/SettleServiceImpl.java

@@ -91,7 +91,7 @@ public class SettleServiceImpl implements SettleService {
       }
 
       // 获取开始日期
-      Date startDate = this.getStartDate(merchantId, settleDate);
+      Date startDate = this.getStartDate(apply.getMerchantId(), settleDate);
 
       // 获取三方结算记录
       SettleVO vo = payRpcService.syncSettle(apply.getMerchantId(), endDate);

service/src/main/java/com/jiejing/fitness/finance/service/rpc/PayRpcService.java

@@ -53,16 +53,15 @@ public class PayRpcService {
   }
 
   public SettleVO syncSettle(Long merchantId, Date settleDate) {
-//    JsonResult<SettleVO> result = payApi.syncSettle(SyncSettleRequest.builder()
-//        .merchantId(merchantId)
-//        .settleDate(settleDate)
-//        .build());
-//    result.assertSuccess();
-//    SettleVO vo = Optional.ofNullable(result.getResult())
-//        .orElse(SettleVO.builder().transAmount(BigDecimal.ZERO).build());
-//    log.info("merchant {} settle vo is {}", merchantId, JSON.toJSONString(vo));
-    return SettleVO.builder().transAmount(new BigDecimal("0.21")).transNo(IdWorker.getIdStr())
-        .transState(TransStateEnums.INIT.getCode()).build();
+    JsonResult<SettleVO> result = payApi.syncSettle(SyncSettleRequest.builder()
+        .merchantId(merchantId)
+        .settleDate(settleDate)
+        .build());
+    result.assertSuccess();
+    SettleVO vo = Optional.ofNullable(result.getResult())
+        .orElse(SettleVO.builder().transAmount(BigDecimal.ZERO).build());
+    log.info("merchant {} settle vo is {}", merchantId, JSON.toJSONString(vo));
+    return vo;
   }
 
   public BigDecimal getFeeRate(PayRequest request) {