Skip to content

向汉 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 82a96a78 82a96a78bf9d4f12e0e9a064800918669ec03fdb by xianghan
Options

1.update

1 parent bd7691dc
Expand all
Inline Side-by-side
Showing 241 changed files with 717 additions and 344 deletions
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
33 <!--代码生成器--> 33 <!--代码生成器-->
34 <dependency> 34 <dependency>
35 <groupId>com.topdraw</groupId> 35 <groupId>com.topdraw</groupId>
36 <artifactId>code-generator</artifactId> 36 <artifactId>cronos-system</artifactId>
37 <version>3.1.0</version> 37 <version>1.1.0</version>
38 </dependency> 38 </dependency>
39 39
40 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 --> 40 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 -->
......
1 package com.topdraw.business.module.common.domain;
2
3 import lombok.Data;
4 import lombok.experimental.Accessors;
5
6 import javax.persistence.Transient;
7
8 /**
9 * @author ：
10 * @description：
11 * @function :
12 * @date ：Created in 2022/2/10 10:12
13 * @version: ：
14 * @modified By：
15 * @since : modified in 2022/2/10 10:12
16 */
17 @Data
18 @Accessors(chain = true)
19 public class DefaultAsyncMqModule {
20
21 @Transient
22 private String memberCode;
23
24 }
1 package com.topdraw.business.basicdata.coupon.domain; 1 package com.topdraw.business.module.coupon.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.coupon.history.domain; 1 package com.topdraw.business.module.coupon.history.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
...@@ -11,6 +11,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; ...@@ -11,6 +11,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
11 import javax.persistence.*; 11 import javax.persistence.*;
12 import java.io.Serializable; 12 import java.io.Serializable;
13 import java.sql.Timestamp; 13 import java.sql.Timestamp;
14 import java.time.LocalDateTime;
14 15
15 /** 16 /**
16 * @author XiangHan 17 * @author XiangHan
...@@ -47,11 +48,11 @@ public class CouponHistory implements Serializable { ...@@ -47,11 +48,11 @@ public class CouponHistory implements Serializable {
47 48
48 // 领取时间 49 // 领取时间
49 @Column(name = "receive_time") 50 @Column(name = "receive_time")
50 private Timestamp receiveTime; 51 private LocalDateTime receiveTime;
51 52
52 // 失效时间 53 // 失效时间
53 @Column(name = "expire_time") 54 @Column(name = "expire_time")
54 private Timestamp expireTime; 55 private LocalDateTime expireTime;
55 56
56 // 使用状态 0：未使用；1：已使用；-1：已过期 57 // 使用状态 0：未使用；1：已使用；-1：已过期
57 @Column(name = "use_status") 58 @Column(name = "use_status")
...@@ -59,7 +60,7 @@ public class CouponHistory implements Serializable { ...@@ -59,7 +60,7 @@ public class CouponHistory implements Serializable {
59 60
60 // 使用时间 61 // 使用时间
61 @Column(name = "use_time") 62 @Column(name = "use_time")
62 private Timestamp useTime; 63 private LocalDateTime useTime;
63 64
64 // 订单详情id 65 // 订单详情id
65 @Column(name = "order_detail_id") 66 @Column(name = "order_detail_id")
...@@ -68,12 +69,12 @@ public class CouponHistory implements Serializable { ...@@ -68,12 +69,12 @@ public class CouponHistory implements Serializable {
68 // 创建时间 69 // 创建时间
69 @CreatedDate 70 @CreatedDate
70 @Column(name = "create_time") 71 @Column(name = "create_time")
71 private Timestamp createTime; 72 private LocalDateTime createTime;
72 73
73 // 更新时间 74 // 更新时间
74 @LastModifiedDate 75 @LastModifiedDate
75 @Column(name = "update_time") 76 @Column(name = "update_time")
76 private Timestamp updateTime; 77 private LocalDateTime updateTime;
77 78
78 public void copy(CouponHistory source){ 79 public void copy(CouponHistory source){
79 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); 80 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
......
1 package com.topdraw.business.basicdata.coupon.history.repository; 1 package com.topdraw.business.module.coupon.history.repository;
2 2
3 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 3 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
7 import java.sql.Timestamp; 7 import java.sql.Timestamp;
8 import java.time.LocalDateTime;
8 9
9 /** 10 /**
10 * @author XiangHan 11 * @author XiangHan
...@@ -14,7 +15,7 @@ public interface CouponHistoryRepository extends JpaRepository<CouponHistory, Lo ...@@ -14,7 +15,7 @@ public interface CouponHistoryRepository extends JpaRepository<CouponHistory, Lo
14 15
15 Long countByUserId(Long userId); 16 Long countByUserId(Long userId);
16 17
17 Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now); 18 Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
18 19
19 Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime); 20 Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
20 } 21 }
......
1 package com.topdraw.business.basicdata.coupon.history.rest; 1 package com.topdraw.business.module.coupon.history.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 4 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
5 import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService; 5 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
6 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class CouponHistoryController { ...@@ -36,7 +35,6 @@ public class CouponHistoryController {
36 return ResultInfo.success(CouponHistoryService.queryAll(criteria)); 35 return ResultInfo.success(CouponHistoryService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增CouponHistory") 39 @ApiOperation("新增CouponHistory")
42 public ResultInfo create(@Validated @RequestBody CouponHistory resources) { 40 public ResultInfo create(@Validated @RequestBody CouponHistory resources) {
...@@ -44,7 +42,6 @@ public class CouponHistoryController { ...@@ -44,7 +42,6 @@ public class CouponHistoryController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改CouponHistory") 46 @ApiOperation("修改CouponHistory")
50 public ResultInfo update(@Validated @RequestBody CouponHistory resources) { 47 public ResultInfo update(@Validated @RequestBody CouponHistory resources) {
...@@ -53,7 +50,6 @@ public class CouponHistoryController { ...@@ -53,7 +50,6 @@ public class CouponHistoryController {
53 } 50 }
54 51
55 52
56 @Log
57 @DeleteMapping(value = "/{id}") 53 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除CouponHistory") 54 @ApiOperation("删除CouponHistory")
59 public ResultInfo delete(@PathVariable Long id) { 55 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.coupon.history.service; 1 package com.topdraw.business.module.coupon.history.service;
2 2
3 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 3 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO; 4 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
5 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria; 5 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.sql.Timestamp; 8 import java.sql.Timestamp;
9 import java.time.LocalDateTime;
9 import java.util.List; 10 import java.util.List;
10 import java.util.Map; 11 import java.util.Map;
11 12
...@@ -45,7 +46,7 @@ public interface CouponHistoryService { ...@@ -45,7 +46,7 @@ public interface CouponHistoryService {
45 46
46 Long countByUserId(Long userId); 47 Long countByUserId(Long userId);
47 48
48 Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now); 49 Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
49 50
50 Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime); 51 Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
51 } 52 }
......
1 package com.topdraw.business.basicdata.coupon.history.service.dto; 1 package com.topdraw.business.module.coupon.history.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
5 import java.io.Serializable; 5 import java.io.Serializable;
6 import java.sql.Timestamp; 6 import java.sql.Timestamp;
7 import java.time.LocalDateTime;
7 8
8 9
9 /** 10 /**
...@@ -29,23 +30,23 @@ public class CouponHistoryDTO implements Serializable { ...@@ -29,23 +30,23 @@ public class CouponHistoryDTO implements Serializable {
29 private String userNickname; 30 private String userNickname;
30 31
31 // 领取时间 32 // 领取时间
32 private Timestamp receiveTime; 33 private LocalDateTime receiveTime;
33 34
34 // 失效时间 35 // 失效时间
35 private Timestamp expireTime; 36 private LocalDateTime expireTime;
36 37
37 // 使用状态 0：未使用；1：已使用；-1：已过期 38 // 使用状态 0：未使用；1：已使用；-1：已过期
38 private Integer useStatus; 39 private Integer useStatus;
39 40
40 // 使用时间 41 // 使用时间
41 private Timestamp useTime; 42 private LocalDateTime useTime;
42 43
43 // 订单详情id 44 // 订单详情id
44 private Long orderDetailId; 45 private Long orderDetailId;
45 46
46 // 创建时间 47 // 创建时间
47 private Timestamp createTime; 48 private LocalDateTime createTime;
48 49
49 // 更新时间 50 // 更新时间
50 private Timestamp updateTime; 51 private LocalDateTime updateTime;
51 } 52 }
......
1 package com.topdraw.business.basicdata.coupon.history.service.dto; 1 package com.topdraw.business.module.coupon.history.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.coupon.history.service.impl; 1 package com.topdraw.business.module.coupon.history.service.impl;
2 2
3 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 3 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import com.topdraw.business.basicdata.coupon.history.repository.CouponHistoryRepository; 4 import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository;
5 import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService; 5 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
6 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO; 6 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
7 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria; 7 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
8 import com.topdraw.business.basicdata.coupon.history.service.mapper.CouponHistoryMapper; 8 import com.topdraw.business.module.coupon.history.service.mapper.CouponHistoryMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.ValidationUtil; 11 import com.topdraw.utils.ValidationUtil;
...@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
19 import org.springframework.util.Assert; 19 import org.springframework.util.Assert;
20 20
21 import java.sql.Timestamp; 21 import java.sql.Timestamp;
22 import java.time.LocalDateTime;
22 import java.util.List; 23 import java.util.List;
23 import java.util.Map; 24 import java.util.Map;
24 25
...@@ -84,12 +85,12 @@ public class CouponHistoryServiceImpl implements CouponHistoryService { ...@@ -84,12 +85,12 @@ public class CouponHistoryServiceImpl implements CouponHistoryService {
84 } 85 }
85 86
86 @Override 87 @Override
87 public Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now) { 88 public Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now) {
88 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now); 89 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now);
89 } 90 }
90 91
91 @Override 92 @Override
92 public Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime) { 93 public Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime) {
93 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime); 94 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime);
94 } 95 }
95 96
......
1 package com.topdraw.business.basicdata.coupon.history.service.mapper; 1 package com.topdraw.business.module.coupon.history.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory; 4 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
5 import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO; 5 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.coupon.repository; 1 package com.topdraw.business.module.coupon.repository;
2 2
3 import com.topdraw.business.basicdata.coupon.domain.Coupon; 3 import com.topdraw.business.module.coupon.domain.Coupon;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.coupon.rest; 1 package com.topdraw.business.module.coupon.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.coupon.domain.Coupon;
4 import com.topdraw.business.basicdata.coupon.domain.Coupon; 4 import com.topdraw.business.module.coupon.service.CouponService;
5 import com.topdraw.business.basicdata.coupon.service.CouponService; 5 import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
6 import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class CouponController { ...@@ -36,7 +35,6 @@ public class CouponController {
36 return ResultInfo.success(CouponService.queryAll(criteria)); 35 return ResultInfo.success(CouponService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增Coupon") 39 @ApiOperation("新增Coupon")
42 public ResultInfo create(@Validated @RequestBody Coupon resources) { 40 public ResultInfo create(@Validated @RequestBody Coupon resources) {
...@@ -44,7 +42,6 @@ public class CouponController { ...@@ -44,7 +42,6 @@ public class CouponController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改Coupon") 46 @ApiOperation("修改Coupon")
50 public ResultInfo update(@Validated @RequestBody Coupon resources) { 47 public ResultInfo update(@Validated @RequestBody Coupon resources) {
...@@ -52,8 +49,6 @@ public class CouponController { ...@@ -52,8 +49,6 @@ public class CouponController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除Coupon") 53 @ApiOperation("删除Coupon")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.coupon.service; 1 package com.topdraw.business.module.coupon.service;
2 2
3 import com.topdraw.business.basicdata.coupon.domain.Coupon; 3 import com.topdraw.business.module.coupon.domain.Coupon;
4 import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO; 4 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
5 import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria; 5 import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.coupon.service.dto; 1 package com.topdraw.business.module.coupon.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.coupon.service.dto; 1 package com.topdraw.business.module.coupon.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.coupon.service.impl; 1 package com.topdraw.business.module.coupon.service.impl;
2 2
3 import com.topdraw.business.basicdata.coupon.domain.Coupon; 3 import com.topdraw.business.module.coupon.domain.Coupon;
4 import com.topdraw.business.basicdata.coupon.repository.CouponRepository; 4 import com.topdraw.business.module.coupon.repository.CouponRepository;
5 import com.topdraw.business.basicdata.coupon.service.CouponService; 5 import com.topdraw.business.module.coupon.service.CouponService;
6 import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO; 6 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
7 import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria; 7 import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
8 import com.topdraw.business.basicdata.coupon.service.mapper.CouponMapper; 8 import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.StringUtils; 11 import com.topdraw.utils.StringUtils;
......
1 package com.topdraw.business.basicdata.coupon.service.mapper; 1 package com.topdraw.business.module.coupon.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.coupon.domain.Coupon; 4 import com.topdraw.business.module.coupon.domain.Coupon;
5 import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO; 5 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.exp.detail.domain; 1 package com.topdraw.business.module.exp.detail.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.exp.detail.repository; 1 package com.topdraw.business.module.exp.detail.repository;
2 2
3 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 3 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.exp.detail.rest; 1 package com.topdraw.business.module.exp.detail.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
4 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 4 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
5 import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService; 5 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
6 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class ExpDetailController { ...@@ -36,7 +35,6 @@ public class ExpDetailController {
36 return ResultInfo.success(ExpDetailService.queryAll(criteria)); 35 return ResultInfo.success(ExpDetailService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增ExpDetail") 39 @ApiOperation("新增ExpDetail")
42 public ResultInfo create(@Validated @RequestBody ExpDetail resources) { 40 public ResultInfo create(@Validated @RequestBody ExpDetail resources) {
...@@ -44,7 +42,6 @@ public class ExpDetailController { ...@@ -44,7 +42,6 @@ public class ExpDetailController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改ExpDetail") 46 @ApiOperation("修改ExpDetail")
50 public ResultInfo update(@Validated @RequestBody ExpDetail resources) { 47 public ResultInfo update(@Validated @RequestBody ExpDetail resources) {
...@@ -52,8 +49,6 @@ public class ExpDetailController { ...@@ -52,8 +49,6 @@ public class ExpDetailController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除ExpDetail") 53 @ApiOperation("删除ExpDetail")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.exp.detail.service; 1 package com.topdraw.business.module.exp.detail.service;
2 2
3 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 3 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
4 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO; 4 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
5 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria; 5 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.exp.detail.service.dto; 1 package com.topdraw.business.module.exp.detail.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.exp.detail.service.dto; 1 package com.topdraw.business.module.exp.detail.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.exp.detail.service.impl; 1 package com.topdraw.business.module.exp.detail.service.impl;
2 2
3 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 3 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
4 import com.topdraw.business.basicdata.exp.detail.repository.ExpDetailRepository; 4 import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository;
5 import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService; 5 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
6 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO; 6 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
7 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria; 7 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
8 import com.topdraw.business.basicdata.exp.detail.service.mapper.ExpDetailMapper; 8 import com.topdraw.business.module.exp.detail.service.mapper.ExpDetailMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.StringUtils; 11 import com.topdraw.utils.StringUtils;
......
1 package com.topdraw.business.basicdata.exp.detail.service.mapper; 1 package com.topdraw.business.module.exp.detail.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail; 4 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
5 import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO; 5 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.exp.history.domain; 1 package com.topdraw.business.module.exp.history.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.exp.history.repository; 1 package com.topdraw.business.module.exp.history.repository;
2 2
3 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 3 import com.topdraw.business.module.exp.history.domain.ExpHistory;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.exp.history.rest; 1 package com.topdraw.business.module.exp.history.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.exp.history.domain.ExpHistory;
4 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 4 import com.topdraw.business.module.exp.history.service.ExpHistoryService;
5 import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService; 5 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
6 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class ExpHistoryController { ...@@ -36,7 +35,6 @@ public class ExpHistoryController {
36 return ResultInfo.success(ExpHistoryService.queryAll(criteria)); 35 return ResultInfo.success(ExpHistoryService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增ExpHistory") 39 @ApiOperation("新增ExpHistory")
42 public ResultInfo create(@Validated @RequestBody ExpHistory resources) { 40 public ResultInfo create(@Validated @RequestBody ExpHistory resources) {
...@@ -44,7 +42,6 @@ public class ExpHistoryController { ...@@ -44,7 +42,6 @@ public class ExpHistoryController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改ExpHistory") 46 @ApiOperation("修改ExpHistory")
50 public ResultInfo update(@Validated @RequestBody ExpHistory resources) { 47 public ResultInfo update(@Validated @RequestBody ExpHistory resources) {
...@@ -52,8 +49,6 @@ public class ExpHistoryController { ...@@ -52,8 +49,6 @@ public class ExpHistoryController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除ExpHistory") 53 @ApiOperation("删除ExpHistory")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.exp.history.service; 1 package com.topdraw.business.module.exp.history.service;
2 2
3 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 3 import com.topdraw.business.module.exp.history.domain.ExpHistory;
4 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO; 4 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
5 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria; 5 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.exp.history.service.dto; 1 package com.topdraw.business.module.exp.history.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.exp.history.service.dto; 1 package com.topdraw.business.module.exp.history.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.exp.history.service.impl; 1 package com.topdraw.business.module.exp.history.service.impl;
2 2
3 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 3 import com.topdraw.business.module.exp.history.domain.ExpHistory;
4 import com.topdraw.business.basicdata.exp.history.repository.ExpHistoryRepository; 4 import com.topdraw.business.module.exp.history.repository.ExpHistoryRepository;
5 import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService; 5 import com.topdraw.business.module.exp.history.service.ExpHistoryService;
6 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO; 6 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
7 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria; 7 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
8 import com.topdraw.business.basicdata.exp.history.service.mapper.ExpHistoryMapper; 8 import com.topdraw.business.module.exp.history.service.mapper.ExpHistoryMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.StringUtils; 11 import com.topdraw.utils.StringUtils;
......
1 package com.topdraw.business.basicdata.exp.history.service.mapper; 1 package com.topdraw.business.module.exp.history.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.exp.history.domain.ExpHistory; 4 import com.topdraw.business.module.exp.history.domain.ExpHistory;
5 import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO; 5 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.member.address.domain; 1 package com.topdraw.business.module.member.address.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.member.address.repository; 1 package com.topdraw.business.module.member.address.repository;
2 2
3 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 3 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.member.address.rest; 1 package com.topdraw.business.module.member.address.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 4 import com.topdraw.business.module.member.address.service.MemberAddressService;
5 import com.topdraw.business.basicdata.member.address.service.MemberAddressService; 5 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
6 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class MemberAddressController { ...@@ -36,7 +35,6 @@ public class MemberAddressController {
36 return ResultInfo.success(MemberAddressService.findById(id)); 35 return ResultInfo.success(MemberAddressService.findById(id));
37 } 36 }
38 37
39 @Log
40 @PostMapping(value = "/create") 38 @PostMapping(value = "/create")
41 @ApiOperation("新增MemberAddress") 39 @ApiOperation("新增MemberAddress")
42 public ResultInfo create(@Validated @RequestBody MemberAddress resources) { 40 public ResultInfo create(@Validated @RequestBody MemberAddress resources) {
...@@ -44,7 +42,6 @@ public class MemberAddressController { ...@@ -44,7 +42,6 @@ public class MemberAddressController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping(value = "/update") 45 @PutMapping(value = "/update")
49 @ApiOperation("修改MemberAddress") 46 @ApiOperation("修改MemberAddress")
50 public ResultInfo update(@Validated @RequestBody MemberAddress resources) { 47 public ResultInfo update(@Validated @RequestBody MemberAddress resources) {
...@@ -52,7 +49,6 @@ public class MemberAddressController { ...@@ -52,7 +49,6 @@ public class MemberAddressController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55 @Log
56 @DeleteMapping(value = "/delete/{id}") 52 @DeleteMapping(value = "/delete/{id}")
57 @ApiOperation("删除MemberAddress") 53 @ApiOperation("删除MemberAddress")
58 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.member.address.service; 1 package com.topdraw.business.module.member.address.service;
2 2
3 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 3 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO; 4 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
5 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria; 5 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.member.address.service.dto; 1 package com.topdraw.business.module.member.address.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.member.address.service.dto; 1 package com.topdraw.business.module.member.address.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.topdraw.business.basicdata.member.address.service.impl; 1 package com.topdraw.business.module.member.address.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 3 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import com.topdraw.business.basicdata.member.address.repository.MemberAddressRepository; 4 import com.topdraw.business.module.member.address.repository.MemberAddressRepository;
5 import com.topdraw.business.basicdata.member.address.service.MemberAddressService; 5 import com.topdraw.business.module.member.address.service.MemberAddressService;
6 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO; 6 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
7 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria; 7 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
8 import com.topdraw.business.basicdata.member.address.service.mapper.MemberAddressMapper; 8 import com.topdraw.business.module.member.address.service.mapper.MemberAddressMapper;
9 import com.topdraw.business.basicdata.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
10 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
11 import com.topdraw.utils.PageUtil; 11 import com.topdraw.utils.PageUtil;
12 import com.topdraw.utils.QueryHelp; 12 import com.topdraw.utils.QueryHelp;
13 import com.topdraw.utils.ValidationUtil; 13 import com.topdraw.utils.ValidationUtil;
...@@ -63,6 +63,9 @@ public class MemberAddressServiceImpl implements MemberAddressService { ...@@ -63,6 +63,9 @@ public class MemberAddressServiceImpl implements MemberAddressService {
63 @Transactional(rollbackFor = Exception.class) 63 @Transactional(rollbackFor = Exception.class)
64 public void create(MemberAddress resources) { 64 public void create(MemberAddress resources) {
65 String memberCode = resources.getMemberCode(); 65 String memberCode = resources.getMemberCode();
66 MemberDTO memberDTO = this.memberService.getByCode(memberCode);
67 Long id = memberDTO.getId();
68 resources.setMemberId(id);
66 MemberAddressRepository.save(resources); 69 MemberAddressRepository.save(resources);
67 } 70 }
68 71
......
1 package com.topdraw.business.basicdata.member.address.service.mapper; 1 package com.topdraw.business.module.member.address.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.member.address.domain.MemberAddress; 4 import com.topdraw.business.module.member.address.domain.MemberAddress;
5 import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO; 5 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.member.domain; 1 package com.topdraw.business.module.member.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
...@@ -116,17 +116,17 @@ public class Member implements Serializable { ...@@ -116,17 +116,17 @@ public class Member implements Serializable {
116 116
117 // iptv账号绑定时间 117 // iptv账号绑定时间
118 @Column(name = "bind_iptv_time") 118 @Column(name = "bind_iptv_time")
119 private Timestamp bindIptvTime; 119 private LocalDateTime bindIptvTime;
120 120
121 // 创建时间 121 // 创建时间
122 @CreatedDate 122 @CreatedDate
123 @Column(name = "create_time") 123 @Column(name = "create_time")
124 private Timestamp createTime; 124 private LocalDateTime createTime;
125 125
126 // 更新时间 126 // 更新时间
127 @LastModifiedDate 127 @LastModifiedDate
128 @Column(name = "update_time") 128 @Column(name = "update_time")
129 private Timestamp updateTime; 129 private LocalDateTime updateTime;
130 130
131 // 是否在黑名单 1：是；0否 131 // 是否在黑名单 1：是；0否
132 @Column(name = "black_status") 132 @Column(name = "black_status")
......
1 package com.topdraw.business.basicdata.member.level.domain; 1 package com.topdraw.business.module.member.level.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.member.level.repository; 1 package com.topdraw.business.module.member.level.repository;
2 2
3 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 3 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.member.level.rest; 1 package com.topdraw.business.module.member.level.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 4 import com.topdraw.business.module.member.level.service.MemberLevelService;
5 import com.topdraw.business.basicdata.member.level.service.MemberLevelService; 5 import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
6 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class MemberLevelController { ...@@ -36,7 +35,6 @@ public class MemberLevelController {
36 return ResultInfo.success(MemberLevelService.queryAll(criteria)); 35 return ResultInfo.success(MemberLevelService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增MemberLevel") 39 @ApiOperation("新增MemberLevel")
42 public ResultInfo create(@Validated @RequestBody MemberLevel resources) { 40 public ResultInfo create(@Validated @RequestBody MemberLevel resources) {
...@@ -44,7 +42,6 @@ public class MemberLevelController { ...@@ -44,7 +42,6 @@ public class MemberLevelController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改MemberLevel") 46 @ApiOperation("修改MemberLevel")
50 public ResultInfo update(@Validated @RequestBody MemberLevel resources) { 47 public ResultInfo update(@Validated @RequestBody MemberLevel resources) {
...@@ -52,8 +49,6 @@ public class MemberLevelController { ...@@ -52,8 +49,6 @@ public class MemberLevelController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除MemberLevel") 53 @ApiOperation("删除MemberLevel")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.member.level.service; 1 package com.topdraw.business.module.member.level.service;
2 2
3 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 3 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO; 4 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
5 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria; 5 import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.member.level.service.dto; 1 package com.topdraw.business.module.member.level.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.member.level.service.dto; 1 package com.topdraw.business.module.member.level.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.member.level.service.impl; 1 package com.topdraw.business.module.member.level.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 3 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import com.topdraw.business.basicdata.member.level.repository.MemberLevelRepository; 4 import com.topdraw.business.module.member.level.repository.MemberLevelRepository;
5 import com.topdraw.business.basicdata.member.level.service.MemberLevelService; 5 import com.topdraw.business.module.member.level.service.MemberLevelService;
6 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO; 6 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
7 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria; 7 import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
8 import com.topdraw.business.basicdata.member.level.service.mapper.MemberLevelMapper; 8 import com.topdraw.business.module.member.level.service.mapper.MemberLevelMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.StringUtils; 11 import com.topdraw.utils.StringUtils;
......
1 package com.topdraw.business.basicdata.member.level.service.mapper; 1 package com.topdraw.business.module.member.level.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.member.level.domain.MemberLevel; 4 import com.topdraw.business.module.member.level.domain.MemberLevel;
5 import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO; 5 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.member.profile.domain; 1 package com.topdraw.business.module.member.profile.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.member.profile.repository; 1 package com.topdraw.business.module.member.profile.repository;
2 2
3 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 3 import com.topdraw.business.module.member.profile.domain.MemberProfile;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
7 import java.util.Optional;
8
7 /** 9 /**
8 * @author XiangHan 10 * @author XiangHan
9 * @date 2021-10-22 11 * @date 2021-10-22
......
1 package com.topdraw.business.basicdata.member.profile.rest; 1 package com.topdraw.business.module.member.profile.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.member.profile.domain.MemberProfile;
4 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 4 import com.topdraw.business.module.member.profile.service.MemberProfileService;
5 import com.topdraw.business.basicdata.member.profile.service.MemberProfileService; 5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
6 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class MemberProfileController { ...@@ -36,7 +35,6 @@ public class MemberProfileController {
36 return ResultInfo.success(MemberProfileService.queryAll(criteria)); 35 return ResultInfo.success(MemberProfileService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增MemberProfile") 39 @ApiOperation("新增MemberProfile")
42 public ResultInfo create(@Validated @RequestBody MemberProfile resources) { 40 public ResultInfo create(@Validated @RequestBody MemberProfile resources) {
...@@ -44,7 +42,6 @@ public class MemberProfileController { ...@@ -44,7 +42,6 @@ public class MemberProfileController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改MemberProfile") 46 @ApiOperation("修改MemberProfile")
50 public ResultInfo update(@Validated @RequestBody MemberProfile resources) { 47 public ResultInfo update(@Validated @RequestBody MemberProfile resources) {
...@@ -52,8 +49,6 @@ public class MemberProfileController { ...@@ -52,8 +49,6 @@ public class MemberProfileController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除MemberProfile") 53 @ApiOperation("删除MemberProfile")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.member.profile.service; 1 package com.topdraw.business.module.member.profile.service;
2 2
3 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 3 import com.topdraw.business.module.member.profile.domain.MemberProfile;
4 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO; 4 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
5 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria; 5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
...@@ -36,7 +36,7 @@ public interface MemberProfileService { ...@@ -36,7 +36,7 @@ public interface MemberProfileService {
36 */ 36 */
37 MemberProfileDTO findById(Long id); 37 MemberProfileDTO findById(Long id);
38 38
39 void create(MemberProfile resources); 39 MemberProfile create(MemberProfile resources);
40 40
41 void update(MemberProfile resources); 41 void update(MemberProfile resources);
42 42
......
1 package com.topdraw.business.basicdata.member.profile.service.dto; 1 package com.topdraw.business.module.member.profile.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
5 import javax.persistence.Column;
6 import java.io.Serializable; 5 import java.io.Serializable;
7 import java.sql.Timestamp; 6 import java.sql.Timestamp;
8 7
......
1 package com.topdraw.business.basicdata.member.profile.service.dto; 1 package com.topdraw.business.module.member.profile.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.member.profile.service.impl; 1 package com.topdraw.business.module.member.profile.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 3 import com.topdraw.business.module.member.profile.domain.MemberProfile;
4 import com.topdraw.business.basicdata.member.profile.repository.MemberProfileRepository; 4 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
5 import com.topdraw.business.basicdata.member.profile.service.MemberProfileService; 5 import com.topdraw.business.module.member.profile.service.MemberProfileService;
6 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO; 6 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
7 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria; 7 import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
8 import com.topdraw.business.basicdata.member.profile.service.mapper.MemberProfileMapper; 8 import com.topdraw.business.module.member.profile.service.mapper.MemberProfileMapper;
9 import com.topdraw.business.basicdata.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
10 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
11 import com.topdraw.utils.PageUtil; 11 import com.topdraw.utils.PageUtil;
12 import com.topdraw.utils.QueryHelp; 12 import com.topdraw.utils.QueryHelp;
13 import com.topdraw.utils.StringUtils; 13 import com.topdraw.utils.StringUtils;
...@@ -61,7 +61,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -61,7 +61,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
61 61
62 @Override 62 @Override
63 @Transactional(rollbackFor = Exception.class) 63 @Transactional(rollbackFor = Exception.class)
64 public void create(MemberProfile resources) { 64 public MemberProfile create(MemberProfile resources) {
65 String memberCode = resources.getMemberCode(); 65 String memberCode = resources.getMemberCode();
66 MemberDTO memberDTO = this.memberService.getByCode(memberCode); 66 MemberDTO memberDTO = this.memberService.getByCode(memberCode);
67 if (Objects.nonNull(memberDTO)) { 67 if (Objects.nonNull(memberDTO)) {
...@@ -73,6 +73,8 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -73,6 +73,8 @@ public class MemberProfileServiceImpl implements MemberProfileService {
73 MemberProfileRepository.save(resources); 73 MemberProfileRepository.save(resources);
74 } 74 }
75 } 75 }
76
77 return resources;
76 } 78 }
77 79
78 @Override 80 @Override
......
1 package com.topdraw.business.basicdata.member.profile.service.mapper; 1 package com.topdraw.business.module.member.profile.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.member.profile.domain.MemberProfile; 4 import com.topdraw.business.module.member.profile.domain.MemberProfile;
5 import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO; 5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.member.relatedinfo.domain; 1 package com.topdraw.business.module.member.relatedinfo.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.member.relatedinfo.repository; 1 package com.topdraw.business.module.member.relatedinfo.repository;
2 2
3 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
4 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
5 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
6 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
7 6
8 import java.util.List; 7 import java.util.List;
9 import java.util.Optional;
10 8
11 /** 9 /**
12 * @author XiangHan 10 * @author XiangHan
......
1 package com.topdraw.business.basicdata.member.relatedinfo.rest; 1 package com.topdraw.business.module.member.relatedinfo.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
4 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 4 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
5 import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService; 5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
6 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -30,7 +29,6 @@ public class MemberRelatedInfoController { ...@@ -30,7 +29,6 @@ public class MemberRelatedInfoController {
30 return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable)); 29 return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable));
31 } 30 }
32 31
33 @Log
34 @PostMapping(value = "/create") 32 @PostMapping(value = "/create")
35 @ApiOperation("新增MemberRelatedInfo") 33 @ApiOperation("新增MemberRelatedInfo")
36 public ResultInfo create(@Validated @RequestBody MemberRelatedInfo resources) { 34 public ResultInfo create(@Validated @RequestBody MemberRelatedInfo resources) {
...@@ -38,7 +36,6 @@ public class MemberRelatedInfoController { ...@@ -38,7 +36,6 @@ public class MemberRelatedInfoController {
38 return ResultInfo.success(); 36 return ResultInfo.success();
39 } 37 }
40 38
41 @Log
42 @PutMapping(value = "/update") 39 @PutMapping(value = "/update")
43 @ApiOperation("修改MemberRelatedInfo") 40 @ApiOperation("修改MemberRelatedInfo")
44 public ResultInfo update(@Validated @RequestBody MemberRelatedInfo resources) { 41 public ResultInfo update(@Validated @RequestBody MemberRelatedInfo resources) {
...@@ -52,7 +49,6 @@ public class MemberRelatedInfoController { ...@@ -52,7 +49,6 @@ public class MemberRelatedInfoController {
52 return ResultInfo.success(MemberRelatedInfoService.findById(id)); 49 return ResultInfo.success(MemberRelatedInfoService.findById(id));
53 } 50 }
54 51
55 @Log
56 @DeleteMapping(value = "/delete//{id}") 52 @DeleteMapping(value = "/delete//{id}")
57 @ApiOperation("删除MemberRelatedInfo") 53 @ApiOperation("删除MemberRelatedInfo")
58 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.basicdata.member.relatedinfo.service; 1 package com.topdraw.business.module.member.relatedinfo.service;
2 2
3 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
4 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 4 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
5 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria; 5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.member.relatedinfo.service.dto; 1 package com.topdraw.business.module.member.relatedinfo.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.member.relatedinfo.service.dto; 1 package com.topdraw.business.module.member.relatedinfo.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.topdraw.business.basicdata.member.relatedinfo.service.impl; 1 package com.topdraw.business.module.member.relatedinfo.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
4 import com.topdraw.business.basicdata.member.relatedinfo.repository.MemberRelatedInfoRepository; 4 import com.topdraw.business.module.member.relatedinfo.repository.MemberRelatedInfoRepository;
5 import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService; 5 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
6 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 6 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
7 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria; 7 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
8 import com.topdraw.business.basicdata.member.relatedinfo.service.mapper.MemberRelatedInfoMapper; 8 import com.topdraw.business.module.member.relatedinfo.service.mapper.MemberRelatedInfoMapper;
9 import com.topdraw.business.basicdata.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
10 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
11 import com.topdraw.utils.PageUtil; 11 import com.topdraw.utils.PageUtil;
12 import com.topdraw.utils.QueryHelp; 12 import com.topdraw.utils.QueryHelp;
13 import com.topdraw.utils.ValidationUtil; 13 import com.topdraw.utils.ValidationUtil;
...@@ -24,7 +24,6 @@ import org.springframework.util.CollectionUtils; ...@@ -24,7 +24,6 @@ import org.springframework.util.CollectionUtils;
24 import java.util.List; 24 import java.util.List;
25 import java.util.Map; 25 import java.util.Map;
26 import java.util.Objects; 26 import java.util.Objects;
27 import java.util.Optional;
28 27
29 /** 28 /**
30 * @author XiangHan 29 * @author XiangHan
......
1 package com.topdraw.business.basicdata.member.relatedinfo.service.mapper; 1 package com.topdraw.business.module.member.relatedinfo.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo; 4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.member.repository; 1 package com.topdraw.business.module.member.repository;
2 2
3 import com.topdraw.business.basicdata.member.domain.Member; 3 import com.topdraw.business.module.member.domain.Member;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 import org.springframework.data.jpa.repository.Modifying; 6 import org.springframework.data.jpa.repository.Modifying;
......
1 package com.topdraw.business.basicdata.member.rest; 1 package com.topdraw.business.module.member.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.basicdata.member.domain.Member; 4 import com.topdraw.business.module.member.service.MemberService;
5 import com.topdraw.business.basicdata.member.service.MemberService; 5 import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
6 import com.topdraw.business.basicdata.member.service.dto.MemberQueryCriteria;
7 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
8 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -36,7 +35,6 @@ public class MemberController { ...@@ -36,7 +35,6 @@ public class MemberController {
36 return ResultInfo.success(memberService.findById(id)); 35 return ResultInfo.success(memberService.findById(id));
37 } 36 }
38 37
39 @Log
40 @PostMapping(value = "/create") 38 @PostMapping(value = "/create")
41 @ApiOperation("新增Member") 39 @ApiOperation("新增Member")
42 public ResultInfo create(@Validated @RequestBody Member resources) { 40 public ResultInfo create(@Validated @RequestBody Member resources) {
...@@ -44,7 +42,6 @@ public class MemberController { ...@@ -44,7 +42,6 @@ public class MemberController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping(value = "/update") 45 @PutMapping(value = "/update")
49 @ApiOperation("修改Member") 46 @ApiOperation("修改Member")
50 public ResultInfo update(@Validated @RequestBody Member resources) { 47 public ResultInfo update(@Validated @RequestBody Member resources) {
......
1 package com.topdraw.business.basicdata.member.service; 1 package com.topdraw.business.module.member.service;
2 2
3 import com.topdraw.business.basicdata.member.domain.Member; 3 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 4 import com.topdraw.business.module.member.service.dto.MemberDTO;
5 import com.topdraw.business.basicdata.member.service.dto.MemberQueryCriteria; 5 import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
6 import com.topdraw.business.basicdata.user.iptv.domain.UserTv; 6 import com.topdraw.business.module.user.iptv.domain.UserTv;
7 import org.springframework.data.domain.Pageable; 7 import org.springframework.data.domain.Pageable;
8 import org.springframework.transaction.annotation.Transactional;
8 9
9 import java.util.List; 10 import java.util.List;
10 import java.util.Map; 11 import java.util.Map;
...@@ -39,6 +40,8 @@ public interface MemberService { ...@@ -39,6 +40,8 @@ public interface MemberService {
39 40
40 Long create(Member resources); 41 Long create(Member resources);
41 42
43 void unbind(Member resources);
44
42 void update(Member resources); 45 void update(Member resources);
43 46
44 void delete(Long id); 47 void delete(Long id);
...@@ -53,4 +56,6 @@ public interface MemberService { ...@@ -53,4 +56,6 @@ public interface MemberService {
53 boolean createMemberByUserTv(UserTv resources); 56 boolean createMemberByUserTv(UserTv resources);
54 57
55 void doUpdateMemberPoints(Member member); 58 void doUpdateMemberPoints(Member member);
59
60 Member createAndReturnMember(Member resources);
56 } 61 }
......
1 package com.topdraw.business.basicdata.member.service.dto; 1 package com.topdraw.business.module.member.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
...@@ -78,13 +78,13 @@ public class MemberDTO implements Serializable { ...@@ -78,13 +78,13 @@ public class MemberDTO implements Serializable {
78 private Integer bindIptvPlatformType; 78 private Integer bindIptvPlatformType;
79 79
80 // iptv账号绑定时间 80 // iptv账号绑定时间
81 private Timestamp bindIptvTime; 81 private LocalDateTime bindIptvTime;
82 82
83 // 创建时间 83 // 创建时间
84 private Timestamp createTime; 84 private LocalDateTime createTime;
85 85
86 // 更新时间 86 // 更新时间
87 private Timestamp updateTime; 87 private LocalDateTime updateTime;
88 88
89 // 是否在黑名单 1：是；0否 89 // 是否在黑名单 1：是；0否
90 // private Integer blackStatus; 90 // private Integer blackStatus;
......
1 package com.topdraw.business.basicdata.member.service.dto; 1 package com.topdraw.business.module.member.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.topdraw.business.basicdata.member.service.impl; 1 package com.topdraw.business.module.member.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.domain.Member; 3 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.basicdata.member.repository.MemberRepository; 4 import com.topdraw.business.module.member.repository.MemberRepository;
5 import com.topdraw.business.basicdata.member.service.MemberService; 5 import com.topdraw.business.module.member.service.MemberService;
6 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 6 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.business.basicdata.member.service.dto.MemberQueryCriteria; 7 import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
8 import com.topdraw.business.basicdata.member.service.mapper.MemberMapper; 8 import com.topdraw.business.module.member.service.mapper.MemberMapper;
9 import com.topdraw.business.basicdata.user.iptv.domain.UserTv; 9 import com.topdraw.business.module.user.iptv.domain.UserTv;
10 import com.topdraw.business.basicdata.user.iptv.service.UserTvService; 10 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
11 import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvDTO;
12 import com.topdraw.config.LocalConstants; 11 import com.topdraw.config.LocalConstants;
13 import com.topdraw.util.IdWorker; 12 import com.topdraw.util.IdWorker;
14 import com.topdraw.util.RedissonUtil; 13 import com.topdraw.util.RedissonUtil;
...@@ -22,6 +21,7 @@ import org.redisson.api.RLock; ...@@ -22,6 +21,7 @@ import org.redisson.api.RLock;
22 import org.redisson.api.RedissonClient; 21 import org.redisson.api.RedissonClient;
23 import org.springframework.beans.BeanUtils; 22 import org.springframework.beans.BeanUtils;
24 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.context.annotation.Bean;
25 import org.springframework.dao.EmptyResultDataAccessException; 25 import org.springframework.dao.EmptyResultDataAccessException;
26 import org.springframework.data.domain.Page; 26 import org.springframework.data.domain.Page;
27 import org.springframework.data.domain.Pageable; 27 import org.springframework.data.domain.Pageable;
...@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Propagation;
30 import org.springframework.transaction.annotation.Transactional; 30 import org.springframework.transaction.annotation.Transactional;
31 import org.springframework.util.Assert; 31 import org.springframework.util.Assert;
32 32
33 import java.time.LocalDateTime;
33 import java.util.List; 34 import java.util.List;
34 import java.util.Map; 35 import java.util.Map;
35 import java.util.Objects; 36 import java.util.Objects;
...@@ -50,7 +51,7 @@ public class MemberServiceImpl implements MemberService { ...@@ -50,7 +51,7 @@ public class MemberServiceImpl implements MemberService {
50 private MemberMapper memberMapper; 51 private MemberMapper memberMapper;
51 52
52 @Autowired 53 @Autowired
53 private com.topdraw.business.basicdata.user.iptv.service.UserTvService UserTvService; 54 private com.topdraw.business.module.user.iptv.service.UserTvService UserTvService;
54 55
55 @Autowired 56 @Autowired
56 private RedissonClient redissonClient; 57 private RedissonClient redissonClient;
...@@ -105,14 +106,31 @@ public class MemberServiceImpl implements MemberService { ...@@ -105,14 +106,31 @@ public class MemberServiceImpl implements MemberService {
105 return member; 106 return member;
106 } 107 }
107 108
109 @Override
110 @Transactional(rollbackFor = Exception.class)
111 public void unbind(Member resources) {
112 try {
113 String code = resources.getCode();
114 MemberDTO memberDTO = this.getByCode(code);
115 // Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
116 ValidationUtil.isNull(memberDTO.getId(), "Member", "id", resources.getId());
117 Member member = new Member();
118 BeanUtils.copyProperties(memberDTO,member);
108 119
120 member.setUserIptvId(null);
121 member.setBindIptvTime(null);
122 member.setBindIptvPlatformType(null);
123 this.save(member);
124 } catch (Exception e) {
125 e.printStackTrace();
126 throw e;
127 }
128 }
109 129
110 @Override 130 @Override
111 @Transactional(rollbackFor = Exception.class) 131 @Transactional(rollbackFor = Exception.class)
112 public void update(Member resources) { 132 public void update(Member resources) {
113 RLock rLock = this.redissonClient.getLock("Member::update::code" + resources.getCode());
114 try { 133 try {
115 RedissonUtil.lock(rLock);
116 Member member = memberRepository.findByCode(resources.getCode()).orElseGet(Member::new); 134 Member member = memberRepository.findByCode(resources.getCode()).orElseGet(Member::new);
117 ValidationUtil.isNull( member.getId(),"Member","id",member.getId()); 135 ValidationUtil.isNull( member.getId(),"Member","id",member.getId());
118 if (Objects.nonNull(member)) { 136 if (Objects.nonNull(member)) {
...@@ -121,21 +139,24 @@ public class MemberServiceImpl implements MemberService { ...@@ -121,21 +139,24 @@ public class MemberServiceImpl implements MemberService {
121 139
122 String platformAccount = resources.getPlatformAccount(); 140 String platformAccount = resources.getPlatformAccount();
123 if (StringUtils.isNotEmpty(platformAccount)) { 141 if (StringUtils.isNotEmpty(platformAccount)) {
142 resources.setUserIptvId(null);
143
124 UserTvDTO userTvDTO = this.UserTvService.findByPlatformAccount(platformAccount); 144 UserTvDTO userTvDTO = this.UserTvService.findByPlatformAccount(platformAccount);
125 if (Objects.nonNull(userTvDTO)) { 145 if (Objects.nonNull(userTvDTO)) {
126 Long userIptvId = userTvDTO.getId(); 146 Long userIptvId = userTvDTO.getId();
127 resources.setUserIptvId(userIptvId); 147 resources.setUserIptvId(userIptvId);
148 resources.setBindIptvPlatformType(1);
149 resources.setBindIptvTime(LocalDateTime.now());
128 } 150 }
129 } 151 }
130 } 152 }
131 153
132 member.copy(resources); 154 member.copy(resources);
155 log.info("memberService ==>> update ==>> [{}]",member);
133 memberRepository.save(member); 156 memberRepository.save(member);
134 } catch (Exception e) { 157 } catch (Exception e) {
135 e.printStackTrace(); 158 e.printStackTrace();
136 throw e; 159 throw e;
137 } finally {
138 RedissonUtil.unlock(rLock);
139 } 160 }
140 } 161 }
141 162
...@@ -186,7 +207,7 @@ public class MemberServiceImpl implements MemberService { ...@@ -186,7 +207,7 @@ public class MemberServiceImpl implements MemberService {
186 if (Objects.nonNull(userIptvId)) { 207 if (Objects.nonNull(userIptvId)) {
187 member.setId(memberId); 208 member.setId(memberId);
188 member.setUserIptvId(userIptvId); 209 member.setUserIptvId(userIptvId);
189 member.setBindIptvTime(TimestampUtil.now()); 210 member.setBindIptvTime(LocalDateTime.now());
190 this.bindIptvId(member); 211 this.bindIptvId(member);
191 } 212 }
192 } 213 }
...@@ -216,10 +237,17 @@ public class MemberServiceImpl implements MemberService { ...@@ -216,10 +237,17 @@ public class MemberServiceImpl implements MemberService {
216 } 237 }
217 } 238 }
218 239
219 private void save(Member member){ 240 @Override
241 @Transactional(rollbackFor = Exception.class)
242 public Member createAndReturnMember(Member resources) {
243 Member member = this.checkMemberData(resources);
220 memberRepository.save(member); 244 memberRepository.save(member);
245 return resources;
221 } 246 }
222 247
248 private void save(Member member){
249 memberRepository.save(member);
250 }
223 251
224 public void bindIptvId(Member resources) { 252 public void bindIptvId(Member resources) {
225 RLock rLock = this.redissonClient.getLock("Member::update::code::" + resources.getCode()); 253 RLock rLock = this.redissonClient.getLock("Member::update::code::" + resources.getCode());
......
1 package com.topdraw.business.basicdata.member.service.mapper; 1 package com.topdraw.business.module.member.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 5 import com.topdraw.business.module.member.service.dto.MemberDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.module.member.viphistory.domain;
2
3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions;
5 import lombok.Data;
6 import lombok.experimental.Accessors;
7 import org.springframework.data.annotation.CreatedDate;
8 import org.springframework.data.annotation.LastModifiedDate;
9 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
10
11 import javax.persistence.*;
12 import java.io.Serializable;
13 import java.sql.Timestamp;
14 import java.time.LocalDateTime;
15
16 /**
17 * @author luerlong
18 * @date 2021-12-10
19 */
20 @Entity
21 @Data
22 @EntityListeners(AuditingEntityListener.class)
23 @Accessors(chain = true)
24 @Table(name="uc_member_vip_history")
25 public class MemberVipHistory implements Serializable {
26
27 // 主键
28 @Id
29 @GeneratedValue(strategy = GenerationType.IDENTITY)
30 @Column(name = "id")
31 private Long id;
32
33 // 会员id
34 @Column(name = "member_id")
35 private Long memberId;
36
37 // 会员vip等级
38 @Column(name = "vip")
39 private Integer vip;
40
41 // 修改之前vip等级
42 @Column(name = "before_vip")
43 private Integer beforeVip;
44
45 // vip失效时间
46 @Column(name = "vip_expire_time")
47 private LocalDateTime vipExpireTime;
48
49 // 状态 1正常 0已过期
50 @Column(name = "status")
51 private Integer status;
52
53 // 创建时间
54 @CreatedDate
55 @Column(name = "create_time")
56 private Timestamp createTime;
57
58 // 修改时间
59 @LastModifiedDate
60 @Column(name = "update_time")
61 private Timestamp updateTime;
62
63 public void copy(MemberVipHistory source){
64 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
65 }
66 }
1 package com.topdraw.business.module.member.viphistory.repository;
2
3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 import org.springframework.data.jpa.repository.Query;
7
8 import java.time.LocalDateTime;
9 import java.util.Optional;
10
11 /**
12 * @author luerlong
13 * @date 2021-12-10
14 */
15 public interface MemberVipHistoryRepository extends JpaRepository<MemberVipHistory, Long>, JpaSpecificationExecutor<MemberVipHistory> {
16
17 @Query(value = "SELECT * FROM uc_member_vip_history " +
18 " WHERE vip_expire_time >= ?2 AND member_id = ?1 order by create_time desc limit 1 ", nativeQuery = true)
19 Optional<MemberVipHistory> findByTime(Long memberId, LocalDateTime nowTime);
20 }
1 package com.topdraw.business.module.member.viphistory.rest;
2
3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
4 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
6 import com.topdraw.common.ResultInfo;
7 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiOperation;
9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.data.domain.Pageable;
11 import org.springframework.validation.annotation.Validated;
12 import org.springframework.web.bind.annotation.*;
13
14 /**
15 * @author luerlong
16 * @date 2021-12-10
17 */
18 @Api(tags = "MemberVipHistory管理")
19 @RestController
20 @RequestMapping("/api/memberVipHistory")
21 public class MemberVipHistoryController {
22
23 @Autowired
24 private MemberVipHistoryService memberVipHistoryService;
25
26 @GetMapping
27 @ApiOperation("查询MemberVipHistory")
28 public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria, Pageable pageable) {
29 return ResultInfo.successPage(memberVipHistoryService.queryAll(criteria,pageable));
30 }
31
32 @GetMapping(value = "/all")
33 @ApiOperation("查询所有MemberVipHistory")
34 public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria) {
35 return ResultInfo.success(memberVipHistoryService.queryAll(criteria));
36 }
37
38 @PostMapping
39 @ApiOperation("新增MemberVipHistory")
40 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
41 memberVipHistoryService.create(resources);
42 return ResultInfo.success();
43 }
44
45 @PutMapping
46 @ApiOperation("修改MemberVipHistory")
47 public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) {
48 memberVipHistoryService.update(resources);
49 return ResultInfo.success();
50 }
51
52 @DeleteMapping(value = "/{id}")
53 @ApiOperation("删除MemberVipHistory")
54 public ResultInfo delete(@PathVariable Long id) {
55 memberVipHistoryService.delete(id);
56 return ResultInfo.success();
57 }
58
59 }
1 package com.topdraw.business.module.member.viphistory.service;
2
3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
4 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
6 import org.springframework.data.domain.Pageable;
7
8 import java.time.LocalDateTime;
9 import java.util.List;
10 import java.util.Map;
11
12 /**
13 * @author luerlong
14 * @date 2021-12-10
15 */
16 public interface MemberVipHistoryService {
17
18 /**
19 * 查询数据分页
20 * @param criteria 条件参数
21 * @param pageable 分页参数
22 * @return Map<String,Object>
23 */
24 Map<String,Object> queryAll(MemberVipHistoryQueryCriteria criteria, Pageable pageable);
25
26 /**
27 * 查询所有数据不分页
28 * @param criteria 条件参数
29 * @return List<MemberVipHistoryDTO>
30 */
31 List<MemberVipHistoryDTO> queryAll(MemberVipHistoryQueryCriteria criteria);
32
33 /**
34 * 根据ID查询
35 * @param id ID
36 * @return MemberVipHistoryDTO
37 */
38 MemberVipHistoryDTO findById(Long id);
39
40 void create(MemberVipHistory resources);
41
42 void update(MemberVipHistory resources);
43
44 void delete(Long id);
45
46 MemberVipHistory findByTime(Long id, LocalDateTime nowTime);
47 }
1 package com.topdraw.business.module.member.viphistory.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6 import java.sql.Timestamp;
7 import java.time.LocalDateTime;
8
9
10 /**
11 * @author luerlong
12 * @date 2021-12-10
13 */
14 @Data
15 public class MemberVipHistoryDTO implements Serializable {
16
17 // 主键
18 private Long id;
19
20 // 会员id
21 private Long memberId;
22
23 // 会员vip等级
24 private Integer vip;
25
26 // 修改之前vip等级
27 private Integer beforeVip;
28
29 // vip失效时间
30 private LocalDateTime vipExpireTime;
31
32 // 状态 1正常 0已过期
33 private Integer status;
34
35 // 创建时间
36 private Timestamp createTime;
37
38 // 修改时间
39 private Timestamp updateTime;
40 }
1 package com.topdraw.business.module.member.viphistory.service.dto;
2
3 import lombok.Data;
4
5 /**
6 * @author luerlong
7 * @date 2021-12-10
8 */
9 @Data
10 public class MemberVipHistoryQueryCriteria {
11 }
1 package com.topdraw.business.module.member.viphistory.service.impl;
2
3
4 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
5 import com.topdraw.business.module.member.viphistory.repository.MemberVipHistoryRepository;
6 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
7 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
8 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
9 import com.topdraw.business.module.member.viphistory.service.mapper.MemberVipHistoryMapper;
10 import com.topdraw.utils.PageUtil;
11 import com.topdraw.utils.QueryHelp;
12 import com.topdraw.utils.ValidationUtil;
13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.dao.EmptyResultDataAccessException;
15 import org.springframework.data.domain.Page;
16 import org.springframework.data.domain.Pageable;
17 import org.springframework.stereotype.Service;
18 import org.springframework.transaction.annotation.Propagation;
19 import org.springframework.transaction.annotation.Transactional;
20 import org.springframework.util.Assert;
21
22 import java.time.LocalDateTime;
23 import java.util.List;
24 import java.util.Map;
25
26 /**
27 * @author luerlong
28 * @date 2021-12-10
29 */
30 @Service
31 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
32 public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
33
34 @Autowired
35 private MemberVipHistoryRepository memberVipHistoryRepository;
36
37 @Autowired
38 private MemberVipHistoryMapper memberVipHistoryMapper;
39
40 @Override
41 public Map<String, Object> queryAll(MemberVipHistoryQueryCriteria criteria, Pageable pageable) {
42 Page<MemberVipHistory> page = memberVipHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
43 return PageUtil.toPage(page.map(memberVipHistoryMapper::toDto));
44 }
45
46 @Override
47 public List<MemberVipHistoryDTO> queryAll(MemberVipHistoryQueryCriteria criteria) {
48 return memberVipHistoryMapper.toDto(memberVipHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
49 }
50
51 @Override
52 public MemberVipHistoryDTO findById(Long id) {
53 MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(id).orElseGet(MemberVipHistory::new);
54 ValidationUtil.isNull(memberVipHistory.getId(),"MemberVipHistory","id",id);
55 return memberVipHistoryMapper.toDto(memberVipHistory);
56 }
57
58 @Override
59 @Transactional(rollbackFor = Exception.class)
60 public void create(MemberVipHistory resources) {
61 memberVipHistoryRepository.save(resources);
62 }
63
64 @Override
65 @Transactional(rollbackFor = Exception.class)
66 public void update(MemberVipHistory resources) {
67 MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(resources.getId()).orElseGet(MemberVipHistory::new);
68 ValidationUtil.isNull( memberVipHistory.getId(),"MemberVipHistory","id",resources.getId());
69 memberVipHistory.copy(resources);
70 memberVipHistoryRepository.save(memberVipHistory);
71 }
72
73 @Override
74 @Transactional(rollbackFor = Exception.class)
75 public void delete(Long id) {
76 Assert.notNull(id, "The given id must not be null!");
77 MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(id).orElseThrow(
78 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberVipHistory.class, id), 1));
79 memberVipHistoryRepository.delete(memberVipHistory);
80 }
81
82 @Override
83 public MemberVipHistory findByTime(Long memberId, LocalDateTime nowTime) {
84 MemberVipHistory memberVipHistory = this.memberVipHistoryRepository.findByTime(memberId, nowTime).orElseGet(MemberVipHistory::new);
85 return memberVipHistory;
86 }
87
88
89 }
1 package com.topdraw.business.module.member.viphistory.service.mapper;
2
3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy;
8
9 /**
10 * @author luerlong
11 * @date 2021-12-10
12 */
13 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
14 public interface MemberVipHistoryMapper extends BaseMapper<MemberVipHistoryDTO, MemberVipHistory> {
15
16 }
1 package com.topdraw.business.basicdata.points.available.domain; 1 package com.topdraw.business.module.points.available.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.points.available.repository; 1 package com.topdraw.business.module.points.available.repository;
2 2
3 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable; 3 import com.topdraw.business.module.points.available.domain.PointsAvailable;
4 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO; 4 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
5 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria; 5 import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
6 import org.springframework.data.jpa.repository.JpaRepository; 6 import org.springframework.data.jpa.repository.JpaRepository;
7 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 7 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
8 import org.springframework.data.jpa.repository.Modifying; 8 import org.springframework.data.jpa.repository.Modifying;
......
1 package com.topdraw.business.basicdata.points.available.rest; 1 package com.topdraw.business.module.points.available.rest;
2 2
3 /** 3 /**
4 * @author XiangHan 4 * @author XiangHan
......
1 package com.topdraw.business.basicdata.points.available.service; 1 package com.topdraw.business.module.points.available.service;
2 2
3 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable; 3 import com.topdraw.business.module.points.available.domain.PointsAvailable;
4 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO; 4 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
5 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria; 5 import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.time.LocalDateTime; 8 import java.time.LocalDateTime;
......
1 package com.topdraw.business.basicdata.points.available.service.dto; 1 package com.topdraw.business.module.points.available.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.points.available.service.dto; 1 package com.topdraw.business.module.points.available.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.topdraw.business.basicdata.points.available.service.dto; 1 package com.topdraw.business.module.points.available.service.dto;
2 2
3 public enum PointsAvailableQueryType { 3 public enum PointsAvailableQueryType {
4 4
......
1 package com.topdraw.business.basicdata.points.available.service.impl; 1 package com.topdraw.business.module.points.available.service.impl;
2 2
3 import com.topdraw.business.basicdata.member.service.MemberService; 3 import com.topdraw.business.module.member.service.MemberService;
4 import com.topdraw.business.basicdata.member.service.dto.MemberDTO; 4 import com.topdraw.business.module.member.service.dto.MemberDTO;
5 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable; 5 import com.topdraw.business.module.points.available.domain.PointsAvailable;
6 import com.topdraw.business.basicdata.points.available.repository.PointsAvailableRepository; 6 import com.topdraw.business.module.points.available.repository.PointsAvailableRepository;
7 import com.topdraw.business.basicdata.points.available.service.PointsAvailableService; 7 import com.topdraw.business.module.points.available.service.PointsAvailableService;
8 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO; 8 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
9 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria; 9 import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
10 import com.topdraw.business.basicdata.points.available.service.mapper.PointsAvailableMapper; 10 import com.topdraw.business.module.points.available.service.mapper.PointsAvailableMapper;
11 import com.topdraw.util.RedissonUtil; 11 import com.topdraw.util.RedissonUtil;
12 import com.topdraw.utils.PageUtil; 12 import com.topdraw.utils.PageUtil;
13 import com.topdraw.utils.QueryHelp; 13 import com.topdraw.utils.QueryHelp;
......
1 package com.topdraw.business.basicdata.points.available.service.mapper; 1 package com.topdraw.business.module.points.available.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.points.available.domain.PointsAvailable; 4 import com.topdraw.business.module.points.available.domain.PointsAvailable;
5 import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO; 5 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.domain; 1 package com.topdraw.business.module.points.detail.detailhistory.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.repository; 1 package com.topdraw.business.module.points.detail.detailhistory.repository;
2 2
3 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory; 3 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
4 import org.springframework.data.jpa.repository.JpaRepository; 4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.rest; 1 package com.topdraw.business.module.points.detail.detailhistory.rest;
2 2
3 import io.swagger.annotations.Api; 3 import io.swagger.annotations.Api;
4 4
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.service; 1 package com.topdraw.business.module.points.detail.detailhistory.service;
2 2
3 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory; 3 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
4 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO; 4 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
5 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria; 5 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.util.List; 8 import java.util.List;
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.service.dto; 1 package com.topdraw.business.module.points.detail.detailhistory.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.service.dto; 1 package com.topdraw.business.module.points.detail.detailhistory.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.service.impl; 1 package com.topdraw.business.module.points.detail.detailhistory.service.impl;
2 2
3 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory; 3 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
4 import com.topdraw.business.basicdata.points.detail.detailhistory.repository.PointsDetailHistoryRepository; 4 import com.topdraw.business.module.points.detail.detailhistory.repository.PointsDetailHistoryRepository;
5 import com.topdraw.business.basicdata.points.detail.detailhistory.service.PointsDetailHistoryService; 5 import com.topdraw.business.module.points.detail.detailhistory.service.PointsDetailHistoryService;
6 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO; 6 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
7 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria; 7 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
8 import com.topdraw.business.basicdata.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper; 8 import com.topdraw.business.module.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper;
9 import com.topdraw.utils.PageUtil; 9 import com.topdraw.utils.PageUtil;
10 import com.topdraw.utils.QueryHelp; 10 import com.topdraw.utils.QueryHelp;
11 import com.topdraw.utils.StringUtils; 11 import com.topdraw.utils.StringUtils;
......
1 package com.topdraw.business.basicdata.points.detail.detailhistory.service.mapper; 1 package com.topdraw.business.module.points.detail.detailhistory.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory; 4 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
5 import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO; 5 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
8 8
......
1 package com.topdraw.business.basicdata.points.detail.domain; 1 package com.topdraw.business.module.points.detail.domain;
2 2
3 import cn.hutool.core.bean.BeanUtil; 3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions; 4 import cn.hutool.core.bean.copier.CopyOptions;
......