diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java index b26f7f2..ce8c90d 100644 --- a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayCustomer.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; +import lombok.experimental.SuperBuilder; /** * @Author：zhangchengzhi @@ -16,7 +17,7 @@ import lombok.*; */ @Data -//@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -48,7 +49,7 @@ public class OrderPayCustomer extends BaseEntity { * 是否开启 */ - private Integer status; + private String status; diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java new file mode 100644 index 0000000..bfd910f --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayInfo.java @@ -0,0 +1,84 @@ +package com.muyu.cloud.pay.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：OrderPayInfo + * @Date：2024/7/31 9:32 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName( value = "order_pay_info",autoResultMap = true) +public class OrderPayInfo { + + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 客户名称 + */ + + private String appName; + + /** + * 客户编号 + */ + + private String appCode; + + /** + * 客户单号 + */ + + private String cusOrderNumber; + + /** + * 支付单号 + */ + + private String payOrderNumber; + + /** + * 渠道商类型 + */ + + private String channelType; + + /** + * 渠道商单号 + */ + + private String channelOrderNumber; + + /** + * 支付单状态 + */ + + private String status; + + + + + + + + + + + + + + + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayRefund.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayRefund.java new file mode 100644 index 0000000..c5b9b20 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/OrderPayRefund.java @@ -0,0 +1,67 @@ +package com.muyu.cloud.pay.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：OrderPayRefund + * @Date：2024/7/31 9:43 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "order_pay_refund",autoResultMap = true) +public class OrderPayRefund { + /** + * 主键 + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + /** + * 客户退单号 + */ + private String cusOrderNumber; + /** + * 支付退单号 + */ + private String payOrderNumber; + /** + * 渠道商退单 + */ + private String channelOrderNumber; + /** + * 退款金额 + */ + private BigDecimal price; + /** + * 支付单号 + */ + private String payInfoNumber; + /** + * 到账时间 + */ + private Date toAccoutTime; + + /** + * 退单状态 + */ + private String status; + + + + + + + + +} diff --git a/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java new file mode 100644 index 0000000..f419431 --- /dev/null +++ b/cloud-pay-common/src/main/java/com/muyu/cloud/pay/domain/req/CustomerListReq.java @@ -0,0 +1,44 @@ +package com.muyu.cloud.pay.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.skywalking.apm.toolkit.trace.Tag; + + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.domain + * @Project：cloud-pay + * @name：CustomerListReq + * @Date：2024/7/31 19:07 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class CustomerListReq { + + + /** + * 服务/客户名称 + */ + + private String appName; + + /** + * 服务/客户编码 + */ + private String appCode; + + /** + * 客户描述 + */ + private String appDesc; + + + + + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java index 27f6da0..ce323a0 100644 --- a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayCustomerController.java @@ -15,4 +15,14 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/customer") public class OrderPayCustomerController { + + + + + + + + + + } diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayInfoController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayInfoController.java new file mode 100644 index 0000000..5608fd1 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayInfoController.java @@ -0,0 +1,18 @@ +package com.muyu.cloud.pay.controller; + +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.controller + * @Project：cloud-pay + * @name：OrderPayInfoController + * @Date：2024/7/31 9:58 + */ +@Log4j2 +@RestController +@RequestMapping("/OrderPayInfo") +public class OrderPayInfoController { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayRefundController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayRefundController.java new file mode 100644 index 0000000..75cc5a4 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/OrderPayRefundController.java @@ -0,0 +1,18 @@ +package com.muyu.cloud.pay.controller; + +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.controller + * @Project：cloud-pay + * @name：OrderPayRefundController + * @Date：2024/7/31 10:03 + */ +@Log4j2 +@RestController +@RequestMapping("/OrderPayRefund") +public class OrderPayRefundController { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayInfoMapper.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayInfoMapper.java new file mode 100644 index 0000000..0881f83 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayInfoMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.pay.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domain.OrderPayInfo; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayInfoMapper + * @Date：2024/7/31 9:53 + */ +@Mapper +public interface OrderPayInfoMapper extends BaseMapper { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayRefundMapper.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayRefundMapper.java new file mode 100644 index 0000000..3f8f870 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/mapper/OrderPayRefundMapper.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.pay.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.cloud.pay.domain.OrderPayRefund; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.mapper + * @Project：cloud-pay + * @name：OrderPayRefundMapper + * @Date：2024/7/31 9:59 + */ +@Mapper +public interface OrderPayRefundMapper extends BaseMapper { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayInfoService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayInfoService.java new file mode 100644 index 0000000..c244edc --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayInfoService.java @@ -0,0 +1,14 @@ +package com.muyu.cloud.pay.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.pay.domain.OrderPayInfo; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayInfoService + * @Date：2024/7/31 9:54 + */ +public interface OrderPayInfoService extends IService { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayRefundService.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayRefundService.java new file mode 100644 index 0000000..3f462ad --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/OrderPayRefundService.java @@ -0,0 +1,16 @@ +package com.muyu.cloud.pay.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.cloud.pay.domain.OrderPayRefund; +import org.springframework.stereotype.Service; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.service + * @Project：cloud-pay + * @name：OrderPayRefundService + * @Date：2024/7/31 10:00 + */ + +public interface OrderPayRefundService extends IService { +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayInfoServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayInfoServiceImpl.java new file mode 100644 index 0000000..34f1d94 --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayInfoServiceImpl.java @@ -0,0 +1,23 @@ +package com.muyu.cloud.pay.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.pay.domain.OrderPayInfo; +import com.muyu.cloud.pay.mapper.OrderPayInfoMapper; +import com.muyu.cloud.pay.service.OrderPayInfoService; +import org.springframework.stereotype.Service; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayInfoServiceImpl + * @Date：2024/7/31 9:55 + */ +@Service +public class OrderPayInfoServiceImpl extends ServiceImpl + implements OrderPayInfoService { + + + + +} diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayRefundServiceImpl.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayRefundServiceImpl.java new file mode 100644 index 0000000..a325cda --- /dev/null +++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/service/impl/OrderPayRefundServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.cloud.pay.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.pay.domain.OrderPayRefund; +import com.muyu.cloud.pay.mapper.OrderPayRefundMapper; +import com.muyu.cloud.pay.service.OrderPayRefundService; +import org.springframework.stereotype.Service; + +/** + * @Author：zhangchengzhi + * @Package：com.muyu.cloud.pay.service.impl + * @Project：cloud-pay + * @name：OrderPayRefundServiceImpl + * @Date：2024/7/31 10:01 + */ +@Service +public class OrderPayRefundServiceImpl extends + ServiceImpl implements OrderPayRefundService { +}