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 d180b4daa..af15f1988 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 @@ -119,7 +119,7 @@ public class PpPackageController { * 获取套餐推广订单列表 */ @GetMapping("/order") - @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "获取套餐推广订单列表") + @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "套餐推广订单列表") public CzgResult> getPackageOrderList(GbOrderQueryParam reqVo) { return CzgResult.success(ppPackageOrderService.queryOrderList(StpKit.USER.getShopId(), null, reqVo)); } @@ -128,7 +128,7 @@ public class PpPackageController { * 订单统计 */ @GetMapping("/order/stat") - @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order:stat", name = "订单统计") + @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", 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/vo/PpOrderListVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java index 53e18a868..0a05bbdac 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; /** @@ -69,6 +70,41 @@ public class PpOrderListVO { */ private BigDecimal price; + /** + * 最终支付金额 + */ + private BigDecimal finalPrice; + + /** + * 支付时间 + */ + private LocalDateTime payTime; + + /** + * 核销码 + */ + private String verifyCode; + + /** + * 核销时间 + */ + private LocalDateTime verifyTime; + + /** + * 用户头像 + */ + private String avatar; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户手机号 + */ + private String phone; + /** * 套餐图片 */ diff --git a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml index c3924ffb0..002948a9a 100644 --- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml @@ -6,13 +6,15 @@