feat:settle

api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java

@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
+import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
@@ -70,4 +71,8 @@ public interface StudioCashierApi {
   @PostMapping(value = "/private/studioCashier/pageSettle")
   @PostMapping(value = "/private/studioCashier/pageSettle")
   JsonResult<PageVO<StudioSettleVO>> pageSettle(PageStudioSettleRequest request);
   JsonResult<PageVO<StudioSettleVO>> pageSettle(PageStudioSettleRequest request);
 
 
+  @ApiOperation(value = "查询结算记录", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/getSettle")
+  JsonResult<StudioSettleVO> getSettle(GetStudioSettleRequest request);
+
 }
 }

api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java

@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
+import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
@@ -84,6 +85,11 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
         return JsonResult.rpcError();
         return JsonResult.rpcError();
       }
       }
 
 
+      @Override
+      public JsonResult<StudioSettleVO> getSettle(GetStudioSettleRequest request) {
+        return JsonResult.rpcError();
+      }
+
     };
     };
   }
   }
 }
 }

api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/GetStudioSettleRequest.java

+package com.jiejing.fitness.finance.api.cashier.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author chengyubing
+ * @since 2024/4/7 18:03
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(description = "查询场馆结算记录参数")
+public class GetStudioSettleRequest {
+
+  @ApiModelProperty(value = "结算记录ID", required = true)
+  @NotNull(message = "结算记录ID不能为空")
+  private Long id;
+
+}

app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java

@@ -6,6 +6,7 @@ import com.jiejing.common.utils.convert.BeanUtil;
 import com.jiejing.fitness.finance.api.cashier.StudioCashierApi;
 import com.jiejing.fitness.finance.api.cashier.StudioCashierApi;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
 import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
+import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
 import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
@@ -122,4 +123,11 @@ public class StudioCashierController implements StudioCashierApi {
     return JsonResult.success(studioCashierService.page(params));
     return JsonResult.success(studioCashierService.page(params));
   }
   }
 
 
+  @ApiOperation(value = "查询结算记录", tags = {TAG})
+  @PostMapping(value = "/private/studioCashier/getSettle")
+  @Override
+  public JsonResult<StudioSettleVO> getSettle(@Valid @RequestBody GetStudioSettleRequest request) {
+    return JsonResult.success(studioCashierService.getSettle(request.getId()));
+  }
+
 }
 }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java

@@ -95,4 +95,12 @@ public interface StudioCashierService {
    */
    */
   List<StudioCashierRecordVO> listByIds(List<Long> ids);
   List<StudioCashierRecordVO> listByIds(List<Long> ids);
 
 
+  /**
+   * 查询结算记录
+   *
+   * @param id ID
+   * @return 结果
+   */
+  StudioSettleVO getSettle(Long id);
+
 }
 }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/convert/CashierConvert.java

@@ -49,12 +49,14 @@ public class CashierConvert {
     if (CollectionUtil.isEmpty(list)) {
     if (CollectionUtil.isEmpty(list)) {
       return Lists.newArrayList();
       return Lists.newArrayList();
     }
     }
-    return list.stream().map(CashierConvert::convertSettleVO).collect(Collectors.toList());
+    return list.stream().map(e -> {
+      StudioSettleVO vo = CashierConvert.convertSettleVO(e);
+      vo.setCardNo(SensitiveUtil.bankCard(AesUtil.decrypt(e.getSalt(), e.getCardNo())));
+      return vo;
+    }).collect(Collectors.toList());
   }
   }
 
 
-  private static StudioSettleVO convertSettleVO(StudioSettleRecord record) {
-    StudioSettleVO vo = BeanUtil.map(record, StudioSettleVO.class);
-    vo.setCardNo(SensitiveUtil.bankCard(AesUtil.decrypt(record.getSalt(), record.getCardNo())));
-    return vo;
+  public static StudioSettleVO convertSettleVO(StudioSettleRecord record) {
+    return BeanUtil.map(record, StudioSettleVO.class);
   }
   }
 }
 }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java

@@ -138,4 +138,11 @@ public class StudioCashierServiceImpl implements StudioCashierService {
         .collect(Collectors.toList());
         .collect(Collectors.toList());
   }
   }
 
 
+  @Override
+  public StudioSettleVO getSettle(Long id) {
+    return studioSettleRecordRpService.getById(id)
+        .map(CashierConvert::convertSettleVO)
+        .orElse(null);
+  }
+
 }
 }