diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java index 5f25609c3..dd59b914b 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java @@ -8,6 +8,7 @@ import com.czg.market.vo.PpOrderListVO; import com.czg.market.vo.PpPackagePageReqVo; import com.czg.market.vo.PpPackageVO; import com.czg.order.dto.GbOrderQueryParam; +import com.czg.order.vo.GbOrderCountVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.utils.AssertUtil; @@ -122,4 +123,13 @@ public class PpPackageController { public CzgResult> getPackageOrderList(GbOrderQueryParam reqVo) { return CzgResult.success(ppPackageOrderService.queryOrderList(StpKit.USER.getShopId(), null, reqVo)); } + + /** + * 订单统计 + */ + @GetMapping("/order/stat") + @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order:stat", name = "订单统计") + public CzgResult getPackageOrderStat(GbOrderQueryParam reqVo) { + return CzgResult.success(ppPackageOrderService.orderCount(StpKit.USER.getShopId(), reqVo)); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpPackage.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpPackage.java index 36ceb70af..3b34acdda 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpPackage.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpPackage.java @@ -134,4 +134,9 @@ public class PpPackage implements Serializable { */ private Integer isDel; + /** + * 已售数量 + */ + private Integer saleNum; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java index 934ecf08a..83f2a1393 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java @@ -3,6 +3,7 @@ package com.czg.market.service; import com.czg.market.dto.PpPackageOrderDTO; import com.czg.market.vo.PpOrderListVO; import com.czg.order.dto.GbOrderQueryParam; +import com.czg.order.vo.GbOrderCountVO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.PpPackageOrder; @@ -35,6 +36,11 @@ public interface PpPackageOrderService extends IService { */ Page queryOrderList(Long shopId, Long userId, GbOrderQueryParam param); + /** + * 订单统计 + */ + GbOrderCountVO orderCount(Long shopId, GbOrderQueryParam param); + /** * 取消订单 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java index 1f575cdff..12d650223 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java @@ -177,4 +177,9 @@ public class PpPackageVO { */ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; + + /** + * 已售数量 + */ + private Integer saleNum; } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/PpPackageOrderMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/PpPackageOrderMapper.java index 511cfc6a9..3e9e97ba3 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/PpPackageOrderMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/PpPackageOrderMapper.java @@ -2,6 +2,7 @@ package com.czg.service.market.mapper; import com.czg.market.vo.PpOrderListVO; import com.czg.order.dto.GbOrderQueryParam; +import com.czg.order.vo.GbOrderCountVO; import com.mybatisflex.core.BaseMapper; import com.czg.market.entity.PpPackageOrder; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface PpPackageOrderMapper extends BaseMapper { List getOrderList(@Param("shopId") Long shopId, @Param("userId") Long userId, @Param("param") GbOrderQueryParam param); + + GbOrderCountVO getOrderCount(@Param("shopId") Long shopId, @Param("param") GbOrderQueryParam param); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java index a733b6653..548f6aa41 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java @@ -17,6 +17,7 @@ import com.czg.market.service.PpPackageService; import com.czg.market.vo.PpOrderListVO; import com.czg.market.vo.PpPackageVO; import com.czg.order.dto.GbOrderQueryParam; +import com.czg.order.vo.GbOrderCountVO; import com.czg.sa.StpKit; import com.czg.service.market.mapper.PpPackageOrderMapper; import com.czg.utils.CzgRandomUtils; @@ -147,6 +148,11 @@ public class PpPackageOrderServiceImpl extends ServiceImpl(result)); } + @Override + public GbOrderCountVO orderCount(Long shopId, GbOrderQueryParam param) { + return mapper.getOrderCount(shopId, param); + } + @Override @Transactional public boolean cancelOrder(Long orderId) { @@ -242,6 +248,10 @@ public class PpPackageOrderServiceImpl extends ServiceImpl + +