Skip to content

F
fit-finance
Commit 86a39ae7 by 程裕兵
Options

feat:brand cashier record -> studio cashier record

parent 9fa0e837
Showing with 156 additions and 154 deletions
api/src/main/java/com/jiejing/fitness/finance/api/cashier/BrandCashierApi.java deleted 100644 → 0
package com.jiejing.fitness.finance.api.cashier;
import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.request.GetBrandCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListBrandCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageBrandCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @author chengyubing
* @since 2024/2/29 10:41
*/
@FeignClient(name = "FINANCE", url = "${rpc.url.fit-finance:http://app-fit-finance:7008}", fallbackFactory = BrandCashierApiFallback.class)
public interface BrandCashierApi {
String TAG = "金融-品牌收银管理";
@ApiOperation(value = "分页筛选收银流水", tags = {TAG})
@PostMapping(value = "/private/brandCashier/page")
JsonResult<PageVO<BrandCashierRecordVO>> page(PageBrandCashierRequest request);
@ApiOperation(value = "查询收银流水详情", tags = {TAG})
@PostMapping(value = "/private/brandCashier/getById")
JsonResult<BrandCashierRecordVO> getById(GetBrandCashierByIdRequest request);
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/brandCashier/listByOrderNo")
JsonResult<List<BrandCashierRecordVO>> listByOrderNo(ListBrandCashierByOrderNoRequest request);
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier;
import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
/**
* @author chengyubing
* @since 2024/2/29 10:41
*/
@FeignClient(name = "FINANCE", url = "${rpc.url.fit-finance:http://app-fit-finance:7008}", fallbackFactory = StudioCashierApiFallback.class)
public interface StudioCashierApi {
String TAG = "金融-场馆收银管理";
@ApiOperation(value = "分页筛选收银流水", tags = {TAG})
@PostMapping(value = "/private/studioCashier/page")
JsonResult<PageVO<StudioCashierRecordVO>> page(PageStudioCashierRequest request);
@ApiOperation(value = "查询收银流水详情", tags = {TAG})
@PostMapping(value = "/private/studioCashier/getById")
JsonResult<StudioCashierRecordVO> getById(GetStudioCashierByIdRequest request);
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByOrderNo")
JsonResult<List<StudioCashierRecordVO>> listByOrderNo(ListStudioCashierByOrderNoRequest request);
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/BrandCashierApiFallback.java → api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java
......@@ -2,10 +2,10 @@ package com.jiejing.fitness.finance.api.cashier;
import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.request.GetBrandCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListBrandCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageBrandCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import feign.hystrix.FallbackFactory;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
......@@ -17,23 +17,24 @@ import org.springframework.stereotype.Component;
*/
@Slf4j
@Component
public class BrandCashierApiFallback implements FallbackFactory<BrandCashierApi> {
public class StudioCashierApiFallback implements FallbackFactory<StudioCashierApi> {
@Override
public BrandCashierApi create(Throwable throwable) {
return new BrandCashierApi() {
public StudioCashierApi create(Throwable throwable) {
return new StudioCashierApi() {
@Override
public JsonResult<PageVO<BrandCashierRecordVO>> page(PageBrandCashierRequest request) {
public JsonResult<PageVO<StudioCashierRecordVO>> page(PageStudioCashierRequest request) {
return JsonResult.rpcError();
}
@Override
public JsonResult<BrandCashierRecordVO> getById(GetBrandCashierByIdRequest request) {
public JsonResult<StudioCashierRecordVO> getById(GetStudioCashierByIdRequest request) {
return JsonResult.rpcError();
}
@Override
public JsonResult<List<BrandCashierRecordVO>> listByOrderNo(ListBrandCashierByOrderNoRequest request) {
public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
ListStudioCashierByOrderNoRequest request) {
return JsonResult.rpcError();
}
};
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/GetBrandCashierByIdRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/GetStudioCashierByIdRequest.java
......@@ -16,8 +16,8 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水查看详情Request")
public class GetBrandCashierByIdRequest {
@ApiModel(description = "场馆收银流水查看详情Request")
public class GetStudioCashierByIdRequest {
@ApiModelProperty(value = "收银流水ID", required = true)
@NotNull(message = "收银流水ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListBrandCashierByOrderNoRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierByOrderNoRequest.java
......@@ -16,8 +16,8 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水根据订单号查询关联收银流水Request")
public class ListBrandCashierByOrderNoRequest {
@ApiModel(description = "根据订单号查询场馆收银流水Request")
public class ListStudioCashierByOrderNoRequest {
@ApiModelProperty(value = "订单号", required = true)
@NotBlank(message = "订单号不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageBrandCashierRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageStudioCashierRequest.java
......@@ -20,8 +20,8 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水分页Request")
public class PageBrandCashierRequest {
@ApiModel(description = "分页查询场馆收银流水Request")
public class PageStudioCashierRequest {
@ApiModelProperty(value = "场馆订单号")
private String orderNo;
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/BrandCashierRecordVO.java → api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioCashierRecordVO.java
......@@ -20,8 +20,8 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水VO")
public class BrandCashierRecordVO {
@ApiModel(description = "场馆收银流水VO")
public class StudioCashierRecordVO {
@ApiModelProperty("主键")
private Long id;
......
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/BrandCashierController.java → app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
......@@ -3,13 +3,13 @@ package com.jiejing.fitness.finance.app.controller.cashier;
import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.cashier.BrandCashierApi;
import com.jiejing.fitness.finance.api.cashier.request.GetBrandCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListBrandCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageBrandCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import com.jiejing.fitness.finance.service.cashier.BrandCashierService;
import com.jiejing.fitness.finance.service.cashier.params.PageBrandCashierParams;
import com.jiejing.fitness.finance.api.cashier.StudioCashierApi;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import com.jiejing.fitness.finance.service.cashier.StudioCashierService;
import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParams;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
......@@ -23,32 +23,33 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2024/2/29 10:41
*/
@RestController
public class BrandCashierController implements BrandCashierApi {
public class StudioCashierController implements StudioCashierApi {
@Resource
private BrandCashierService brandCashierService;
private StudioCashierService studioCashierService;
@ApiOperation(value = "分页筛选收银流水", tags = {TAG})
@PostMapping(value = "/private/brandCashier/page")
@Override
public JsonResult<PageVO<BrandCashierRecordVO>> page(@Valid @RequestBody PageBrandCashierRequest request) {
PageBrandCashierParams params = BeanUtil.map(request, PageBrandCashierParams.class);
return JsonResult.success(brandCashierService.page(params));
public JsonResult<PageVO<StudioCashierRecordVO>> page(
@Valid @RequestBody PageStudioCashierRequest request) {
PageStudioCashierParams params = BeanUtil.map(request, PageStudioCashierParams.class);
return JsonResult.success(studioCashierService.page(params));
}
@ApiOperation(value = "查询收银流水详情", tags = {TAG})
@PostMapping(value = "/private/brandCashier/getById")
@Override
public JsonResult<BrandCashierRecordVO> getById(@Valid @RequestBody GetBrandCashierByIdRequest request) {
return JsonResult.success(brandCashierService.getById(request.getId()));
public JsonResult<StudioCashierRecordVO> getById(@Valid @RequestBody GetStudioCashierByIdRequest request) {
return JsonResult.success(studioCashierService.getById(request.getId()));
}
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/brandCashier/listByOrderNo")
@Override
public JsonResult<List<BrandCashierRecordVO>> listByOrderNo(
@Valid @RequestBody ListBrandCashierByOrderNoRequest request) {
return JsonResult.success(brandCashierService.listByOrderNo(request.getOrderNo()));
public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
@Valid @RequestBody ListStudioCashierByOrderNoRequest request) {
return JsonResult.success(studioCashierService.listByOrderNo(request.getOrderNo()));
}
}
repository/src/main/java/com/jiejing/fitness/finance/repository/entity/BrandCashierRecord.java → repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioCashierRecord.java
......@@ -30,7 +30,7 @@ import lombok.NoArgsConstructor;
/**
* <p>
* 品牌收银流水
* 场馆收银流水
* </p>
*
* @author chengyubing, created on 2024-02-27
......@@ -40,7 +40,7 @@ import lombok.NoArgsConstructor;
@Builder(toBuilder = true)
@NoArgsConstructor
@AllArgsConstructor
public class BrandCashierRecord implements Serializable {
public class StudioCashierRecord implements Serializable {
private static final long serialVersionUID = -4723670005434909301L;
......
repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandCashierRecordMapper.java → repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.java
......@@ -14,7 +14,7 @@
package com.jiejing.fitness.finance.repository.mapper;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.mbp.inject.XBaseMapper;
import java.math.BigDecimal;
import org.apache.ibatis.annotations.Param;
......@@ -26,7 +26,7 @@ import org.apache.ibatis.annotations.Param;
*
* @author chengyubing, created on 2024-02-27
*/
public interface BrandCashierRecordMapper extends XBaseMapper<BrandCashierRecord> {
public interface StudioCashierRecordMapper extends XBaseMapper<StudioCashierRecord> {
BigDecimal sumRefundActualAmountByPayTransNo(@Param("payTransNo") String payTransNo);
......
repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/BrandCashierRecordMapper.xml → repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml
......@@ -13,7 +13,7 @@
~ 官网: www.xiaomai5.com
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jiejing.fitness.finance.repository.mapper.BrandCashierRecordMapper">
<mapper namespace="com.jiejing.fitness.finance.repository.mapper.StudioCashierRecordMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
......
repository/src/main/java/com/jiejing/fitness/finance/repository/service/BrandCashierRecordRpService.java → repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
......@@ -16,8 +16,8 @@ package com.jiejing.fitness.finance.repository.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jiejing.common.utils.text.StringUtil;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.repository.mapper.BrandCashierRecordMapper;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.repository.mapper.StudioCashierRecordMapper;
import com.jiejing.fitness.finance.repository.query.PageBrandCashierRecordQuery;
import com.jiejing.mbp.MapperRepoService;
import java.math.BigDecimal;
......@@ -33,59 +33,59 @@ import org.springframework.stereotype.Service;
* @author chengyubing, created on 2024-02-27
*/
@Service
public class BrandCashierRecordRpService extends
MapperRepoService<Long, BrandCashierRecord, BrandCashierRecordMapper> {
public class StudioCashierRecordRpService extends
MapperRepoService<Long, StudioCashierRecord, StudioCashierRecordMapper> {
public BigDecimal sumRefundActualAmountByPayTransNo(String payTransNo) {
return this.baseMapper.sumRefundActualAmountByPayTransNo(payTransNo);
}
public List<BrandCashierRecord> listByOrderNo(String orderNo) {
QueryWrapper<BrandCashierRecord> wrapper = new QueryWrapper<>();
wrapper.eq(BrandCashierRecord.ORDER_NO, orderNo);
public List<StudioCashierRecord> listByOrderNo(String orderNo) {
QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
wrapper.eq(StudioCashierRecord.ORDER_NO, orderNo);
return this.baseMapper.selectList(wrapper);
}
public Page<BrandCashierRecord> page(PageBrandCashierRecordQuery query) {
QueryWrapper<BrandCashierRecord> wrapper = new QueryWrapper<>();
public Page<StudioCashierRecord> page(PageBrandCashierRecordQuery query) {
QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
if (StringUtil.isNotBlank(query.getOrderNo())) {
wrapper.eq(BrandCashierRecord.ORDER_NO, query.getOrderNo());
wrapper.eq(StudioCashierRecord.ORDER_NO, query.getOrderNo());
}
if (StringUtil.isNotBlank(query.getTransNo())) {
wrapper.eq(BrandCashierRecord.TRANS_NO, query.getTransNo());
wrapper.eq(StudioCashierRecord.TRANS_NO, query.getTransNo());
}
if (StringUtil.isNotBlank(query.getThirdTransNo())) {
wrapper.eq(BrandCashierRecord.THIRD_TRANS_NO, query.getThirdTransNo());
wrapper.eq(StudioCashierRecord.THIRD_TRANS_NO, query.getThirdTransNo());
}
if (null != query.getStudioId()) {
wrapper.eq(BrandCashierRecord.STUDIO_ID, query.getStudioId());
wrapper.eq(StudioCashierRecord.STUDIO_ID, query.getStudioId());
}
if (StringUtil.isNotBlank(query.getBuyerName())) {
wrapper.eq(BrandCashierRecord.BUYER_NAME, query.getBuyerName());
wrapper.eq(StudioCashierRecord.BUYER_NAME, query.getBuyerName());
}
if (null != query.getTransState()) {
wrapper.eq(BrandCashierRecord.TRANS_STATE, query.getTransState());
wrapper.eq(StudioCashierRecord.TRANS_STATE, query.getTransState());
}
if (null != query.getOrderType()) {
wrapper.eq(BrandCashierRecord.ORDER_TYPE, query.getOrderType());
wrapper.eq(StudioCashierRecord.ORDER_TYPE, query.getOrderType());
}
if (null != query.getTransType()) {
wrapper.eq(BrandCashierRecord.TRANS_TYPE, query.getTransType());
wrapper.eq(StudioCashierRecord.TRANS_TYPE, query.getTransType());
}
if (null != query.getSubChannel()) {
wrapper.eq(BrandCashierRecord.SUB_CHANNEL, query.getSubChannel());
wrapper.eq(StudioCashierRecord.SUB_CHANNEL, query.getSubChannel());
}
if (null != query.getCreateStartTime()) {
wrapper.ge(BrandCashierRecord.CREATE_TIME, query.getCreateStartTime());
wrapper.ge(StudioCashierRecord.CREATE_TIME, query.getCreateStartTime());
}
if (null != query.getCreateEndTime()) {
wrapper.le(BrandCashierRecord.CREATE_TIME, query.getCreateEndTime());
wrapper.le(StudioCashierRecord.CREATE_TIME, query.getCreateEndTime());
}
if (null != query.getSuccessStartTime()) {
wrapper.ge(BrandCashierRecord.SUCCESS_TIME, query.getSuccessStartTime());
wrapper.ge(StudioCashierRecord.SUCCESS_TIME, query.getSuccessStartTime());
}
if (null != query.getSuccessEndTime()) {
wrapper.le(BrandCashierRecord.SUCCESS_TIME, query.getSuccessEndTime());
wrapper.le(StudioCashierRecord.SUCCESS_TIME, query.getSuccessEndTime());
}
return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
}
......
service/src/main/java/com/jiejing/fitness/finance/service/cashier/BrandCashierService.java → service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
package com.jiejing.fitness.finance.service.cashier;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import com.jiejing.fitness.finance.service.cashier.params.PageBrandCashierParams;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParams;
import java.util.List;
/**
* @author chengyubing
* @since 2024/2/29 11:05
*/
public interface BrandCashierService {
public interface StudioCashierService {
/**
* 查询详情
......@@ -17,7 +17,7 @@ public interface BrandCashierService {
* @param id ID
* @return 结果
*/
BrandCashierRecordVO getById(Long id);
StudioCashierRecordVO getById(Long id);
/**
* 根据订单号查询列表
......@@ -25,7 +25,7 @@ public interface BrandCashierService {
* @param orderNo 订单号
* @return 结果
*/
List<BrandCashierRecordVO> listByOrderNo(String orderNo);
List<StudioCashierRecordVO> listByOrderNo(String orderNo);
/**
* 分页
......@@ -33,6 +33,6 @@ public interface BrandCashierService {
* @param params 参数
* @return 结果
*/
PageVO<BrandCashierRecordVO> page(PageBrandCashierParams params);
PageVO<StudioCashierRecordVO> page(PageStudioCashierParams params);
}
service/src/main/java/com/jiejing/fitness/finance/service/cashier/convert/CashierConvert.java
......@@ -4,8 +4,8 @@ import com.google.common.collect.Lists;
import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.data.domain.Page;
......@@ -16,18 +16,18 @@ import org.springframework.data.domain.Page;
*/
public class CashierConvert {
public static BrandCashierRecordVO convertVO(BrandCashierRecord record) {
return BeanUtil.map(record, BrandCashierRecordVO.class);
public static StudioCashierRecordVO convertVO(StudioCashierRecord record) {
return BeanUtil.map(record, StudioCashierRecordVO.class);
}
public static List<BrandCashierRecordVO> convertList(List<BrandCashierRecord> list) {
public static List<StudioCashierRecordVO> convertList(List<StudioCashierRecord> list) {
if (CollectionUtil.isEmpty(list)) {
return Lists.newArrayList();
}
return list.stream().map(CashierConvert::convertVO).collect(Collectors.toList());
}
public static PageVO<BrandCashierRecordVO> convertPageVO(Page<BrandCashierRecord> page) {
public static PageVO<StudioCashierRecordVO> convertPageVO(Page<StudioCashierRecord> page) {
return PageVO.convert(page, convertList(page.getContent()));
}
......
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/BrandCashierServiceImpl.java → service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
......@@ -2,13 +2,13 @@ package com.jiejing.fitness.finance.service.cashier.impl;
import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.cashier.vo.BrandCashierRecordVO;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.api.cashier.vo.StudioCashierRecordVO;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.repository.query.PageBrandCashierRecordQuery;
import com.jiejing.fitness.finance.repository.service.BrandCashierRecordRpService;
import com.jiejing.fitness.finance.service.cashier.BrandCashierService;
import com.jiejing.fitness.finance.repository.service.StudioCashierRecordRpService;
import com.jiejing.fitness.finance.service.cashier.StudioCashierService;
import com.jiejing.fitness.finance.service.cashier.convert.CashierConvert;
import com.jiejing.fitness.finance.service.cashier.params.PageBrandCashierParams;
import com.jiejing.fitness.finance.service.cashier.params.PageStudioCashierParams;
import java.util.List;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
......@@ -21,14 +21,14 @@ import org.springframework.stereotype.Service;
*/
@Slf4j
@Service
public class BrandCashierServiceImpl implements BrandCashierService {
public class StudioCashierServiceImpl implements StudioCashierService {
@Resource
private BrandCashierRecordRpService brandCashierRecordRpService;
private StudioCashierRecordRpService studioCashierRecordRpService;
@Override
public BrandCashierRecordVO getById(Long id) {
BrandCashierRecord record = brandCashierRecordRpService.getById(id).orElse(null);
public StudioCashierRecordVO getById(Long id) {
StudioCashierRecord record = studioCashierRecordRpService.getById(id).orElse(null);
if (null == record) {
return null;
}
......@@ -36,15 +36,15 @@ public class BrandCashierServiceImpl implements BrandCashierService {
}
@Override
public List<BrandCashierRecordVO> listByOrderNo(String orderNo) {
List<BrandCashierRecord> list = brandCashierRecordRpService.listByOrderNo(orderNo);
public List<StudioCashierRecordVO> listByOrderNo(String orderNo) {
List<StudioCashierRecord> list = studioCashierRecordRpService.listByOrderNo(orderNo);
return CashierConvert.convertList(list);
}
@Override
public PageVO<BrandCashierRecordVO> page(PageBrandCashierParams params) {
public PageVO<StudioCashierRecordVO> page(PageStudioCashierParams params) {
PageBrandCashierRecordQuery query = BeanUtil.map(params, PageBrandCashierRecordQuery.class);
Page<BrandCashierRecord> page = brandCashierRecordRpService.page(query);
Page<StudioCashierRecord> page = studioCashierRecordRpService.page(query);
return CashierConvert.convertPageVO(page);
}
}
service/src/main/java/com/jiejing/fitness/finance/service/cashier/params/PageBrandCashierParams.java → service/src/main/java/com/jiejing/fitness/finance/service/cashier/params/PageStudioCashierParams.java
......@@ -21,7 +21,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水分页Params")
public class PageBrandCashierParams {
public class PageStudioCashierParams {
@ApiModelProperty(value = "场馆订单号")
private String orderNo;
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
......@@ -8,7 +8,7 @@ import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.text.StringUtil;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.pay.params.BrandMerchantRefundParams;
import com.jiejing.fitness.finance.service.pay.params.StudioMerchantPayParams;
......@@ -45,7 +45,7 @@ public class PayConvert {
private static final List<String> WX_AUTH_CODE_PREFIX = Lists.newArrayList("10", "11", "12", "13", "14",
"15");
public static PayRequest convert(StudioMerchantPayParams params, BrandCashierRecord record) {
public static PayRequest convert(StudioMerchantPayParams params, StudioCashierRecord record) {
PayRequest request = BeanUtil.map(params, PayRequest.class);
request.setTransNo(record.getTransNo());
request.setMerchantId(record.getMerchantId());
......@@ -59,13 +59,13 @@ public class PayConvert {
return request;
}
public static BrandCashierRecord convertPayInit(StudioMerchantPayParams params, StudioVO studio,
public static StudioCashierRecord convertPayInit(StudioMerchantPayParams params, StudioVO studio,
MerchantVO merchant) {
setSubChannel(params);
Long id = IdWorker.getId();
BigDecimal feeRate = getFeeRate(params, merchant);
BigDecimal fee = FeeUtil.calPayFee(feeRate, params.getTransAmount());
return BrandCashierRecord.builder()
return StudioCashierRecord.builder()
.id(id)
.transNo(id.toString())
.orderNo(params.getOrderNo())
......@@ -139,8 +139,8 @@ public class PayConvert {
System.out.println(fee);
}
public static BrandCashierRecord convertPay(BrandCashierRecord record, PayEvent event) {
return BrandCashierRecord.builder()
public static StudioCashierRecord convertPay(StudioCashierRecord record, PayEvent event) {
return StudioCashierRecord.builder()
.id(record.getId())
.successTime(event.getFinishTime())
.channelNo(event.getChannelNo())
......@@ -163,9 +163,9 @@ public class PayConvert {
}
}
public static BrandCashierRecord convertRefundInit(BrandMerchantRefundParams params,
BrandCashierRecord pay, BigDecimal historyRefundActualAmount) {
BrandCashierRecord record = BeanUtil.map(pay, BrandCashierRecord.class);
public static StudioCashierRecord convertRefundInit(BrandMerchantRefundParams params,
StudioCashierRecord pay, BigDecimal historyRefundActualAmount) {
StudioCashierRecord record = BeanUtil.map(pay, StudioCashierRecord.class);
record.setId(IdWorker.getId());
record.setTransNo(record.getId().toString());
record.setOrderNo(params.getOrderNo());
......@@ -185,14 +185,14 @@ public class PayConvert {
return record;
}
public static RefundPayRequest convert(BrandMerchantRefundParams params, BrandCashierRecord record) {
public static RefundPayRequest convert(BrandMerchantRefundParams params, StudioCashierRecord record) {
RefundPayRequest request = BeanUtil.map(params, RefundPayRequest.class);
request.setTransNo(record.getTransNo());
return request;
}
public static BrandCashierRecord convertRefund(BrandCashierRecord record, RefundVO vo) {
return BrandCashierRecord.builder()
public static StudioCashierRecord convertRefund(StudioCashierRecord record, RefundVO vo) {
return StudioCashierRecord.builder()
.id(record.getId())
.transState(convertTransState(TransStateEnums.getByCode(vo.getRefundState())))
.failMessage(vo.getFailMessage())
......@@ -214,8 +214,8 @@ public class PayConvert {
}
}
public static BrandCashierRecord convertRefund(BrandCashierRecord record, RefundEvent event) {
return BrandCashierRecord.builder()
public static StudioCashierRecord convertRefund(StudioCashierRecord record, RefundEvent event) {
return StudioCashierRecord.builder()
.id(record.getId())
.transState(convertTransState(event.getRefundState()))
.failMessage(event.getFailMessage())
......
service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java
package com.jiejing.fitness.finance.service.pay.impl;
import com.jiejing.common.exception.BizException;
import com.jiejing.fitness.finance.repository.entity.BrandCashierRecord;
import com.jiejing.fitness.finance.repository.entity.StudioCashierRecord;
import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
import com.jiejing.fitness.finance.repository.service.BrandCashierRecordRpService;
import com.jiejing.fitness.finance.repository.service.StudioCashierRecordRpService;
import com.jiejing.fitness.finance.repository.service.PartyToMerchantRpService;
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.pay.PayService;
......@@ -48,7 +48,7 @@ public class PayServiceImpl implements PayService {
private StudioRpcService studioRpcService;
@Resource
private BrandCashierRecordRpService brandCashierRecordRpService;
private StudioCashierRecordRpService studioCashierRecordRpService;
@Resource
private MerchantRpcService merchantRpcService;
......@@ -63,8 +63,8 @@ public class PayServiceImpl implements PayService {
MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
BrandCashierRecord record = PayConvert.convertPayInit(params, studio, merchant);
brandCashierRecordRpService.insert(record);
StudioCashierRecord record = PayConvert.convertPayInit(params, studio, merchant);
studioCashierRecordRpService.insert(record);
PayRequest request = PayConvert.convert(params, record);
return payRpcService.pay(request);
......@@ -72,45 +72,45 @@ public class PayServiceImpl implements PayService {
@Override
public void payCallback(PayEvent event) {
BrandCashierRecord record = brandCashierRecordRpService.getById(Long.parseLong(event.getTransNo()))
StudioCashierRecord record = studioCashierRecordRpService.getById(Long.parseLong(event.getTransNo()))
.orElse(null);
if (null == record) {
return;
}
BrandCashierRecord toModify = PayConvert.convertPay(record, event);
brandCashierRecordRpService.updateById(toModify);
StudioCashierRecord toModify = PayConvert.convertPay(record, event);
studioCashierRecordRpService.updateById(toModify);
}
@Override
public RefundVO merchantRefund(BrandMerchantRefundParams params) {
BrandCashierRecord pay = brandCashierRecordRpService.getById(Long.parseLong(params.getPayTransNo()))
StudioCashierRecord pay = studioCashierRecordRpService.getById(Long.parseLong(params.getPayTransNo()))
.orElseThrow(() -> new BizException(FinanceErrorEnums.NOT_EXIST));
BigDecimal historyRefundActualAmount = brandCashierRecordRpService.sumRefundActualAmountByPayTransNo(
BigDecimal historyRefundActualAmount = studioCashierRecordRpService.sumRefundActualAmountByPayTransNo(
params.getPayTransNo());
BrandCashierRecord record = PayConvert.convertRefundInit(params, pay, historyRefundActualAmount);
brandCashierRecordRpService.insert(record);
StudioCashierRecord record = PayConvert.convertRefundInit(params, pay, historyRefundActualAmount);
studioCashierRecordRpService.insert(record);
RefundPayRequest request = PayConvert.convert(params, record);
RefundVO vo = payRpcService.refund(request);
BrandCashierRecord toModify = PayConvert.convertRefund(record, vo);
brandCashierRecordRpService.updateById(toModify);
StudioCashierRecord toModify = PayConvert.convertRefund(record, vo);
studioCashierRecordRpService.updateById(toModify);
return vo;
}
@Override
public void refundCallback(RefundEvent event) {
BrandCashierRecord record = brandCashierRecordRpService.getById(Long.parseLong(event.getTransNo()))
StudioCashierRecord record = studioCashierRecordRpService.getById(Long.parseLong(event.getTransNo()))
.orElse(null);
if (null == record) {
return;
}
BrandCashierRecord toModify = PayConvert.convertRefund(record, event);
brandCashierRecordRpService.updateById(toModify);
StudioCashierRecord toModify = PayConvert.convertRefund(record, event);
studioCashierRecordRpService.updateById(toModify);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment