From 68b182ab510ef8d323ab8cb5f5ebc8bd108d19ca Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 29 八月 2024 13:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/point/CustomerPoint.java | 29 ++++++++++++++
src/main/表设计-二期.xlsx | 0
src/main/java/com/mzl/flower/mapper/point/CustomerPointMapper.java | 11 +++++
src/main/java/com/mzl/flower/web/point/CustomerPointController.java | 16 ++++++++
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 9 ++++
5 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java b/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java
new file mode 100644
index 0000000..75710eb
--- /dev/null
+++ b/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java
@@ -0,0 +1,29 @@
+package com.mzl.flower.entity.point;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("t_customer_point")
+public class CustomerPoint extends BaseAutoEntity {
+
+ @ApiModelProperty("名称")
+ private String userId;
+
+ @ApiModelProperty("联系人")
+ private Long customerId;
+
+ @ApiModelProperty("总积分")
+ private String totalPoint;
+
+ @ApiModelProperty("使用积分")
+ private String usedPoint;
+
+ @ApiModelProperty("过期积分")
+ private String expiredPoint;
+}
diff --git a/src/main/java/com/mzl/flower/mapper/point/CustomerPointMapper.java b/src/main/java/com/mzl/flower/mapper/point/CustomerPointMapper.java
new file mode 100644
index 0000000..8b62d5d
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/point/CustomerPointMapper.java
@@ -0,0 +1,11 @@
+package com.mzl.flower.mapper.point;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mzl.flower.entity.point.CustomerPoint;
+import com.mzl.flower.entity.supplier.Station;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CustomerPointMapper extends BaseMapper<CustomerPoint> {
+
+}
diff --git a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
new file mode 100644
index 0000000..2e5c744
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -0,0 +1,9 @@
+package com.mzl.flower.service.point;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class CustomerPointService {
+}
diff --git a/src/main/java/com/mzl/flower/web/point/CustomerPointController.java b/src/main/java/com/mzl/flower/web/point/CustomerPointController.java
new file mode 100644
index 0000000..3664ad8
--- /dev/null
+++ b/src/main/java/com/mzl/flower/web/point/CustomerPointController.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.web.point;
+
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/customer/point")
+@Api(value = "会员积分", tags = "会员积分")
+@Validated
+@Slf4j
+public class CustomerPointController {
+}
diff --git "a/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx" "b/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
index 57f66b2..7841603 100644
--- "a/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
+++ "b/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
Binary files differ
--
Gitblit v1.9.3