Skip to content

Commit 4c978ab

Browse files
committed
【同步】BOOT 和 CLOUD 的功能(支付相关)
1 parent 2b83340 commit 4c978ab

File tree

32 files changed

+63
-53
lines changed

32 files changed

+63
-53
lines changed

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
import io.swagger.v3.oas.annotations.Operation;
1414
import io.swagger.v3.oas.annotations.Parameter;
1515
import io.swagger.v3.oas.annotations.tags.Tag;
16-
import jakarta.annotation.Resource;
17-
import jakarta.validation.Valid;
1816
import org.springframework.security.access.prepost.PreAuthorize;
1917
import org.springframework.validation.annotation.Validated;
2018
import org.springframework.web.bind.annotation.*;
2119

20+
import javax.annotation.Resource;
21+
import javax.validation.Valid;
2222
import java.util.List;
2323
import java.util.Map;
2424

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageListReqVO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.Max;
5-
import jakarta.validation.constraints.Min;
6-
import jakarta.validation.constraints.NotNull;
74
import lombok.Data;
85
import org.springframework.format.annotation.DateTimeFormat;
96

7+
import javax.validation.constraints.Max;
8+
import javax.validation.constraints.Min;
9+
import javax.validation.constraints.NotNull;
1010
import java.time.LocalDateTime;
1111

1212
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
import io.swagger.v3.oas.annotations.Operation;
1414
import io.swagger.v3.oas.annotations.Parameter;
1515
import io.swagger.v3.oas.annotations.tags.Tag;
16-
import jakarta.annotation.Resource;
17-
import jakarta.validation.Valid;
1816
import org.springframework.validation.annotation.Validated;
1917
import org.springframework.web.bind.annotation.*;
2018

19+
import javax.annotation.Resource;
20+
import javax.validation.Valid;
2121
import java.util.List;
2222
import java.util.Map;
2323

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessagePageReqVO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.Max;
5-
import jakarta.validation.constraints.Min;
6-
import jakarta.validation.constraints.NotNull;
74
import lombok.Data;
85
import org.springframework.format.annotation.DateTimeFormat;
96

7+
import javax.validation.constraints.Max;
8+
import javax.validation.constraints.Min;
9+
import javax.validation.constraints.NotNull;
1010
import java.time.LocalDateTime;
1111

1212
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
1616
import cn.iocoder.yudao.module.promotion.dal.mysql.kefu.KeFuMessageMapper;
1717
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
18-
import jakarta.annotation.Resource;
1918
import org.springframework.scheduling.annotation.Async;
2019
import org.springframework.stereotype.Service;
2120
import org.springframework.transaction.annotation.Transactional;
2221
import org.springframework.validation.annotation.Validated;
2322

23+
import javax.annotation.Resource;
2424
import java.util.Collections;
2525
import java.util.List;
2626

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageWithdrawController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import io.swagger.v3.oas.annotations.Operation;
1616
import io.swagger.v3.oas.annotations.Parameter;
1717
import io.swagger.v3.oas.annotations.tags.Tag;
18-
import jakarta.annotation.security.PermitAll;
1918
import lombok.extern.slf4j.Slf4j;
2019
import org.springframework.security.access.prepost.PreAuthorize;
2120
import org.springframework.validation.annotation.Validated;
2221
import org.springframework.web.bind.annotation.*;
2322

2423
import javax.annotation.Resource;
24+
import javax.annotation.security.PermitAll;
2525
import javax.validation.Valid;
2626
import java.util.Map;
2727

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.record;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotEmpty;
5-
import jakarta.validation.constraints.NotNull;
64
import lombok.Data;
75
import org.springframework.format.annotation.DateTimeFormat;
86

7+
import javax.validation.constraints.NotEmpty;
8+
import javax.validation.constraints.NotNull;
99
import java.time.LocalDateTime;
1010

1111
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotNull;
54
import lombok.Data;
65
import org.springframework.format.annotation.DateTimeFormat;
76

7+
import javax.validation.constraints.NotNull;
88
import java.time.LocalDateTime;
99

1010
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotNull;
54
import lombok.Data;
65
import lombok.ToString;
76

7+
import javax.validation.constraints.NotNull;
8+
89
@Schema(description = "管理后台 - 分销用户 - 清除推广员 Request VO")
910
@Data
1011
@ToString(callSuper = true)

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package cn.iocoder.yudao.module.trade.controller.admin.brokerage.vo.user;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4-
import jakarta.validation.constraints.NotNull;
54
import lombok.Data;
65
import lombok.ToString;
76

7+
import javax.validation.constraints.NotNull;
8+
89
@Schema(description = "管理后台 - 分销用户 - 修改推广员 Request VO")
910
@Data
1011
@ToString(callSuper = true)

0 commit comments

Comments
 (0)