Skip to content

F
fit-finance
Commit ff44d57d by 程裕兵
Options

feat:cashier

parent 77406c4b
Showing with 352 additions and 53 deletions
api/src/main/java/com/jiejing/fitness/finance/api/cashier/BrandCashierApi.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier;
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 = "PAYCENTER", url = "http://app-paycenter:7007", fallbackFactory = BrandCashierApiFallback.class)
public interface BrandCashierApi {
String TAG = "金融-品牌收银管理";
@ApiOperation(value = "分页筛选收银流水", tags = {TAG})
@PostMapping(value = "/private/brandCashier/page")
PageVO<BrandCashierRecordVO> page(PageBrandCashierRequest request);
@ApiOperation(value = "查询收银流水详情", tags = {TAG})
@PostMapping(value = "/private/brandCashier/getById")
BrandCashierRecordVO getById(GetBrandCashierByIdRequest request);
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/brandCashier/getById")
List<BrandCashierRecordVO> listByOrderNo(ListBrandCashierByOrderNoRequest request);
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/BrandCashierApiFallback.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* @author chengyubing
* @since 2024/2/29 10:42
*/
@Slf4j
@Component
public class BrandCashierApiFallback implements FallbackFactory<BrandCashierApi> {
@Override
public BrandCashierApi create(Throwable throwable) {
return null;
}
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/GetBrandCashierByIdRequest.java 0 → 100644
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/2/29 10:57
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水查看详情Request")
public class GetBrandCashierByIdRequest {
@ApiModelProperty(value = "收银流水ID", required = true)
@NotNull(message = "收银流水ID不能为空")
private Long id;
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListBrandCashierByOrderNoRequest.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.validation.constraints.NotBlank;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author chengyubing
* @since 2024/2/29 10:57
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水根据订单号查询关联收银流水Request")
public class ListBrandCashierByOrderNoRequest {
@ApiModelProperty(value = "订单号", required = true)
@NotBlank(message = "订单号不能为空")
private String orderNo;
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageBrandCashierRequest.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier.request;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author chengyubing
* @since 2024/2/29 10:46
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水分页Request")
public class PageBrandCashierRequest {
@ApiModelProperty(value = "场馆订单号")
private String orderNo;
@ApiModelProperty(value = "交易流水号")
private String transNo;
@ApiModelProperty("三方交易单号")
private String thirdTransNo;
@ApiModelProperty(value = "场馆ID")
private String studioId;
@ApiModelProperty(value = "购买人姓名")
private String buyerName;
@ApiModelProperty("交易状态")
private BrandCashierTransStateEnums transState;
@ApiModelProperty("业务订单类型（来源）")
private Integer orderType;
@ApiModelProperty("交易类型：PAY-收款；REFUND-退款；")
private BrandCashierTransTypeEnums transType;
@ApiModelProperty("交易方式")
private SubChannelEnums subChannel;
@ApiModelProperty(value = "交易创建开始时间")
private Date createStartTime;
@ApiModelProperty(value = "交易创建结束时间")
private Date createEndTime;
@ApiModelProperty(value = "交易成功开始时间")
private Date successStartTime;
@ApiModelProperty(value = "交易成功结束时间")
private Date successEndTime;
@ApiModelProperty(value = "页码：0开始", required = true)
@NotNull(message = "页码不能为空")
private Integer current;
@ApiModelProperty(value = "分页大小", required = true)
@NotNull(message = "分页大小不能为空")
private Integer size;
}
api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/BrandCashierRecordVO.java 0 → 100644
package com.jiejing.fitness.finance.api.cashier.vo;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransStateEnums;
import com.jiejing.fitness.finance.api.enums.BrandCashierTransTypeEnums;
import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author chengyubing
* @since 2024/2/29 10:43
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "品牌收银流水VO")
public class BrandCashierRecordVO {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("交易流水号")
private String transNo;
@ApiModelProperty("业务订单号")
private String orderNo;
@ApiModelProperty("业务订单类型")
private Integer orderType;
@ApiModelProperty("交易类型：PAY-收款；REFUND-退款；")
private BrandCashierTransTypeEnums transType;
@ApiModelProperty("品牌ID")
private Long brandId;
@ApiModelProperty("场馆ID")
private Long studioId;
@ApiModelProperty("商户ID")
private Long merchantId;
@ApiModelProperty("商户号")
private String merchantNo;
@ApiModelProperty("渠道号")
private String channelNo;
@ApiModelProperty("支付子渠道：ALI-支付宝、WX-微信")
private SubChannelEnums subChannel;
@ApiModelProperty("交易金额（元）")
private BigDecimal transAmount;
@ApiModelProperty("交易手续费率（%）")
private BigDecimal feeRate;
@ApiModelProperty("交易手续费")
private BigDecimal fee;
@ApiModelProperty("实际金额（元）")
private BigDecimal actualAmount;
@ApiModelProperty("交易状态：0-支付初始态；1-支付中；2-支付失败；3-入账中（支付成功）；4-入账成功；5-退款中；6-退款成功；7-退款失败")
private BrandCashierTransStateEnums transState;
@ApiModelProperty("付款人姓名")
private String buyerName;
@ApiModelProperty("付款人手机号")
private String buyerPhone;
@ApiModelProperty("商品名称")
private String goods;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否存在关联交易")
private Boolean existRelatedTrans;
@ApiModelProperty("关联的交易单号")
private String relatedTransNo;
@ApiModelProperty("三方交易单号")
private String thirdTransNo;
@ApiModelProperty("错误信息")
private String failMessage;
@ApiModelProperty("交易发生时间")
private Date tradingTime;
@ApiModelProperty("交易成功时间")
private Date successTime;
@ApiModelProperty("入账时间")
private Date inTime;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
}
api/src/main/java/com/jiejing/fitness/finance/api/merchant/BrandMerchantApi.java
...@@ -2,20 +2,19 @@ package com.jiejing.fitness.finance.api.merchant; ...@@ -2,20 +2,19 @@ package com.jiejing.fitness.finance.api.merchant;
import com.jiejing.common.model.JsonResult; import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO; import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.ApplyBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.AuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantBindXcxAppIdRequest; import com.jiejing.fitness.finance.api.merchant.request.BindBrandMerchantXcxAppIdRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.GetAuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPageApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.PageBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantAuthSubChannelVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantAuthSubChannelVO;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantBindXcxAppIdVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantBindXcxAppIdVO;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantVO;
import com.jiejing.paycenter.api.pay.request.PayRequest;
import com.jiejing.paycenter.api.pay.vo.PayVO; import com.jiejing.paycenter.api.pay.vo.PayVO;
import com.jiejing.paycenter.api.pay.vo.RefundVO; import com.jiejing.paycenter.api.pay.vo.RefundVO;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -36,36 +35,36 @@ public interface BrandMerchantApi { ...@@ -36,36 +35,36 @@ public interface BrandMerchantApi {
@ApiOperation(value = "品牌入驻商户", tags = {TAG}) @ApiOperation(value = "品牌入驻商户", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/apply") @PostMapping(value = "/private/brandMerchant/apply")
JsonResult<Void> apply(BrandMerchantApplyRequest request); JsonResult<Void> apply(ApplyBrandMerchantRequest request);
@ApiOperation(value = "查询品牌当前绑定的商户", tags = {TAG}) @ApiOperation(value = "查询品牌当前绑定的商户", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/get") @PostMapping(value = "/private/brandMerchant/get")
JsonResult<BrandMerchantVO> get(BrandMerchantGetRequest request); JsonResult<BrandMerchantVO> get(GetBrandMerchantRequest request);
@ApiOperation(value = "查询品牌进件申请记录", tags = {TAG}) @ApiOperation(value = "查询品牌进件申请记录", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/getApply") @PostMapping(value = "/private/brandMerchant/getApply")
JsonResult<BrandMerchantApplyVO> getApply(BrandMerchantGetApplyRequest request); JsonResult<BrandMerchantApplyVO> getApply(GetBrandMerchantApplyRequest request);
@ApiOperation(value = "分页查询品牌进件申请记录", tags = {TAG}) @ApiOperation(value = "分页查询品牌进件申请记录", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/pageApply") @PostMapping(value = "/private/brandMerchant/pageApply")
JsonResult<PageVO<BrandMerchantApplyVO>> pageApply(BrandMerchantPageApplyRequest request); JsonResult<PageVO<BrandMerchantApplyVO>> pageApply(PageBrandMerchantApplyRequest request);
@ApiOperation(value = "绑定微信小程序appId", tags = {TAG}) @ApiOperation(value = "绑定微信小程序appId", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/bindXcxAppId") @PostMapping(value = "/private/brandMerchant/bindXcxAppId")
JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId(BrandMerchantBindXcxAppIdRequest request); JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId(BindBrandMerchantXcxAppIdRequest request);
@ApiOperation(value = "校验微信小程序appId绑定结果", tags = {TAG}) @ApiOperation(value = "校验微信小程序appId绑定结果", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/checkBindXcxAppId") @PostMapping(value = "/private/brandMerchant/checkBindXcxAppId")
JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId(BrandMerchantBindXcxAppIdRequest request); JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId(BindBrandMerchantXcxAppIdRequest request);
@ApiOperation(value = "授权子渠道", tags = {TAG}) @ApiOperation(value = "授权子渠道", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/authSubChannel") @PostMapping(value = "/private/brandMerchant/authSubChannel")
JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel(BrandMerchantAuthSubChannelRequest request); JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel(AuthBrandMerchantSubChannelRequest request);
@ApiOperation(value = "查询授权子渠道结果", tags = {TAG}) @ApiOperation(value = "查询授权子渠道结果", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/listAuthSubChannel") @PostMapping(value = "/private/brandMerchant/listAuthSubChannel")
JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel( JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel(
BrandMerchantGetAuthSubChannelRequest request); GetAuthBrandMerchantSubChannelRequest request);
@ApiOperation(value = "支付", tags = {TAG}) @ApiOperation(value = "支付", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/pay") @PostMapping(value = "/private/brandMerchant/pay")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/BrandMerchantApiFallback.java
...@@ -2,13 +2,13 @@ package com.jiejing.fitness.finance.api.merchant; ...@@ -2,13 +2,13 @@ package com.jiejing.fitness.finance.api.merchant;
import com.jiejing.common.model.JsonResult; import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO; import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.ApplyBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.AuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantBindXcxAppIdRequest; import com.jiejing.fitness.finance.api.merchant.request.BindBrandMerchantXcxAppIdRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.GetAuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPageApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.PageBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO;
...@@ -32,45 +32,45 @@ public class BrandMerchantApiFallback implements FallbackFactory<BrandMerchantAp ...@@ -32,45 +32,45 @@ public class BrandMerchantApiFallback implements FallbackFactory<BrandMerchantAp
public BrandMerchantApi create(Throwable throwable) { public BrandMerchantApi create(Throwable throwable) {
return new BrandMerchantApi() { return new BrandMerchantApi() {
@Override @Override
public JsonResult<Void> apply(BrandMerchantApplyRequest request) { public JsonResult<Void> apply(ApplyBrandMerchantRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<BrandMerchantVO> get(BrandMerchantGetRequest request) { public JsonResult<BrandMerchantVO> get(GetBrandMerchantRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<BrandMerchantApplyVO> getApply(BrandMerchantGetApplyRequest request) { public JsonResult<BrandMerchantApplyVO> getApply(GetBrandMerchantApplyRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<PageVO<BrandMerchantApplyVO>> pageApply(BrandMerchantPageApplyRequest request) { public JsonResult<PageVO<BrandMerchantApplyVO>> pageApply(PageBrandMerchantApplyRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId(BrandMerchantBindXcxAppIdRequest request) { public JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId(BindBrandMerchantXcxAppIdRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId( public JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId(
BrandMerchantBindXcxAppIdRequest request) { BindBrandMerchantXcxAppIdRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel( public JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel(
BrandMerchantAuthSubChannelRequest request) { AuthBrandMerchantSubChannelRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
@Override @Override
public JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel( public JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel(
BrandMerchantGetAuthSubChannelRequest request) { GetAuthBrandMerchantSubChannelRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
} }
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantApplyRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/ApplyBrandMerchantRequest.java
...@@ -27,7 +27,7 @@ import lombok.NoArgsConstructor; ...@@ -27,7 +27,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "申请品牌商户请求信息") @ApiModel(description = "申请品牌商户请求信息")
public class BrandMerchantApplyRequest { public class ApplyBrandMerchantRequest {
@ApiModelProperty(value = "场馆ID", required = true) @ApiModelProperty(value = "场馆ID", required = true)
@NotNull(message = "场馆ID不能为空") @NotNull(message = "场馆ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantAuthSubChannelRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/AuthBrandMerchantSubChannelRequest.java
...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; ...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "品牌商户授权子渠道") @ApiModel(description = "品牌商户授权子渠道")
public class BrandMerchantAuthSubChannelRequest { public class AuthBrandMerchantSubChannelRequest {
@ApiModelProperty(value = "品牌ID", required = true) @ApiModelProperty(value = "品牌ID", required = true)
@NotNull(message = "品牌ID不能为空") @NotNull(message = "品牌ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantBindXcxAppIdRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BindBrandMerchantXcxAppIdRequest.java
...@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; ...@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "品牌商户绑定小程序appId") @ApiModel(description = "品牌商户绑定小程序appId")
public class BrandMerchantBindXcxAppIdRequest { public class BindBrandMerchantXcxAppIdRequest {
@ApiModelProperty(value = "品牌ID", required = true) @ApiModelProperty(value = "品牌ID", required = true)
@NotNull(message = "品牌ID不能为空") @NotNull(message = "品牌ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantGetAuthSubChannelRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/GetAuthBrandMerchantSubChannelRequest.java
...@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; ...@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "品牌商户查看授权子渠道结果") @ApiModel(description = "品牌商户查看授权子渠道结果")
public class BrandMerchantGetAuthSubChannelRequest { public class GetAuthBrandMerchantSubChannelRequest {
@ApiModelProperty(value = "品牌ID", required = true) @ApiModelProperty(value = "品牌ID", required = true)
@NotNull(message = "品牌ID不能为空") @NotNull(message = "品牌ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantGetApplyRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/GetBrandMerchantApplyRequest.java
...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; ...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "申请品牌商户记录请求信息") @ApiModel(description = "申请品牌商户记录请求信息")
public class BrandMerchantGetApplyRequest { public class GetBrandMerchantApplyRequest {
@ApiModelProperty(value = "申请ID", required = true) @ApiModelProperty(value = "申请ID", required = true)
@NotNull(message = "申请ID不能为空") @NotNull(message = "申请ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantGetRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/GetBrandMerchantRequest.java
...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor; ...@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "申请品牌商户请求信息") @ApiModel(description = "申请品牌商户请求信息")
public class BrandMerchantGetRequest { public class GetBrandMerchantRequest {
@ApiModelProperty(value = "品牌ID", required = true) @ApiModelProperty(value = "品牌ID", required = true)
@NotNull(message = "品牌ID不能为空") @NotNull(message = "品牌ID不能为空")
......
api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/BrandMerchantPageApplyRequest.java → api/src/main/java/com/jiejing/fitness/finance/api/merchant/request/PageBrandMerchantApplyRequest.java
...@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor; ...@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "分页查询申请品牌商户请求信息Request") @ApiModel(description = "分页查询申请品牌商户请求信息Request")
public class BrandMerchantPageApplyRequest { public class PageBrandMerchantApplyRequest {
@ApiModelProperty(value = "商户简称") @ApiModelProperty(value = "商户简称")
private String shortName; private String shortName;
......
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/BrandCashierController.java 0 → 100644
package com.jiejing.fitness.finance.app.controller.cashier;
/**
* @author chengyubing
* @since 2024/2/29 10:41
*/
public class BrandCashierController {
}
app/src/main/java/com/jiejing/fitness/finance/app/controller/merchant/BrandMerchantController.java
...@@ -4,13 +4,13 @@ import com.jiejing.common.model.JsonResult; ...@@ -4,13 +4,13 @@ import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO; import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.convert.BeanUtil; import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.merchant.BrandMerchantApi; import com.jiejing.fitness.finance.api.merchant.BrandMerchantApi;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.ApplyBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.AuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantBindXcxAppIdRequest; import com.jiejing.fitness.finance.api.merchant.request.BindBrandMerchantXcxAppIdRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetAuthSubChannelRequest; import com.jiejing.fitness.finance.api.merchant.request.GetAuthBrandMerchantSubChannelRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantGetRequest; import com.jiejing.fitness.finance.api.merchant.request.GetBrandMerchantRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPageApplyRequest; import com.jiejing.fitness.finance.api.merchant.request.PageBrandMerchantApplyRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantPayRequest;
import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest; import com.jiejing.fitness.finance.api.merchant.request.BrandMerchantRefundRequest;
import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO; import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantApplyVO;
...@@ -49,7 +49,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -49,7 +49,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@ApiOperation(value = "品牌入驻商户", tags = {TAG}) @ApiOperation(value = "品牌入驻商户", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/apply") @PostMapping(value = "/private/brandMerchant/apply")
@Override @Override
public JsonResult<Void> apply(@RequestBody @Valid BrandMerchantApplyRequest request) { public JsonResult<Void> apply(@RequestBody @Valid ApplyBrandMerchantRequest request) {
ApplyBrandMerchantParams params = BeanUtil.map(request, ApplyBrandMerchantParams.class); ApplyBrandMerchantParams params = BeanUtil.map(request, ApplyBrandMerchantParams.class);
brandMerchantService.apply(params); brandMerchantService.apply(params);
return JsonResult.success(); return JsonResult.success();
...@@ -58,14 +58,14 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -58,14 +58,14 @@ public class BrandMerchantController implements BrandMerchantApi {
@ApiOperation(value = "查询品牌当前绑定的商户", tags = {TAG}) @ApiOperation(value = "查询品牌当前绑定的商户", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/get") @PostMapping(value = "/private/brandMerchant/get")
@Override @Override
public JsonResult<BrandMerchantVO> get(@RequestBody @Valid BrandMerchantGetRequest request) { public JsonResult<BrandMerchantVO> get(@RequestBody @Valid GetBrandMerchantRequest request) {
return JsonResult.success(brandMerchantService.getMerchant(request.getBrandId())); return JsonResult.success(brandMerchantService.getMerchant(request.getBrandId()));
} }
@ApiOperation(value = "查询品牌进件申请记录", tags = {TAG}) @ApiOperation(value = "查询品牌进件申请记录", tags = {TAG})
@PostMapping(value = "/private/brandMerchant/getApply") @PostMapping(value = "/private/brandMerchant/getApply")
@Override @Override
public JsonResult<BrandMerchantApplyVO> getApply(@RequestBody @Valid BrandMerchantGetApplyRequest request) { public JsonResult<BrandMerchantApplyVO> getApply(@RequestBody @Valid GetBrandMerchantApplyRequest request) {
return JsonResult.success(brandMerchantService.getApply(request.getId())); return JsonResult.success(brandMerchantService.getApply(request.getId()));
} }
...@@ -73,7 +73,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -73,7 +73,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@PostMapping(value = "/private/brandMerchant/pageApply") @PostMapping(value = "/private/brandMerchant/pageApply")
@Override @Override
public JsonResult<PageVO<BrandMerchantApplyVO>> pageApply( public JsonResult<PageVO<BrandMerchantApplyVO>> pageApply(
@RequestBody @Valid BrandMerchantPageApplyRequest request) { @RequestBody @Valid PageBrandMerchantApplyRequest request) {
PageBrandMerchantApplyParams params = BeanUtil.map(request, PageBrandMerchantApplyParams.class); PageBrandMerchantApplyParams params = BeanUtil.map(request, PageBrandMerchantApplyParams.class);
return JsonResult.success(brandMerchantService.pageApply(params)); return JsonResult.success(brandMerchantService.pageApply(params));
} }
...@@ -82,7 +82,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -82,7 +82,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@PostMapping(value = "/private/brandMerchant/bindXcxAppId") @PostMapping(value = "/private/brandMerchant/bindXcxAppId")
@Override @Override
public JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId( public JsonResult<BrandMerchantBindXcxAppIdVO> bindXcxAppId(
@RequestBody @Valid BrandMerchantBindXcxAppIdRequest request) { @RequestBody @Valid BindBrandMerchantXcxAppIdRequest request) {
return JsonResult.success(brandMerchantService.bindXcxAppId(request.getBrandId(), request.getAppId())); return JsonResult.success(brandMerchantService.bindXcxAppId(request.getBrandId(), request.getAppId()));
} }
...@@ -90,7 +90,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -90,7 +90,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@PostMapping(value = "/private/brandMerchant/checkBindXcxAppId") @PostMapping(value = "/private/brandMerchant/checkBindXcxAppId")
@Override @Override
public JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId( public JsonResult<BrandMerchantBindXcxAppIdVO> checkBindXcxAppId(
@RequestBody @Valid BrandMerchantBindXcxAppIdRequest request) { @RequestBody @Valid BindBrandMerchantXcxAppIdRequest request) {
return JsonResult.success( return JsonResult.success(
brandMerchantService.checkBindXcxAppId(request.getBrandId(), request.getAppId())); brandMerchantService.checkBindXcxAppId(request.getBrandId(), request.getAppId()));
} }
...@@ -99,7 +99,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -99,7 +99,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@PostMapping(value = "/private/brandMerchant/authSubChannel") @PostMapping(value = "/private/brandMerchant/authSubChannel")
@Override @Override
public JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel( public JsonResult<BrandMerchantAuthSubChannelVO> authSubChannel(
@RequestBody @Valid BrandMerchantAuthSubChannelRequest request) { @RequestBody @Valid AuthBrandMerchantSubChannelRequest request) {
return JsonResult.success( return JsonResult.success(
brandMerchantService.authSubChannel(request.getBrandId(), request.getSubChannel(), brandMerchantService.authSubChannel(request.getBrandId(), request.getSubChannel(),
request.getAuthType())); request.getAuthType()));
...@@ -109,7 +109,7 @@ public class BrandMerchantController implements BrandMerchantApi { ...@@ -109,7 +109,7 @@ public class BrandMerchantController implements BrandMerchantApi {
@PostMapping(value = "/private/brandMerchant/listAuthSubChannel") @PostMapping(value = "/private/brandMerchant/listAuthSubChannel")
@Override @Override
public JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel( public JsonResult<List<BrandMerchantAuthSubChannelVO>> listAuthSubChannel(
@RequestBody @Valid BrandMerchantGetAuthSubChannelRequest request) { @RequestBody @Valid GetAuthBrandMerchantSubChannelRequest request) {
return JsonResult.success(brandMerchantService.listAuthSubChannel(request.getBrandId())); return JsonResult.success(brandMerchantService.listAuthSubChannel(request.getBrandId()));
} }
......
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