From b98fc2b902e8d18bd79c47e21a67cc0ed21b69ac Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Tue, 19 Aug 2025 23:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=88=86?= =?UTF-8?q?=E6=B6=A6=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/PubOrderController.java | 21 ++++-- .../order/convert/OrderDistribConvert.java | 16 +++++ .../com/sczx/order/dto/OrderDistribDTO.java | 39 +++++++++++ .../sczx/order/dto/OrderDistribQueryReq.java | 22 ++++++ .../sczx/order/mapper/OrderDistribMapper.java | 22 ++++++ .../com/sczx/order/po/OrderDistribPO.java | 69 +++++++++++++++++++ .../order/repository/OrderDistribRepo.java | 20 ++++++ .../repository/impl/OrderDistribRepoImpl.java | 29 ++++++++ .../order/service/OrderDistribService.java | 17 +++++ .../service/impl/OrderDistribServiceImpl.java | 23 +++++++ .../resources/mapper/OrderDistribMapper.xml | 40 +++++++++++ 11 files changed, 314 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/sczx/order/convert/OrderDistribConvert.java create mode 100644 src/main/java/com/sczx/order/dto/OrderDistribDTO.java create mode 100644 src/main/java/com/sczx/order/dto/OrderDistribQueryReq.java create mode 100644 src/main/java/com/sczx/order/mapper/OrderDistribMapper.java create mode 100644 src/main/java/com/sczx/order/po/OrderDistribPO.java create mode 100644 src/main/java/com/sczx/order/repository/OrderDistribRepo.java create mode 100644 src/main/java/com/sczx/order/repository/impl/OrderDistribRepoImpl.java create mode 100644 src/main/java/com/sczx/order/service/OrderDistribService.java create mode 100644 src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java create mode 100644 src/main/resources/mapper/OrderDistribMapper.xml diff --git a/src/main/java/com/sczx/order/controller/PubOrderController.java b/src/main/java/com/sczx/order/controller/PubOrderController.java index 1c19750..6884374 100644 --- a/src/main/java/com/sczx/order/controller/PubOrderController.java +++ b/src/main/java/com/sczx/order/controller/PubOrderController.java @@ -1,15 +1,16 @@ package com.sczx.order.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.sczx.order.common.Result; import com.sczx.order.dto.OrderDetailDTO; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; +import com.sczx.order.service.OrderDistribService; import com.sczx.order.service.OrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @Author: 张黎 @@ -24,6 +25,9 @@ public class PubOrderController { @Autowired private OrderService orderService; + @Autowired + private OrderDistribService orderDistribService; + @ApiOperation(value = "根据订单查询订单详情") @GetMapping("/getOrderDetailByOrderNo") @@ -31,4 +35,13 @@ public class PubOrderController { return Result.ok(orderService.getOrderDetailByOrderNo(orderNo)); } + @ApiOperation(value = "根据订单查询订单详情") + @PostMapping("/pageQueryOrderDistrib") + public Result> pageQueryOrderDistrib(@RequestParam(name = "pageNo", required = false, defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", required = false, defaultValue = "10") Integer pageSize, + @RequestBody OrderDistribQueryReq orderDistribQueryReq){ + return Result.ok(orderDistribService.pageQueryOrderDistrib(pageNo, pageSize, orderDistribQueryReq)); + } + + } diff --git a/src/main/java/com/sczx/order/convert/OrderDistribConvert.java b/src/main/java/com/sczx/order/convert/OrderDistribConvert.java new file mode 100644 index 0000000..49a10c7 --- /dev/null +++ b/src/main/java/com/sczx/order/convert/OrderDistribConvert.java @@ -0,0 +1,16 @@ +package com.sczx.order.convert; + +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.po.OrderDistribPO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper +public interface OrderDistribConvert { + OrderDistribConvert INSTANCE = Mappers.getMapper(OrderDistribConvert.class); + OrderDistribDTO poToDto(OrderDistribPO orderDistribPO); + OrderDistribPO dtoToPo(OrderDistribDTO orderDistribDTO); + List dtosToPos(List orderDistribPOList); +} diff --git a/src/main/java/com/sczx/order/dto/OrderDistribDTO.java b/src/main/java/com/sczx/order/dto/OrderDistribDTO.java new file mode 100644 index 0000000..9141d67 --- /dev/null +++ b/src/main/java/com/sczx/order/dto/OrderDistribDTO.java @@ -0,0 +1,39 @@ +package com.sczx.order.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@ApiModel(value = "OrderDistribDTO对象", description = "订单利润分配") +@Data +public class OrderDistribDTO { + + @ApiModelProperty("ID（主键）") + private Long id; + + @ApiModelProperty("关联的订单ID（外键）") + private Long orderId; + + @ApiModelProperty("订单编号") + private String orderNo; + + @ApiModelProperty("运营商id") + private Integer companyId; + + @ApiModelProperty("运营商id") + private Integer storeId; + + @ApiModelProperty("引荐人id") + private Long referralUserId; + + @ApiModelProperty("分配类型") + private String distribType; + + @ApiModelProperty("分配比例") + private BigDecimal distribRate; + + @ApiModelProperty("分配金额") + private BigDecimal distribAmount; +} diff --git a/src/main/java/com/sczx/order/dto/OrderDistribQueryReq.java b/src/main/java/com/sczx/order/dto/OrderDistribQueryReq.java new file mode 100644 index 0000000..1725842 --- /dev/null +++ b/src/main/java/com/sczx/order/dto/OrderDistribQueryReq.java @@ -0,0 +1,22 @@ +package com.sczx.order.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel(value = "OrderDistribQueryReq对象", description = "订单利润分配查询对象") +@Data +public class OrderDistribQueryReq { + + @ApiModelProperty("订单编号") + private String orderNo; + + @ApiModelProperty("运营商id") + private Integer companyId; + + @ApiModelProperty("运营商id") + private Integer storeId; + + @ApiModelProperty("引荐人id") + private Long referralUserId; +} diff --git a/src/main/java/com/sczx/order/mapper/OrderDistribMapper.java b/src/main/java/com/sczx/order/mapper/OrderDistribMapper.java new file mode 100644 index 0000000..92f6251 --- /dev/null +++ b/src/main/java/com/sczx/order/mapper/OrderDistribMapper.java @@ -0,0 +1,22 @@ +package com.sczx.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; +import com.sczx.order.po.OrderDistribPO; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 订单利润分配 Mapper 接口 + *

+ * + * @author zhangli + * @since 2025-08-19 22:46:17 + */ +public interface OrderDistribMapper extends BaseMapper { + + IPage pageQueryOrderDistrib(Page page, @Param("orderDistribQueryReq") OrderDistribQueryReq orderDistribQueryReq); +} diff --git a/src/main/java/com/sczx/order/po/OrderDistribPO.java b/src/main/java/com/sczx/order/po/OrderDistribPO.java new file mode 100644 index 0000000..4511556 --- /dev/null +++ b/src/main/java/com/sczx/order/po/OrderDistribPO.java @@ -0,0 +1,69 @@ +package com.sczx.order.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *

+ * 订单利润分配 + *

+ * + * @author zhangli + * @since 2025-08-19 22:46:17 + */ +@Getter +@Setter +@TableName("zc_order_distrib") +@ApiModel(value = "OrderDistribPO对象", description = "订单利润分配") +public class OrderDistribPO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("ID（主键）") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("关联的订单ID（外键）") + private Long orderId; + + @ApiModelProperty("订单编号") + private String orderNo; + + @ApiModelProperty("运营商id") + private Integer companyId; + + @ApiModelProperty("运营商id") + private Integer storeId; + + @ApiModelProperty("引荐人id") + private Long referralUserId; + + @ApiModelProperty("分配类型") + private String distribType; + + @ApiModelProperty("分配比例") + private BigDecimal distribRate; + + @ApiModelProperty("分配金额") + private BigDecimal distribAmount; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("创建时间") + private LocalDateTime createTime; + + @ApiModelProperty("更新时间") + private LocalDateTime updateTime; + + +} diff --git a/src/main/java/com/sczx/order/repository/OrderDistribRepo.java b/src/main/java/com/sczx/order/repository/OrderDistribRepo.java new file mode 100644 index 0000000..a34458c --- /dev/null +++ b/src/main/java/com/sczx/order/repository/OrderDistribRepo.java @@ -0,0 +1,20 @@ +package com.sczx.order.repository; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; +import com.sczx.order.po.OrderDistribPO; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 订单利润分配 服务类 + *

+ * + * @author zhangli + * @since 2025-08-19 22:46:17 + */ +public interface OrderDistribRepo extends IService { + + IPage pageQueryOrderDistrib(Integer pageNo, Integer pageSize, OrderDistribQueryReq orderDistribQueryReq); +} diff --git a/src/main/java/com/sczx/order/repository/impl/OrderDistribRepoImpl.java b/src/main/java/com/sczx/order/repository/impl/OrderDistribRepoImpl.java new file mode 100644 index 0000000..b6f7bd3 --- /dev/null +++ b/src/main/java/com/sczx/order/repository/impl/OrderDistribRepoImpl.java @@ -0,0 +1,29 @@ +package com.sczx.order.repository.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; +import com.sczx.order.mapper.OrderDistribMapper; +import com.sczx.order.po.OrderDistribPO; +import com.sczx.order.repository.OrderDistribRepo; +import org.springframework.stereotype.Service; + +/** + *

+ * 订单利润分配 服务实现类 + *

+ * + * @author zhangli + * @since 2025-08-19 22:46:17 + */ +@Service +public class OrderDistribRepoImpl extends ServiceImpl implements OrderDistribRepo { + + @Override + public IPage pageQueryOrderDistrib(Integer pageNo, Integer pageSize, OrderDistribQueryReq orderDistribQueryReq) { + Page page = new Page<>(pageNo, pageSize); + return this.getBaseMapper().pageQueryOrderDistrib(page, orderDistribQueryReq); + } +} diff --git a/src/main/java/com/sczx/order/service/OrderDistribService.java b/src/main/java/com/sczx/order/service/OrderDistribService.java new file mode 100644 index 0000000..d1d82dc --- /dev/null +++ b/src/main/java/com/sczx/order/service/OrderDistribService.java @@ -0,0 +1,17 @@ +package com.sczx.order.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; + +public interface OrderDistribService { + + /** + * 分页查询订单分润记录表 + * @param pageNo + * @param pageSize + * @param orderDistribQueryReq + * @return + */ + IPage pageQueryOrderDistrib(Integer pageNo, Integer pageSize, OrderDistribQueryReq orderDistribQueryReq); +} diff --git a/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java new file mode 100644 index 0000000..097b331 --- /dev/null +++ b/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java @@ -0,0 +1,23 @@ +package com.sczx.order.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.sczx.order.dto.OrderDistribDTO; +import com.sczx.order.dto.OrderDistribQueryReq; +import com.sczx.order.repository.OrderDistribRepo; +import com.sczx.order.service.OrderDistribService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +public class OrderDistribServiceImpl implements OrderDistribService { + + @Autowired + private OrderDistribRepo orderDistribRepo; + + @Override + public IPage pageQueryOrderDistrib(Integer pageNo, Integer pageSize, OrderDistribQueryReq orderDistribQueryReq) { + return orderDistribRepo.pageQueryOrderDistrib(pageNo, pageSize, orderDistribQueryReq); + } +} diff --git a/src/main/resources/mapper/OrderDistribMapper.xml b/src/main/resources/mapper/OrderDistribMapper.xml new file mode 100644 index 0000000..43fa9ef --- /dev/null +++ b/src/main/resources/mapper/OrderDistribMapper.xml @@ -0,0 +1,40 @@ + + + + + +