Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-08-29 68b182ab510ef8d323ab8cb5f5ebc8bd108d19ca

Merge remote-tracking branch 'origin/master-v2' into master-v2

 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;
}

 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> {

}

 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 {
}

 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 {
}

 src/main/表设计-二期.xlsx

Binary files differ