diff --git a/bnyer-auth/pom.xml b/bnyer-auth/pom.xml index bf90b58..d9b1957 100644 --- a/bnyer-auth/pom.xml +++ b/bnyer-auth/pom.xml @@ -60,6 +60,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2 diff --git a/bnyer-common/bnyer-common-core/pom.xml b/bnyer-common/bnyer-common-core/pom.xml index 7b77ecf..e522210 100644 --- a/bnyer-common/bnyer-common-core/pom.xml +++ b/bnyer-common/bnyer-common-core/pom.xml @@ -89,6 +89,12 @@ commons-lang3 + + + com.baomidou + mybatis-plus-boot-starter + + commons-io diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/ProfitOrderConstant.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ProfitOrderConstant.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/ProfitOrderConstant.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ProfitOrderConstant.java index 5d17515..4227bd2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/ProfitOrderConstant.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/ProfitOrderConstant.java @@ -1,4 +1,4 @@ -package com.bnyer.img.constants; +package com.bnyer.common.core.constant; /** * @author chengkun diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java similarity index 98% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java index d9f2e58..ba7b515 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/RedisKeyConstant.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/RedisKeyConstant.java @@ -1,4 +1,4 @@ -package com.bnyer.img.constants; +package com.bnyer.common.core.constant; public class RedisKeyConstant { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java index 11a342b..6efabd2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/TiktokConstant.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/TiktokConstant.java @@ -1,4 +1,4 @@ -package com.bnyer.img.constants; +package com.bnyer.common.core.constant; /** * @author chengkun diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/WithdrawConstant.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/WithdrawConstant.java index 6ea2789..5665517 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/constants/WithdrawConstant.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/constant/WithdrawConstant.java @@ -1,4 +1,4 @@ -package com.bnyer.img.constants; +package com.bnyer.common.core.constant; /** * @author chengkun diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Banner.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Banner.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java index bd3fffc..3b4dd81 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Banner.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Banner.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-Banner") +@ApiModel(value="com-bnyer-common-core-domain-Banner") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BaseDomain.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BaseDomain.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java index 6fc1cef..5cce732 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BaseDomain.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BaseDomain.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BzData.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BzData.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java index 354a015..f16880b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/BzData.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/BzData.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-BzData") +@ApiModel(value="com-bnyer-common-core-domain-BzData") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Creator.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Creator.java index 71dc494..c249dab 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Creator.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Creator.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -16,17 +16,18 @@ import java.util.Date; * @author chengkun * @date 2022/5/30 16:25 */ + /** * 图文平台艺术家表 */ -@ApiModel(value="com-bnyer-img-domain-Creator") +@ApiModel(value="com-bnyer-common-core-domain-Creator") @Getter @Setter @ToString @AllArgsConstructor @NoArgsConstructor @TableName(value = "img_creator") -public class Creator extends BaseDomain { +public class Creator extends BaseDomain { /** * 主键id */ diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java index 993bb91..2d42e05 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorAccount.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorAccount.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-CreatorAccount") +@ApiModel(value="com-bnyer-common-core-domain-CreatorAccount") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorProfit.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorProfit.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java index 8aca3a3..8ac0045 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/CreatorProfit.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/CreatorProfit.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -15,10 +15,11 @@ import java.util.Date; * @author chengkun * @date 2022/6/8 10:51 */ + /** * 图文平台-艺术家收益表 */ -@ApiModel(value="com-bnyer-img-domain-CreatorProfit") +@ApiModel(value="com-bnyer-common-core-domain-CreatorProfit") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Feedback.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java similarity index 82% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Feedback.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java index 54657fb..31ec420 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Feedback.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Feedback.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,13 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; -@ApiModel(value="com-bnyer-img-domain-Feedback") +@ApiModel(value="com-bnyer-common-core-domain-Feedback") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/FhUser.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java similarity index 84% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/FhUser.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java index 4150c28..23fdae8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/FhUser.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/FhUser.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,22 +6,17 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; /** * @author chengkun * @date 2022/7/4 13:58 */ + /** * img快手平台用户表 */ -@ApiModel(value="com-bnyer-img-domain-FhUser") +@ApiModel(value="com-bnyer-common-core-domain-FhUser") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java index acb9b3a..4326a5f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ImgSignRelation.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ImgSignRelation.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,7 +12,7 @@ import lombok.*; import java.io.Serializable; import java.util.Date; -@ApiModel(value="com-bnyer-img-domain-ImgSignRelation") +@ApiModel(value="com-bnyer-common-core-domain-ImgSignRelation") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/InviteLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java similarity index 80% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/InviteLog.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java index ff8f510..585e8c3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/InviteLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/InviteLog.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,15 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; -@ApiModel(value="com-bnyer-img-domain-InviteLog") +@ApiModel(value="com-bnyer-common-core-domain-InviteLog") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/LevelInfo.java similarity index 84% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/LevelInfo.java index be08073..26ee8ed 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/LevelInfo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/LevelInfo.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,15 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; -@ApiModel(value="com-bnyer-img-domain-LevelInfo") +@ApiModel(value="com-bnyer-common-core-domain-LevelInfo") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Notice.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Notice.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Notice.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Notice.java index 336c881..07c6ceb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Notice.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Notice.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-Notice") +@ApiModel(value="com-bnyer-common-core-domain-Notice") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Product.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Product.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Product.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Product.java index 7812939..3eb7f76 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Product.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Product.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,16 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; +import lombok.*; + import java.math.BigDecimal; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -@ApiModel(value="com-bnyer-img-domain-Product") +@ApiModel(value="com-bnyer-common-core-domain-Product") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProductOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProductOrder.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java index bb30cd2..711b84a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProductOrder.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProductOrder.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -7,16 +7,13 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -@ApiModel(value="com-bnyer-img-domain-ProductOrder") +@ApiModel(value="com-bnyer-common-core-domain-ProductOrder") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java index 5c03a89..371f51a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/ProfitVerifyOrder.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/ProfitVerifyOrder.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -7,23 +7,21 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; /** * @author chengkun * @date 2022/6/10 14:42 */ + /** * 图文平台-收益结算审核单表 */ -@ApiModel(value="com-bnyer-img-domain-ProfitVerifyOrder") +@ApiModel(value="com-bnyer-common-core-domain-ProfitVerifyOrder") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java similarity index 87% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java index c3327ea..725f5b9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Sign.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Sign.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,14 +8,14 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-Sign") +@ApiModel(value="com-bnyer-common-core-domain-Sign") @Getter @Setter @ToString @AllArgsConstructor @NoArgsConstructor @TableName(value = "img_sign") -public class Sign extends BaseDomain{ +public class Sign extends BaseDomain { /** * 主键id */ diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokCollection.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokCollection.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java index 8885456..7e35a5d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokCollection.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokCollection.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-TiktokCollection") +@ApiModel(value="com-bnyer-common-core-domain-TiktokCollection") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java index 2d693a5..a39caef 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokImg.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokImg.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-TiktokImg") +@ApiModel(value="com-bnyer-common-core-domain-TiktokImg") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokLike.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokLike.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java index 0ec4842..f9e38ba 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokLike.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokLike.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,16 +8,15 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -import java.io.Serializable; - /** * @author chengkun * @date 2022/4/21 9:50 */ + /** * img平台点赞表 */ -@ApiModel(value="com-bnyer-img-domain-TiktokLike") +@ApiModel(value="com-bnyer-common-core-domain-TiktokLike") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java index ee4fba9..2847d13 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/TiktokUser.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/TiktokUser.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-TiktokUser") +@ApiModel(value="com-bnyer-common-core-domain-TiktokUser") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Type.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Type.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Type.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Type.java index 1a01c3e..a272b75 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/Type.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/Type.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.*; -@ApiModel(value="com-bnyer-img-domain-Type") +@ApiModel(value="com-bnyer-common-core-domain-Type") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVip.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java similarity index 87% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVip.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java index 23cb703..700b7a6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVip.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVip.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,16 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; +import lombok.*; + import java.math.BigDecimal; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -@ApiModel(value="com-bnyer-img-domain-UserVip") +@ApiModel(value="com-bnyer-common-core-domain-UserVip") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVipRecord.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVipRecord.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java index ce81907..1325c6d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/UserVipRecord.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -7,16 +7,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; +import lombok.*; + import java.math.BigDecimal; import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -@ApiModel(value="com-bnyer-img-domain-UserVipRecord") +@ApiModel(value="com-bnyer-common-core-domain-UserVipRecord") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/VerifyLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/VerifyLog.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java index 1d9e1d5..661d625 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/VerifyLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/VerifyLog.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -16,10 +16,11 @@ import java.util.Date; * @author chengkun * @date 2022/5/31 9:38 */ + /** * 图文平台审核记录表 */ -@ApiModel(value="com-bnyer-img-domain-VerifyLog") +@ApiModel(value="com-bnyer-common-core-domain-VerifyLog") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java index 9a75072..c2e00e2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WithdrawLog.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WithdrawLog.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,7 +12,7 @@ import lombok.*; import java.math.BigDecimal; -@ApiModel(value="com-bnyer-img-domain-WithdrawLog") +@ApiModel(value="com-bnyer-common-core-domain-WithdrawLog") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WxUser.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java similarity index 84% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WxUser.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java index 946c08e..2d9688b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/domain/WxUser.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/WxUser.java @@ -1,4 +1,4 @@ -package com.bnyer.img.domain; +package com.bnyer.common.core.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -6,22 +6,17 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; /** * @author chengkun * @date 2022/7/4 13:58 */ + /** * img微信平台用户表 */ -@ApiModel(value="com-bnyer-img-domain-WxUser") +@ApiModel(value="com-bnyer-common-core-domain-WxUser") @Getter @Setter @ToString diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/AlipayParamDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AlipayParamDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/AlipayParamDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AlipayParamDto.java index 7a82bb7..ae3b23f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/AlipayParamDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AlipayParamDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java index a4b21c2..e9caabf 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Banner; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Banner; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java index 8a41324..61f519b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BannerPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BannerPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BasePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BasePageDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BasePageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BasePageDto.java index c61b14d..d570db3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BasePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BasePageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BzDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BzDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BzDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BzDto.java index 76f5470..050bba9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/BzDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BzDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CardBuyOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CardBuyOrderDto.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CardBuyOrderDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CardBuyOrderDto.java index 3dcccaf..5885bc0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CardBuyOrderDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CardBuyOrderDto.java @@ -1,11 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckInviteCodeDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckInviteCodeDto.java index 2be2fd2..98cbb07 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckInviteCodeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckInviteCodeDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckPhoneDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckPhoneDto.java index cab16f2..5a47e6b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckPhoneDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckPhoneDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckScanCodeDto.java similarity index 85% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckScanCodeDto.java index 146b9b1..29c79e9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CheckScanCodeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CheckScanCodeDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java index f0499ec..519ef8d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionUserDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java index 84dc64c..748c84b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CollectionUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CollectionUserDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java index 69e172e..9f5a900 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountDto.java @@ -1,10 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.domain.CreatorAccount; import com.bnyer.common.core.enums.SensitiveTypeEnum; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.CreatorAccount; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountPageDto.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountPageDto.java index f9ecd9a..f4e5253 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorAccountPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorAccountPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import com.bnyer.common.core.annotation.Desensitized; import com.bnyer.common.core.enums.SensitiveTypeEnum; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDetailsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDetailsDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDetailsDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDetailsDto.java index ddb696e..f0fc338 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDetailsDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDetailsDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDto.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDto.java index fa8eaef..6990b4b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorHandleConfirmProfitDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorHandleConfirmProfitDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java index 3327727..0c7dfe5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorHandleConfirmProfitDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorHandleConfirmProfitDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorImgsDetailsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorImgsDetailsDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java index 911fcc4..80ca626 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorImgsDetailsDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorImgsDetailsDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java index 826a62e..e4b6c06 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorInviteLogPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorInviteLogPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLoginDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLoginDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLoginDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLoginDto.java index 33dca23..a884a36 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLoginDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLoginDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLogoutDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLogoutDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLogoutDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLogoutDto.java index 958a844..00447c3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorLogoutDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorLogoutDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorPageDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorPageDto.java index c0957e3..e6062ab 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorPageDto.java @@ -1,12 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import java.io.Serializable; - @Getter @Setter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitAdInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitAdInsertDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java index 8b1d41d..7533d12 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitAdInsertDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitAdInsertDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitInviteInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitInviteInsertDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java index 65ab180..47fd4a0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitInviteInsertDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitInviteInsertDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.CreatorProfit; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.CreatorProfit; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java index 34350d4..ea6459a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitUpdateDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java index c409dc2..c69d3a8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorProfitUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorProfitUpdateDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.CreatorProfit; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.CreatorProfit; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java index 31f3219..6d34b69 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUpdateDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Creator; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Creator; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java similarity index 62% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java index 75268f2..d14a351 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorUploadDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorUploadDto.java @@ -1,10 +1,5 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.bnyer.common.core.annotation.Desensitized; -import com.bnyer.common.core.enums.SensitiveTypeEnum; -import com.bnyer.common.core.utils.Sm4Util; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.CreatorAccount; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java index e30ef7a..7288eef 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/CreatorWithdrawPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/CreatorWithdrawPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DirectBuyOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DirectBuyOrderDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DirectBuyOrderDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DirectBuyOrderDto.java index e7d6589..4361647 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/DirectBuyOrderDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DirectBuyOrderDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java similarity index 86% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java index 623ac47..8c2f50d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackDto.java @@ -1,14 +1,13 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Feedback; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Feedback; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackPageDto.java similarity index 79% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackPageDto.java index e511ed9..d453231 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FeedBackPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FeedBackPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -9,7 +9,7 @@ import lombok.Setter; @Getter @Setter @ApiModel("feedback分页接收类") -public class FeedBackPageDto extends BasePageDto{ +public class FeedBackPageDto extends BasePageDto { @ApiModelProperty(value="平台渠道") private String source; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhLoginDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhLoginDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhLoginDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhLoginDto.java index 33e05d3..a6fd35d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhLoginDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhLoginDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java index 0b2df45..025fa59 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.FhUser; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.FhUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserPageDto.java index 768789f..84b8573 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FhUserPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FhUserPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FollowDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FollowDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java index d113e82..bf1e841 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/FollowDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/FollowDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ImgSignRelationPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ImgSignRelationPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java index 833bd90..5439998 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ImgSignRelationPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ImgSignRelationPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/InviteLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/InviteLogPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/InviteLogPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/InviteLogPageDto.java index 605d22b..cc1cb45 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/InviteLogPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/InviteLogPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java index 839a778..c5a782e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.LevelInfo; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.LevelInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoPageDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoPageDto.java index 481eaf1..c76fc91 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/LevelInfoPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/LevelInfoPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ModifySignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ModifySignDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java index 9428c18..78e2b8e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ModifySignDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ModifySignDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticeDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java index 401d909..1098b3e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticeDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Notice; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Notice; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticePageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticePageDto.java index 4adc194..729da5b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/NoticePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/NoticePageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderDetailsDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderDetailsDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderDetailsDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderDetailsDto.java index a69dba8..3a07fb4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderDetailsDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderDetailsDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderNotifyDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderNotifyDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderNotifyDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderNotifyDto.java index 38ab76c..8e7dd65 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/OrderNotifyDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/OrderNotifyDto.java @@ -1,6 +1,5 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/PayUserVipDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PayUserVipDto.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/PayUserVipDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PayUserVipDto.java index fe3d6c2..83e2f01 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/PayUserVipDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/PayUserVipDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java similarity index 97% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java index e037e56..9a23d87 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductDto.java @@ -1,6 +1,6 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.bnyer.img.domain.Product; +import com.bnyer.common.core.domain.Product; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductPageDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductPageDto.java index 7842697..0176af2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProductPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProductPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitInOrEndDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitInOrEndDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java index 0ce1bec..0e450e8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitInOrEndDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitInOrEndDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java index 7583942..b2a0ef0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitStatusDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitStatusDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -7,7 +7,6 @@ import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java index 9594353..c72bbac 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -14,7 +14,7 @@ import java.math.BigDecimal; @Getter @Setter @ApiModel("收益审核订单审核接收类") -public class ProfitVerifyOrderDto implements Serializable { +public class ProfitVerifyOrderDto implements Serializable { @NotNull(message = "主键id") @ApiModelProperty(value="主键id") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderInsertDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderInsertDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderInsertDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderInsertDto.java index 67a4f85..c0707ba 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderInsertDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderInsertDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderPageDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderPageDto.java index 742883e..efbbb81 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderUpdateDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderUpdateDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java index 13e7a33..d33192f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/ProfitVerifyOrderUpdateDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/ProfitVerifyOrderUpdateDto.java @@ -1,11 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java index b441ed6..6fb8158 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Sign; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Sign; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgNamePageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgNamePageDto.java index c2b1324..c7843be 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgNamePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgNamePageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java index 0b67cd7..939390c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignImgPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignImgPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java similarity index 82% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java index 35b1b94..d204edb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignPageDto.java @@ -1,6 +1,5 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignTypePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignTypePageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java index 883695d..b0701cf 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/SignTypePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/SignTypePageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java index 880fd49..a33d010 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/StatusDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/StatusDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java index 684b03f..adc83f5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.TiktokImg; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.TiktokImg; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgListMiniDto.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgListMiniDto.java index 47d9010..fd3748d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgListMiniDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgListMiniDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java index a0da257..dab55f1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgMiniDto.java @@ -1,8 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.TiktokImg; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.vo.SignVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java index cf8ef14..c990661 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokImgPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokLoginDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokLoginDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java index 4a6f681..24cd22c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokLoginDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokLoginDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java index ad99d17..dc8a683 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.TiktokUser; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.TiktokUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java index e109657..96cde76 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserMiniDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserMiniDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserPageDto.java index 284e21a..d71ef23 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokUserPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TiktokUserPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java index 4f26480..4e499ba 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypeDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypeDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.Type; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Type; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypePageDto.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypePageDto.java index 57bd673..8f15e16 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TypePageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/TypePageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserIdDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java similarity index 87% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserIdDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java index e1a6d24..7d40a70 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserIdDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserIdDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotNull; -import java.io.Serializable; @Getter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java similarity index 86% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java index b9d92cc..78584c6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipDto.java @@ -1,16 +1,12 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.baomidou.mybatisplus.annotation.TableField; +import com.bnyer.common.core.domain.UserVip; import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.UserVip; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipPageDto.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipPageDto.java index 99f393c..9c42049 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/UserVipPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/UserVipPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java similarity index 95% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java index 501cabe..ec066c9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyCreatorDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyCreatorDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java index 5b8d0d1..909f18b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyPageDto.java similarity index 84% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyPageDto.java index 4345279..edc590b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/VerifyPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/VerifyPageDto.java @@ -1,12 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import java.io.Serializable; - @Getter @Setter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java index 84738dc..91275ea 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawDto.java @@ -1,9 +1,9 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import com.bnyer.common.core.annotation.Desensitized; +import com.bnyer.common.core.domain.WithdrawLog; import com.bnyer.common.core.enums.SensitiveTypeEnum; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.WithdrawLog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawOrderDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawOrderDto.java index e7e5b0f..f56d9ff 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawOrderDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawOrderDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawPageDto.java similarity index 83% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawPageDto.java index d92c800..f230701 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WithdrawPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WithdrawPageDto.java @@ -1,7 +1,5 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; -import com.bnyer.common.core.annotation.Desensitized; -import com.bnyer.common.core.enums.SensitiveTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxLoginDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxLoginDto.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxLoginDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxLoginDto.java index c92e63a..721d52a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxLoginDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxLoginDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -6,7 +6,6 @@ import lombok.Getter; import lombok.Setter; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Getter diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java index 4bfaade..94daf0d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserDto.java @@ -1,7 +1,7 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; +import com.bnyer.common.core.domain.WxUser; import com.bnyer.common.core.utils.bean.BeanUtils; -import com.bnyer.img.domain.WxUser; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserPageDto.java similarity index 92% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserPageDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserPageDto.java index 675c014..2200b79 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/WxUserPageDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/WxUserPageDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkUserCanDownloadDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java similarity index 94% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkUserCanDownloadDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java index 1e3742c..612d71f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkUserCanDownloadDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkUserCanDownloadDto.java @@ -1,4 +1,4 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java similarity index 83% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java index 14f323e..efe0679 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/checkWithdrawDto.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/checkWithdrawDto.java @@ -1,12 +1,10 @@ -package com.bnyer.img.dto; +package com.bnyer.common.core.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ConfirmProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ConfirmProfitVo.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java index 35da440..bfa8185 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ConfirmProfitVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/ConfirmProfitVo.java @@ -1,4 +1,4 @@ -package com.bnyer.img.vo; +package com.bnyer.common.core.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java similarity index 96% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java index 0913774..216164b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorAccountVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorAccountVo.java @@ -1,4 +1,4 @@ -package com.bnyer.img.vo; +package com.bnyer.common.core.vo; import com.bnyer.common.core.annotation.Desensitized; import com.bnyer.common.core.enums.SensitiveTypeEnum; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java similarity index 98% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java rename to bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java index ef399da..45407b1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/CreatorProfitVo.java +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/vo/CreatorProfitVo.java @@ -1,4 +1,4 @@ -package com.bnyer.img.vo; +package com.bnyer.common.core.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bnyer-gateway/pom.xml b/bnyer-gateway/pom.xml index 309295f..9b6a19f 100644 --- a/bnyer-gateway/pom.xml +++ b/bnyer-gateway/pom.xml @@ -90,6 +90,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2 diff --git a/bnyer-services/bnyer-file/pom.xml b/bnyer-services/bnyer-file/pom.xml index 6b8458d..335e638 100644 --- a/bnyer-services/bnyer-file/pom.xml +++ b/bnyer-services/bnyer-file/pom.xml @@ -115,6 +115,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2 diff --git a/bnyer-services/bnyer-img/pom.xml b/bnyer-services/bnyer-img/pom.xml index 1e6c171..93b91c3 100644 --- a/bnyer-services/bnyer-img/pom.xml +++ b/bnyer-services/bnyer-img/pom.xml @@ -109,18 +109,18 @@ weixin-java-pay - - - com.alipay.sdk - alipay-sdk-java - - com.qiniu qiniu-java-sdk 7.2.18 + + + + com.alipay.sdk + alipay-sdk-java + @@ -129,6 +129,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/AlipayConfig.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/AlipayConfig.java index ea0d7b1..4aabf21 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/AlipayConfig.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/AlipayConfig.java @@ -1,12 +1,12 @@ package com.bnyer.img.config; //import com.bnyer.img.handler.TokenCheckHandler; + import lombok.Getter; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** * @author chengkun @@ -16,7 +16,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @ConfigurationProperties(prefix = "alipay") @Getter @RefreshScope -public class AlipayConfig{ +public class AlipayConfig { @Value("${alipay.gatewayUrl}") private String gatewayUrl; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java index 62abab7..17b79c9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CommonController.java @@ -1,11 +1,14 @@ package com.bnyer.img.controller; +import com.bnyer.common.core.dto.OrderNotifyDto; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.img.service.AlipayService; +import com.bnyer.img.service.YunmeiService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -24,6 +27,9 @@ public class CommonController extends BaseController { @Autowired private AlipayService alipayService; + @Autowired + private YunmeiService yunmeiService; + //@RequiresPermissions("system:config:list") @ApiOperation(value = "支付宝回调通知") @PostMapping("/alipayCallback") @@ -34,4 +40,11 @@ public class CommonController extends BaseController { } return AjaxResult.error(); } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="云媒订单回调") + @PostMapping("/notifyOrder") + public AjaxResult notifyOrder(@ApiParam("云媒回调参数") @RequestBody OrderNotifyDto params){ + return AjaxResult.success(yunmeiService.orderNotify(params)); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java index e89190f..8ff4459 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java @@ -2,11 +2,11 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.dto.*; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; @@ -208,6 +208,24 @@ public class CreatorMiniController extends BaseController { return AjaxResult.success(creatorAccountService.queryList(creatorId)); } + @ApiOperation(value="新增艺术家账户") + @PostMapping(value = "/insertAccount") + public AjaxResult insertCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象") CreatorAccountDto dto){ + return AjaxResult.success(creatorAccountService.insert(dto.extractParam())); + } + + @ApiOperation(value="修改艺术家账户") + @PostMapping(value = "/updateAccount") + public AjaxResult updateCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象") CreatorAccountDto dto){ + return AjaxResult.success(creatorAccountService.update(dto.extractParam())); + } + + @ApiOperation(value="删除艺术家账户") + @PostMapping(value = "/deleteAccount") + public AjaxResult deleteCreatorAccount(@PathVariable @ApiParam("主键ids") List ids){ + return AjaxResult.success(creatorAccountService.delete(ids)); + } + //@TokenCheck @ApiOperation(value="查询指定艺术家提现记录分页") @PostMapping(value = "/getWithdrawList") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index 20a253e..8095817 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java @@ -2,13 +2,13 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.dto.*; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.Feedback; -import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import com.bnyer.img.vo.CreatorDetailsVo; import com.bnyer.img.vo.CreatorFollowVo; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 3d98a90..72b3427 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -2,13 +2,13 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.dto.*; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.Feedback; -import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import com.bnyer.img.vo.*; import com.github.pagehelper.PageHelper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java index bb81378..b217336 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java @@ -2,13 +2,13 @@ package com.bnyer.img.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.dto.*; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.Feedback; -import com.bnyer.img.dto.*; import com.bnyer.img.service.*; import com.bnyer.img.vo.CreatorDetailsVo; import com.bnyer.img.vo.CreatorFollowVo; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java index 2748ea0..c694a88 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/YunmeiController.java @@ -1,11 +1,10 @@ package com.bnyer.img.controller; +import com.bnyer.common.core.dto.CardBuyOrderDto; +import com.bnyer.common.core.dto.DirectBuyOrderDto; +import com.bnyer.common.core.dto.OrderDetailsDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; -import com.bnyer.img.dto.CardBuyOrderDto; -import com.bnyer.img.dto.DirectBuyOrderDto; -import com.bnyer.img.dto.OrderDetailsDto; -import com.bnyer.img.dto.OrderNotifyDto; import com.bnyer.img.service.YunmeiService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -65,10 +64,4 @@ public class YunmeiController extends BaseController { return AjaxResult.success(yunmeiService.getBalance()); } - //@RequiresPermissions("system:config:list") - @ApiOperation(value="云媒订单回调") - @PostMapping("/notifyOrder") - public AjaxResult notifyOrder(@ApiParam("云媒回调参数") @RequestBody OrderNotifyDto params){ - return AjaxResult.success(yunmeiService.orderNotify(params)); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BannerMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BannerMapper.java index 63d3a8d..faf7f8d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BannerMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BannerMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Banner; +import com.bnyer.common.core.domain.Banner; import com.bnyer.img.vo.BannerVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BzDataMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BzDataMapper.java index e5006a0..1b8a1a4 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BzDataMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/BzDataMapper.java @@ -1,13 +1,8 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.BzData; -import com.bnyer.img.vo.BannerVo; +import com.bnyer.common.core.domain.BzData; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface BzDataMapper extends BaseMapper { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorAccountMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorAccountMapper.java index 893e303..12d69a8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorAccountMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorAccountMapper.java @@ -1,8 +1,8 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.CreatorAccount; -import com.bnyer.img.vo.CreatorAccountVo; +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.vo.CreatorAccountVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,12 +18,4 @@ public interface CreatorAccountMapper extends BaseMapper { * @return - */ List queryFrontList(@Param("creatorId") Long creatorId); - - /** - * 根据类型查询艺术家账户列表 - * @param creatorId 艺术家id - * @param type 类型 - * @return - - */ - CreatorAccountVo queryListByType(@Param("creatorId")Long creatorId,@Param("type") String type); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java index 118b10d..6f3eee6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorMapper.java @@ -1,13 +1,14 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.dto.CreatorPageDto; -import com.bnyer.img.vo.*; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.img.vo.CreatorDetailsVo; +import com.bnyer.img.vo.CreatorFollowVo; +import com.bnyer.img.vo.CreatorHotVo; +import com.bnyer.img.vo.CreatorVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -24,20 +25,6 @@ public interface CreatorMapper extends BaseMapper { */ List queryThreeImgCreatorList(); - /** - * 查询艺术家分页 - * @param params 分页参数 - * @return - - */ - List queryPage(@Param("params") CreatorPageDto params); - - /** - * 批量更新艺术家 - * @param list 艺术家列表 - * @return - - */ - int updateBatch(@Param("list") List list); - /** * 查询10个热门艺术家列表 * @return - diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java index 9c58ff6..c691f09 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java @@ -1,9 +1,8 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.CreatorProfit; -import com.bnyer.img.dto.CreatorProfitPageDto; -import com.bnyer.img.dto.ProfitInOrEndDto; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.dto.ProfitInOrEndDto; import com.bnyer.img.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -108,35 +107,6 @@ public interface CreatorProfitMapper extends BaseMapper { */ void batchInsertInviteProfit(@Param("list") List list); - /** - * 查询所有指定平台类型待入账信息 - * @param platform 平台 - * @param appType 应用 - * @param type 收益类型 - * @param date 日期 - * @return - - */ - List queryPreProfit(@Param("platform") String platform,@Param("appType") String appType,@Param("type") String type,@Param("date") String date); - - /** - * 查询艺术家收益分页 - * @param params 参数 - * @return - - */ - List queryPage(@Param("params") CreatorProfitPageDto params); - - /** - * 查询除会员外所有已入账且已确认收益 - * @return - - */ - List queryConfirmList(); - - /** - * 批量更新收益单状态为转入钱包 - * @param list 订单列表 - */ - int batchUpdateTransInfo(@Param("list") List list); - /** * 查询艺术家累计收益 * @param creatorId 艺术家id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FeedbackMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FeedbackMapper.java index 2789353..b41eb12 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FeedbackMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FeedbackMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Feedback; +import com.bnyer.common.core.domain.Feedback; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FhUserMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FhUserMapper.java index c5a6369..6962325 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FhUserMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/FhUserMapper.java @@ -1,12 +1,8 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.FhUser; -import com.bnyer.img.dto.FhUserPageDto; +import com.bnyer.common.core.domain.FhUser; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @author chengkun @@ -14,5 +10,5 @@ import java.util.List; */ @Mapper public interface FhUserMapper extends BaseMapper { - List queryPage(@Param("params") FhUserPageDto dto); + } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java index 67fe0d8..3e5e41d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ImgSignRelationMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.ImgSignRelation; +import com.bnyer.common.core.domain.ImgSignRelation; import com.bnyer.img.vo.SignRelationVo; import com.bnyer.img.vo.SignVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/InviteLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/InviteLogMapper.java index 4c035a8..4ebc7ed 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/InviteLogMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/InviteLogMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.InviteLog; +import com.bnyer.common.core.domain.InviteLog; import com.bnyer.img.vo.InviteLogVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/NoticeMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/NoticeMapper.java index e6b4503..83db9d1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/NoticeMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/NoticeMapper.java @@ -1,10 +1,9 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Notice; +import com.bnyer.common.core.domain.Notice; import com.bnyer.img.vo.NoticeVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductMapper.java index 91e07b0..167841e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Product; +import com.bnyer.common.core.domain.Product; import com.bnyer.img.vo.ProductVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductOrderMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductOrderMapper.java index f4a6eb8..6e0b297 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductOrderMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProductOrderMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.ProductOrder; +import com.bnyer.common.core.domain.ProductOrder; public interface ProductOrderMapper extends BaseMapper { } \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java index e4df35a..810c838 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/SignMapper.java @@ -1,10 +1,9 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Sign; +import com.bnyer.common.core.domain.Sign; import com.bnyer.img.vo.SignImgVo; import com.bnyer.img.vo.SignVo; -import com.bnyer.img.vo.TiktokImgVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokCollectionMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokCollectionMapper.java index e5ce6f1..1fde5e9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokCollectionMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokCollectionMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokCollection; import com.bnyer.img.vo.TiktokCollectionVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java index f96acfc..1568cc9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.TiktokImg; +import com.bnyer.common.core.domain.TiktokImg; import com.bnyer.img.vo.ImgSignVo; import com.bnyer.img.vo.TiktokImgVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokLikeMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokLikeMapper.java index 5f25efe..ce34ea9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokLikeMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokLikeMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.TiktokLike; +import com.bnyer.common.core.domain.TiktokLike; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java index ccf79b4..b43bec0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokUserMapper.java @@ -1,21 +1,10 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokUserPageDto; -import com.bnyer.img.vo.TiktokUserVo; +import com.bnyer.common.core.domain.TiktokUser; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; @Mapper public interface TiktokUserMapper extends BaseMapper { - /** - * 查询用户分页 - * @param params 分页参数 - * @return - - */ - List queryPage(@Param("params") TiktokUserPageDto params); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java index 4eb23b9..042bd6b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TypeMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.Type; +import com.bnyer.common.core.domain.Type; import com.bnyer.img.vo.CreatorTypeVo; import com.bnyer.img.vo.TypeVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipMapper.java index b084f9e..683996b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.UserVip; +import com.bnyer.common.core.domain.UserVip; import com.bnyer.img.vo.UserVipVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipRecordMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipRecordMapper.java index caa0e4a..113a89d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipRecordMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/UserVipRecordMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.UserVipRecord; +import com.bnyer.common.core.domain.UserVipRecord; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/VerifyLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/VerifyLogMapper.java index cc7c5d1..0196f2e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/VerifyLogMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/VerifyLogMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.VerifyLog; +import com.bnyer.common.core.domain.VerifyLog; import com.bnyer.img.vo.VerifyLogVo; import org.apache.ibatis.annotations.Mapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java index def09c8..a043ed1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WithdrawLogMapper.java @@ -1,7 +1,7 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.WithdrawLog; +import com.bnyer.common.core.domain.WithdrawLog; import com.bnyer.img.vo.WithdrawLogVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WxUserMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WxUserMapper.java index 49286d4..6c35d02 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WxUserMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/WxUserMapper.java @@ -1,12 +1,8 @@ package com.bnyer.img.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.WxUser; -import com.bnyer.img.dto.WxUserPageDto; +import com.bnyer.common.core.domain.WxUser; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * @author chengkun @@ -14,5 +10,4 @@ import java.util.List; */ @Mapper public interface WxUserMapper extends BaseMapper { - List queryPage(@Param("params") WxUserPageDto dto); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/AlipayService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/AlipayService.java index 332cf23..6a4e048 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/AlipayService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/AlipayService.java @@ -1,6 +1,6 @@ package com.bnyer.img.service; -import com.bnyer.img.dto.AlipayParamDto; +import com.bnyer.common.core.dto.AlipayParamDto; import javax.servlet.http.HttpServletRequest; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java index 5846b95..94e02ee 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BannerService.java @@ -1,61 +1,15 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.vo.BannerVo; import java.util.List; public interface BannerService { - /** - * 新增banner - * @param banner - - * @return - - */ - int insert(Banner banner); - - /** - * 修改banner - * @param banner - - * @return - - */ - int update(Banner banner); - - /** - * 批量删除banner - * @param ids ids - * @return - - */ - int delete(List ids); - - /** - * 查询banner分页 - * @param dto 分页对象 - * @return - - */ - List queryPage(BannerPageDto dto); - - /** - * 查询banner详情 - * @param id 主键id - * @return - - */ - Banner queryDetails(Long id); - /** * 查询小程序banner列表 * @param source 平台 * @return - */ List queryList(String source); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BzDataService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BzDataService.java index 6d0365d..2f97c48 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BzDataService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/BzDataService.java @@ -2,21 +2,11 @@ package com.bnyer.img.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.BzData; -import com.bnyer.img.dto.BannerPageDto; -import com.bnyer.img.dto.BzDto; -import com.bnyer.img.vo.BannerVo; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; +import com.bnyer.common.core.domain.BzData; +import com.bnyer.common.core.dto.BzDto; public interface BzDataService { JSONObject getYs(BzDto dto); - void dataStatistics(String ip,String source); - - int update(BzData bzData,UpdateWrapper updateWrapper); - - String getIpAddr(HttpServletRequest request); + int update(BzData bzData, UpdateWrapper updateWrapper); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorAccountService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorAccountService.java index 7c8c9cb..bfa7098 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorAccountService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorAccountService.java @@ -1,10 +1,7 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.CreatorAccount; -import com.bnyer.img.dto.BannerPageDto; -import com.bnyer.img.dto.CreatorAccountPageDto; -import com.bnyer.img.vo.BannerVo; -import com.bnyer.img.vo.CreatorAccountVo; +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.vo.CreatorAccountVo; import java.util.List; @@ -31,13 +28,6 @@ public interface CreatorAccountService { */ int delete(List ids); - /** - * 查询艺术家账户分页 - * @param dto 分页对象 - * @return - - */ - List queryPage(CreatorAccountPageDto dto); - /** * 查询艺术家账户详情 * @param id 主键id @@ -51,21 +41,4 @@ public interface CreatorAccountService { * @return - */ List queryList(Long creatorId); - - /** - * 根据指定类型查询艺术家账户列表 - * @param creatorId 艺术家id - * @param type 类型 - * @return - - */ - CreatorAccountVo queryListByType(Long creatorId,String type); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java index be52b3b..a36ab7d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java @@ -1,9 +1,8 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.CreatorProfit; -import com.bnyer.img.dto.CreatorProfitAdInsertDto; -import com.bnyer.img.dto.CreatorProfitPageDto; -import com.bnyer.img.dto.ProfitInOrEndDto; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.dto.CreatorProfitAdInsertDto; +import com.bnyer.common.core.dto.ProfitInOrEndDto; import com.bnyer.img.vo.*; import java.util.List; @@ -42,41 +41,6 @@ public interface CreatorProfitService { */ int updateCreatorProfitDownloadNum(String mark); - /** - * 修改结算收益 - * @param creatorProfit 收益对象 - * @return - - */ - int update(CreatorProfit creatorProfit); - - /** - * 删除结算收益 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - - /** - * 查询结算收益分页 - * @param params 分页参数 - * @return - - */ - List queryPage(CreatorProfitPageDto params); - - /** - * 查询结算收益详情 - * @param id 主键id - * @return - - */ - CreatorProfit queryDetails(Long id); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeIsShow(Long id,String status); /** * 小程序艺术家手动确认收益 @@ -96,7 +60,6 @@ public interface CreatorProfitService { */ void batchDeleteUserDownloadNum(); - /** * 小程序查询收益信息 * @param creatorId 艺术家id @@ -149,36 +112,6 @@ public interface CreatorProfitService { */ List queryFrontEndProfitAmt(Long creatorId, String type); - /** - * 查询所有指定平台类型待入账信息 - * @param platform 平台 - * @param appType 应用 - * @param type 收益类型 - * @param date 日期 - * @return - - */ - List queryPreProfit(String platform,String appType,String type,String date); - - /** - * 查询除会员外所有已入账且已确认收益 - * @return - - */ - List queryConfirmList(); - - /** - * 根据艺术家id查询收益列表 - * @param creatorId 艺术家id - * @return - - */ - List queryProfitByCreatorId(Long creatorId); - - /** - * 批量更新收益单状态为转入钱包 - * @param list 订单列表 - * @return - - */ - int batchUpdate(List list); - /** * 查询转入钱包收益详情 * @param id 收益id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java index bb5b40b..aebc756 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorService.java @@ -1,8 +1,10 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.dto.*; -import com.bnyer.img.vo.*; +import com.bnyer.common.core.dto.CreatorDto; +import com.bnyer.common.core.dto.CreatorLoginDto; +import com.bnyer.img.vo.CreatorDetailsVo; +import com.bnyer.img.vo.CreatorHotVo; +import com.bnyer.img.vo.CreatorVo; import java.util.List; import java.util.Map; @@ -20,34 +22,6 @@ public interface CreatorService { */ int insertCreator(CreatorDto dto); - /** - * 修改艺术家 - * @param dto 艺术家参数 - * @return - - */ - int updateCreator(Creator dto); - - /** - * 删除艺术家 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - - /** - * 查询艺术家分页 - * @param params 分页参数 - * @return - - */ - List queryPage(CreatorPageDto params); - - /** - * 查询艺术家详情 - * @param id 主键id - * @return - - */ - Creator queryDetails(Long id); - /** * 查询艺术家首页3张图列表 * @return - @@ -61,35 +35,6 @@ public interface CreatorService { */ CreatorDetailsVo queryCreatorDetailsByScanCode(String scanCode); - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - - /** - * 审核通过 - * @param params 审核参数 - * @return - - */ - int verifyPass(VerifyCreatorDto params); - - /** - * 审核不通过 - * @param params 审核参数 - * @return - - */ - int verifyUnPass(VerifyCreatorDto params); - - /** - * 10天内重新发起审核 - * @param creatorId 主键id - * @return - - */ - int reVerify(Long creatorId); - /** * 小程序艺术家登录 * @param param 前端传来的参数 @@ -103,19 +48,6 @@ public interface CreatorService { */ boolean logout(String phone); - /** - * 查询所有审核通过的艺术家 - * @return - - */ - List queryPassList(); - - /** - * 批量更新艺术家 - * @param list 艺术家列表 - * @return - - */ - int batchUpdate(List list); - /** * 查询10个热门艺术家列表 * @return - @@ -149,4 +81,11 @@ public interface CreatorService { * @return - */ boolean checkInviteCode(String inviteCode); + + /** + * 10天内重新发起审核 + * @param creatorId 主键id + * @return - + */ + int reVerify(Long creatorId); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java index cf6f27c..8e6982e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FeedBackService.java @@ -1,8 +1,6 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Feedback; - -import java.util.List; +import com.bnyer.common.core.domain.Feedback; public interface FeedBackService { @@ -12,41 +10,4 @@ public interface FeedBackService { * @return - */ int insert(Feedback feedback); - - /** - * 编辑反馈 - * @param feedback 反馈 - * @return - */ - int update(Feedback feedback); - - /** - * 批量删除反馈 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - - /** - * 查询反馈分页 - * @param source 平台渠道来源 - * @param isShow 是否显示 - * @return - - */ - List queryPage(String source,String isShow); - - /** - * 获取反馈详情 - * @param id 主键id - * @return - - */ - Feedback queryDetails(Long id); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FhUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FhUserService.java index 8ae66eb..5a8bc9a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FhUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/FhUserService.java @@ -1,42 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.FhUser; -import com.bnyer.img.dto.FhLoginDto; -import com.bnyer.img.dto.FhUserPageDto; +import com.bnyer.common.core.dto.FhLoginDto; -import java.util.List; import java.util.Map; public interface FhUserService { - /** - * 修改快手用户 - * @param fhUser 快手用户 - * @return - - */ - int update(FhUser fhUser); - - /** - * 批量删除快手用户 - * @param ids 主键Ids - * @return - - */ - int delete(List ids); - - /** - * 查询快手用户分页 - * @param dto 分页条件对象 - * @return - - */ - List queryPage(FhUserPageDto dto); - - /** - * 根据id获取用户 - * @param id 主键id - * @return - - */ - FhUser queryDetails(Long id); - /** * 快手登录参数 * @param dto 登录参数 @@ -44,14 +13,6 @@ public interface FhUserService { */ Map login(FhLoginDto dto); - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - /** * 检查某平台用户当日下载次数是否超标 * @param userId 用户id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/InviteLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/InviteLogService.java index e719cb0..bc05a8b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/InviteLogService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/InviteLogService.java @@ -1,11 +1,6 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.InviteLog; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.InviteLogPageDto; -import com.bnyer.img.dto.VerifyPageDto; import com.bnyer.img.vo.InviteLogVo; -import com.bnyer.img.vo.VerifyLogVo; import java.util.List; @@ -15,20 +10,6 @@ import java.util.List; */ public interface InviteLogService { - /** - * 查询邀请记录分页 - * @param params 分页参数 - * @return - - */ - List queryPage(InviteLogPageDto params); - - /** - * 删除记录 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - /** * 小程序查询指定艺术家邀请记录 * @param creatorId 艺术家id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/NoticeService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/NoticeService.java index 223f942..8c4a2d0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/NoticeService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/NoticeService.java @@ -1,48 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Notice; -import com.bnyer.img.dto.NoticePageDto; import com.bnyer.img.vo.NoticeVo; import java.util.List; public interface NoticeService { - /** - * 新增notice - * @param notice - - * @return - - */ - int insert(Notice notice); - - /** - * 修改notice - * @param notice - - * @return - - */ - int update(Notice notice); - - /** - * 批量删除notice - * @param ids ids - * @return - - */ - int delete(List ids); - - /** - * 查询notice分页 - * @param dto 分页对象 - * @return - - */ - List queryPage(NoticePageDto dto); - - /** - * 查询notice详情 - * @param id 主键id - * @return - - */ - Notice queryDetails(Long id); - /** * 查询小程序notice列表 * @return - @@ -55,13 +18,4 @@ public interface NoticeService { * @return - */ NoticeVo queryFrontDetails(Long id); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id, String status); - } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProductService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProductService.java index 707c190..8485a20 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProductService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProductService.java @@ -1,48 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Product; -import com.bnyer.img.dto.ProductPageDto; import com.bnyer.img.vo.ProductVo; import java.util.List; public interface ProductService { - /** - * 新增商品 - * @param product 商品 - * @return - - */ - int insert(Product product); - - /** - * 编辑商品 - * @param product 商品 - * @return - - */ - int update(Product product); - - /** - * 批量删除商品 - * @param ids 商品ids - * @return - - */ - int delete(List ids); - - /** - * 查询商品分页 - * @param params 分页参数 - * @return - - */ - List queryPage(ProductPageDto params); - - /** - * 查询商品详情 - * @param id 主键id - * @return - - */ - Product details(Long id); - /** * 查询前端商品列表 * @return - @@ -55,12 +18,4 @@ public interface ProductService { * @return - */ ProductVo queryFrontDetails(Long id); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java index ffa6945..fb0906e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/SignService.java @@ -1,63 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Sign; -import com.bnyer.img.dto.SignPageDto; import com.bnyer.img.vo.SignImgVo; import com.bnyer.img.vo.SignVo; -import com.bnyer.img.vo.TiktokImgVo; import java.util.List; public interface SignService { - /** - * 后台新增Sign - * @param sign 标签 - * @return - - */ - int insert(Sign sign); - - /** - * 修改sign - * @param sign - - * @return - - */ - int update(Sign sign); - - /** - * 批量删除sign - * @param ids ids - * @return - - */ - int delete(List ids); - - /** - * 查询sign分页 - * @param dto 分页对象 - * @return - - */ - List queryPage(SignPageDto dto); - - /** - * 查询sign详情 - * @param id 主键id - * @return - - */ - Sign queryDetails(Long id); - - /** - * 查询sign是否重复 - * @param name 标签名字 - * @return - - */ - boolean checkSign(String name); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); /** * 查询上传页面标签列表 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java index 6304137..85f0bc7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java @@ -1,9 +1,7 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TiktokImgMiniDto; -import com.bnyer.img.dto.TiktokImgPageDto; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.TiktokImgMiniDto; import com.bnyer.img.vo.CreatorTypeImgVo; import com.bnyer.img.vo.ImgSignVo; import com.bnyer.img.vo.TiktokImgVo; @@ -18,13 +16,6 @@ public interface TiktokImgService { */ void insert(TiktokImgMiniDto dto); - /** - * 修改图片 - * @param tiktokImg 图片 - * @return - - */ - int update(TiktokImg tiktokImg); - /** * 批量删除ids * @param ids 主键ids @@ -32,20 +23,6 @@ public interface TiktokImgService { */ int delete(List ids); - /** - * 查询抖音图片分页 - * @param dto 分页参数对象 - * @return - - */ - List queryPage(TiktokImgPageDto dto); - - /** - * 查询抖音图片详情 - * @param id 主键id - * @return - - */ - TiktokImg queryDetails(Long id); - /** * 查询指定艺术家对内的图片集合 * @param creatorId 艺术家id @@ -77,29 +54,6 @@ public interface TiktokImgService { */ TiktokImgVo queryCreatorImgDetails(String imgId); - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - - /** - * 变更审核状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeJudge(Long id,String status); - - /** - * 变更热门状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeHot(Long id,String status); /** * 图片下载总数量写入缓存 diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java index 781f3bc..dc814b6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokUserService.java @@ -1,42 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokLoginDto; -import com.bnyer.img.dto.TiktokUserPageDto; +import com.bnyer.common.core.dto.TiktokLoginDto; -import java.util.List; import java.util.Map; public interface TiktokUserService { - /** - * 修改抖音用户 - * @param tiktokUser 抖音用户 - * @return - - */ - int update(TiktokUser tiktokUser); - - /** - * 批量删除抖音用户 - * @param ids 主键Ids - * @return - - */ - int delete(List ids); - - /** - * 查询抖音用户分页 - * @param dto 分页条件对象 - * @return - - */ - List queryPage(TiktokUserPageDto dto); - - /** - * 根据id获取用户 - * @param id 主键id - * @return - - */ - TiktokUser queryDetails(Long id); - /** * 抖音登录参数 * @param dto 登录参数 @@ -44,14 +13,6 @@ public interface TiktokUserService { */ Map login(TiktokLoginDto dto); - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - /** * 检查某平台用户当日下载次数是否超标 * @param userId 用户id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java index 93523b9..bbb8a1c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TypeService.java @@ -1,59 +1,14 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.Type; import com.bnyer.img.vo.TypeVo; import java.util.List; public interface TypeService { - /** - * 新增图片分类 - * @param type 类型 - * @return - - */ - int insert(Type type); - - /** - * 修改图片类型 - * @param type 类型 - * @return - - */ - int update(Type type); - - /** - * 批量删除图片分类 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - - /** - * 查询图片分类分页 - * @param typeName 分类名称 - * @param isShow 是否显示 - * @return - - */ - List queryPage(String typeName,String isShow); - /** * 小程序端查询图片分类列表 * @return - */ List queryList(); - - /** - * 查询分类详情 - * @param id 主键id - * @return - - */ - Type queryDetails(Long id); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipRecordService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipRecordService.java index b00305f..b778e2d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipRecordService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipRecordService.java @@ -1,7 +1,6 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.UserVipRecord; -import com.bnyer.img.dto.PayUserVipDto; +import com.bnyer.common.core.dto.PayUserVipDto; public interface UserVipRecordService { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipService.java index dce292d..b873ec7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/UserVipService.java @@ -1,56 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.UserVip; -import com.bnyer.img.dto.UserVipPageDto; import com.bnyer.img.vo.UserVipVo; import java.util.List; public interface UserVipService { - /** - * 新增会员vip - * @param userVip vip - * @return - - */ - int insert(UserVip userVip); - - /** - * 修改会员vip - * @param userVip vip - * @return - - */ - int update(UserVip userVip); - - /** - * 删除会员vip - * @param ids vip列表 - * @return - - */ - int delete(List ids); - - /** - * 获取会员vip详情 - * @param id 主键id - * @return - - */ - UserVip queryDetails(Long id); - - /** - * 获取会员vip分页 - * @param param 分页参数 - * @return - - */ - List queryPage(UserVipPageDto param); - - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - /** * 获取小程序端会员vip列表 * @return - diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/VerifyLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/VerifyLogService.java index d774e7c..4c9b3fe 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/VerifyLogService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/VerifyLogService.java @@ -1,31 +1,13 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.VerifyPageDto; import com.bnyer.img.vo.VerifyLogVo; -import java.util.List; - /** * @author chengkun * @date 2022/5/31 10:37 */ public interface VerifyLogService { - /** - * 查询审核记录分页 - * @param params 分页参数 - * @return - - */ - List queryPage(VerifyPageDto params); - - /** - * 删除记录 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - /** * 根据艺术家id查询审核状态记录 * @param creatorId 艺术家id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java index f4794ff..19cf178 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WithdrawLogService.java @@ -1,8 +1,6 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.WithdrawLog; -import com.bnyer.img.dto.VerifyDto; -import com.bnyer.img.dto.WithdrawPageDto; +import com.bnyer.common.core.domain.WithdrawLog; import com.bnyer.img.vo.WithdrawLogVo; import java.math.BigDecimal; @@ -21,27 +19,6 @@ public interface WithdrawLogService { */ int insert(WithdrawLog withdrawLog); - /** - * 查询提现记录分页 - * @param params 分页参数 - * @return - - */ - List queryPage(WithdrawPageDto params); - - /** - * 查询提现详情 - * @param id 主键id - * @return - - */ - WithdrawLog queryDetails(Long id); - - /** - * 删除记录 - * @param ids 主键ids - * @return - - */ - int delete(List ids); - /** * 小程序查询艺术家提现记录列表 * @param creatorId 艺术家id @@ -56,14 +33,6 @@ public interface WithdrawLogService { */ WithdrawLogVo queryFrontDetails(String orderId); - /** - * 审核提现通过 - * @param params 审核参数 - * @return - - */ - int verify(VerifyDto params); - - /** * 检查该艺术家是否可提现 * @param creatorId 艺术家id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WxUserService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WxUserService.java index 1f5ed02..99960b9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WxUserService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/WxUserService.java @@ -1,42 +1,11 @@ package com.bnyer.img.service; -import com.bnyer.img.domain.WxUser; -import com.bnyer.img.dto.WxLoginDto; -import com.bnyer.img.dto.WxUserPageDto; +import com.bnyer.common.core.dto.WxLoginDto; -import java.util.List; import java.util.Map; public interface WxUserService { - /** - * 修改微信用户 - * @param wxUser 微信用户 - * @return - - */ - int update(WxUser wxUser); - - /** - * 批量删除微信用户 - * @param ids 主键Ids - * @return - - */ - int delete(List ids); - - /** - * 查询微信用户分页 - * @param dto 分页条件对象 - * @return - - */ - List queryPage(WxUserPageDto dto); - - /** - * 根据id获取用户 - * @param id 主键id - * @return - - */ - WxUser queryDetails(Long id); - /** * 微信登录参数 * @param param 登录参数 @@ -44,14 +13,6 @@ public interface WxUserService { */ Map login(WxLoginDto param); - /** - * 变更显示状态 - * @param id 主键id - * @param status 状态 - * @return - - */ - int changeStatus(Long id,String status); - /** * 检查某平台用户当日下载次数是否超标 * @param userId 用户id diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/YunmeiService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/YunmeiService.java index 3b8c3e7..267cedc 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/YunmeiService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/YunmeiService.java @@ -2,9 +2,9 @@ package com.bnyer.img.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.bnyer.img.dto.CardBuyOrderDto; -import com.bnyer.img.dto.DirectBuyOrderDto; -import com.bnyer.img.dto.OrderNotifyDto; +import com.bnyer.common.core.dto.CardBuyOrderDto; +import com.bnyer.common.core.dto.DirectBuyOrderDto; +import com.bnyer.common.core.dto.OrderNotifyDto; public interface YunmeiService { diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/AlipayServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/AlipayServiceImpl.java index 1dea344..523c982 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/AlipayServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/AlipayServiceImpl.java @@ -6,8 +6,8 @@ import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.internal.util.AlipaySignature; import com.alipay.api.request.AlipayTradePagePayRequest; +import com.bnyer.common.core.dto.AlipayParamDto; import com.bnyer.img.config.AlipayConfig; -import com.bnyer.img.dto.AlipayParamDto; import com.bnyer.img.service.AlipayService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java index 75de677..cc8c881 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BannerServiceImpl.java @@ -1,20 +1,12 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.Type; -import com.bnyer.img.dto.BannerPageDto; import com.bnyer.img.mapper.BannerMapper; import com.bnyer.img.service.BannerService; import com.bnyer.img.vo.BannerVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -24,60 +16,8 @@ public class BannerServiceImpl implements BannerService { @Autowired private BannerMapper bannerMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(Banner banner) { - banner.setCreateTime(new Date()); - banner.setUpdateTime(new Date()); - return bannerMapper.insert(banner); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Banner banner) { - banner.setUpdateTime(new Date()); - return bannerMapper.updateById(banner); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return bannerMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(BannerPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(dto.getBannerName())){ - wrapper.like(Banner::getBannerName,dto.getBannerName()); - } - if(StringUtils.isNotBlank(dto.getSource())){ - wrapper.eq(Banner::getSource, dto.getSource()); - } - if(StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(Banner::getIsShow, dto.getIsShow()); - } - wrapper.orderByDesc(Banner::getSort); - return bannerMapper.selectList(wrapper); - } - - @Override - public Banner queryDetails(Long id) { - return bannerMapper.selectById(id); - } - @Override public List queryList(String source) { return bannerMapper.queryList(source); } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Banner::getId, id); - Banner banner = new Banner(); - banner.setIsShow(status); - return bannerMapper.update(banner,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BzDataServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BzDataServiceImpl.java index 41ee1e2..496cf88 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BzDataServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/BzDataServiceImpl.java @@ -2,23 +2,12 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.bnyer.common.core.domain.R; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.redis.service.RedisService; +import com.bnyer.common.core.domain.BzData; +import com.bnyer.common.core.dto.BzDto; import com.bnyer.img.config.BzConfig; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.BzData; -import com.bnyer.img.dto.BannerPageDto; -import com.bnyer.img.dto.BzDto; -import com.bnyer.img.mapper.BannerMapper; import com.bnyer.img.mapper.BzDataMapper; -import com.bnyer.img.service.BannerService; import com.bnyer.img.service.BzDataService; -import com.bnyer.img.vo.BannerVo; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -28,21 +17,14 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URLEncoder; -import java.time.LocalDate; -import java.util.Date; -import java.util.List; @Service @Slf4j public class BzDataServiceImpl implements BzDataService { - @Autowired - private RedisService redisService; @Autowired private BzDataMapper bzDataMapper; @Autowired @@ -93,74 +75,8 @@ public class BzDataServiceImpl implements BzDataService { return null; } - @Override - public void dataStatistics(String ip, String source) { - String today = LocalDate.now() + ""; - String page="bzPage_" + source; - //保存今天的key - redisService.redisTemplate.opsForZSet().add("bzPage_key" +today, today+page, 1.0); - //pv统计 - redisService.pvStatistics(today, page); - //uv统计 - redisService.uvStatistics(today, page, ip); - //查看是否已经有了这条数据 - if (!redisService.hasKey(today + source)) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("date", today); - wrapper.eq("source", source); - List bzData = bzDataMapper.selectList(wrapper); - if (bzData.size() <= 0) { - BzData data = new BzData(); - data.setDate(today); - data.setPv(1L); - data.setUv(1L); - data.setSource(source); - data.setMark(today + source); - bzDataMapper.insert(data); - } - } - } - @Override public int update(BzData bzData, UpdateWrapper updateWrapper) { return bzDataMapper.update(bzData,updateWrapper); } - - @Override - public String getIpAddr(HttpServletRequest request) { - String ip = request.getHeader("x-forwarded-for"); - //System.out.println("x-forwarded-for ip: " + ip); - if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) { - // 多次反向代理后会有多个ip值，第一个ip才是真实ip - if (ip.indexOf(",") != -1) { - ip = ip.split(",")[0]; - } - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - //System.out.println("Proxy-Client-IP ip: " + ip); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - //System.out.println("WL-Proxy-Client-IP ip: " + ip); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_CLIENT_IP"); - //System.out.println("HTTP_CLIENT_IP ip: " + ip); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("HTTP_X_FORWARDED_FOR"); - //System.out.println("HTTP_X_FORWARDED_FOR ip: " + ip); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getHeader("X-Real-IP"); - //System.out.println("X-Real-IP ip: " + ip); - } - if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - //System.out.println("getRemoteAddr ip: " + ip); - } - //System.out.println("获取客户端ip: " + ip); - return ip; - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java index 05ac9e1..39d052b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorAccountServiceImpl.java @@ -1,16 +1,13 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.CreatorAccount; import com.bnyer.common.core.utils.DesensitizedUtils; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.CreatorAccount; -import com.bnyer.img.dto.CreatorAccountPageDto; +import com.bnyer.common.core.vo.CreatorAccountVo; import com.bnyer.img.mapper.CreatorAccountMapper; import com.bnyer.img.service.CreatorAccountService; -import com.bnyer.img.vo.CreatorAccountVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,46 +44,6 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { return creatorAccountMapper.deleteBatchIds(ids); } - @Override - public List queryPage(CreatorAccountPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(dto.getName())){ - wrapper.like(CreatorAccount::getName, dto.getName()); - } - if(StringUtils.isNotBlank(dto.getBankNo())){ - wrapper.eq(CreatorAccount::getBankNo, Sm4Util.sm4Encryption(dto.getBankNo())); - } - if(StringUtils.isNotBlank(dto.getIdNo())){ - wrapper.eq(CreatorAccount::getIdNo, Sm4Util.sm4Encryption(dto.getIdNo())); - } - if(StringUtils.isNotBlank(dto.getPhone())){ - wrapper.eq(CreatorAccount::getPhone, Sm4Util.sm4Encryption(dto.getPhone())); - } - if(StringUtils.isNotBlank(dto.getAliPayNo())){ - wrapper.eq(CreatorAccount::getAliPayNo, Sm4Util.sm4Encryption(dto.getAliPayNo())); - } - if(StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(CreatorAccount::getIsShow, dto.getIsShow()); - } - if(StringUtils.isNotBlank(dto.getType())){ - wrapper.eq(CreatorAccount::getType, dto.getType()); - } - wrapper.orderByDesc(CreatorAccount::getSort); - List creatorAccounts = creatorAccountMapper.selectList(wrapper); - for (CreatorAccount creatorAccount : creatorAccounts) { - creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); - creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); - creatorAccount.setName(creatorAccount.getName()); - if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ - creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); - } - if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ - creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); - } - JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); - } - return creatorAccounts; - } @Override public CreatorAccount queryDetails(Long id) { @@ -121,29 +78,4 @@ public class CreatorAccountServiceImpl implements CreatorAccountService { } return creatorAccountVos; } - - @Override - public CreatorAccountVo queryListByType(Long creatorId, String type) { - CreatorAccountVo creatorAccount = creatorAccountMapper.queryListByType(creatorId, type); - if(creatorAccount != null){ - if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ - creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); - } - if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ - creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); - } - return creatorAccount; - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(CreatorAccount::getId, id); - CreatorAccount creatorAccount = new CreatorAccount(); - creatorAccount.setIsShow(status); - return creatorAccountMapper.update(creatorAccount,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java index 797408c..2d9b524 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java @@ -3,14 +3,13 @@ package com.bnyer.img.service.impl; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.dto.CreatorProfitAdInsertDto; +import com.bnyer.common.core.dto.ProfitInOrEndDto; import com.bnyer.common.redis.service.RedisService; import com.bnyer.common.redis.service.RedissonService; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.domain.CreatorProfit; -import com.bnyer.img.domain.InviteLog; -import com.bnyer.img.dto.CreatorProfitAdInsertDto; -import com.bnyer.img.dto.CreatorProfitPageDto; -import com.bnyer.img.dto.ProfitInOrEndDto; import com.bnyer.img.mapper.CreatorProfitMapper; import com.bnyer.img.mapper.InviteLogMapper; import com.bnyer.img.service.CreatorProfitService; @@ -192,40 +191,6 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { return creatorProfitMapper.updateDownloadNum(mark); } - @Override - @Transactional(rollbackFor = Exception.class) - public int update(CreatorProfit creatorProfit) { - creatorProfit.setUpdateTime(new Date()); - return creatorProfitMapper.updateById(creatorProfit); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return creatorProfitMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(CreatorProfitPageDto dto) { - return creatorProfitMapper.queryPage(dto); - } - - @Override - public CreatorProfit queryDetails(Long id) { - return creatorProfitMapper.selectById(id); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeIsShow(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(CreatorProfit::getId, id); - CreatorProfit creatorProfit = new CreatorProfit(); - creatorProfit.setIsShow(status); - return creatorProfitMapper.update(creatorProfit, wrapper); - } - @Override @Transactional(rollbackFor = Exception.class) public int handleUpdateConfirmType(Long id, Long creatorId) { @@ -334,32 +299,6 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { return creatorProfitMapper.queryFrontEndProfitAmt(creatorId, type); } - @Override - public List queryPreProfit(String platform, String appType, String type, String date) { - return creatorProfitMapper.queryPreProfit(platform, appType, type, date); - } - - @Override - public List queryConfirmList() { - return creatorProfitMapper.queryConfirmList(); - } - - @Override - public List queryProfitByCreatorId(Long creatorId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(CreatorProfit::getCreatorId, creatorId); - wrapper.eq(CreatorProfit::getStatus, "1"); - wrapper.eq(CreatorProfit::getConfirmStatus, "1"); - wrapper.notIn(CreatorProfit::getType, "2"); - return creatorProfitMapper.selectList(wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int batchUpdate(List list) { - return creatorProfitMapper.batchUpdateTransInfo(list); - } - @Override public CreatorProfitEndAmtVo queryFrontEndAmtDetails(Long id) { return creatorProfitMapper.queryFrontEndAmtDetails(id); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java index 03d53bd..8896125 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorServiceImpl.java @@ -3,25 +3,19 @@ package com.bnyer.img.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.dto.CreatorDto; +import com.bnyer.common.core.dto.CreatorLoginDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.domain.InviteLog; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.CreatorDto; -import com.bnyer.img.dto.CreatorLoginDto; -import com.bnyer.img.dto.CreatorPageDto; -import com.bnyer.img.dto.VerifyCreatorDto; import com.bnyer.img.mapper.CreatorMapper; import com.bnyer.img.mapper.InviteLogMapper; -import com.bnyer.img.mapper.TiktokImgMapper; -import com.bnyer.img.mapper.VerifyLogMapper; import com.bnyer.img.service.CreatorService; import com.bnyer.img.vo.CreatorDetailsVo; import com.bnyer.img.vo.CreatorHotVo; @@ -32,7 +26,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.RestTemplate; import java.math.BigDecimal; import java.util.*; @@ -49,21 +42,12 @@ public class CreatorServiceImpl implements CreatorService { @Autowired private CreatorMapper creatorMapper; - @Autowired - private TiktokImgMapper tiktokImgMapper; - - @Autowired - private VerifyLogMapper verifyLogMapper; - @Autowired private InviteLogMapper inviteLogMapper; @Autowired private RedisService redisService; - @Autowired - private RestTemplate restTemplate; - @Override public boolean checkPhone(String phone){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -108,7 +92,7 @@ public class CreatorServiceImpl implements CreatorService { wrapper.eq(Creator::getInviteCode, StringUtils.trim(dto.getInviteCode())); Creator creatorProtoType = creatorMapper.selectOne(wrapper); if(creatorProtoType == null){ - throw new ServiceException("邀请码不存在,请重新编辑！",TiktokConstant.INVITE_CODE_NOT_EXIST); + throw new ServiceException("邀请码不存在,请重新编辑！", TiktokConstant.INVITE_CODE_NOT_EXIST); } Creator creator = new Creator(); creator.setName(StringUtils.trim(dto.getName())); @@ -142,45 +126,6 @@ public class CreatorServiceImpl implements CreatorService { return insert; } - @Override - @Transactional(rollbackFor = Exception.class) - public int updateCreator(Creator dto) { - if(StringUtils.isNotBlank(dto.getPhone())){ - dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); - } - dto.setUpdateTime(new Date()); - return creatorMapper.updateById(dto); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - int delete = creatorMapper.deleteBatchIds(ids); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - LambdaQueryWrapper verifyLogWrapper = new LambdaQueryWrapper<>(); - for (Long id : ids) { - //删除对应艺术家图片 - wrapper.eq(TiktokImg::getCreatorId,id); - tiktokImgMapper.delete(wrapper); - //删除对应审核记录 - verifyLogWrapper.eq(VerifyLog::getCreatorId, id); - verifyLogMapper.delete(verifyLogWrapper); - } - return delete; - } - - @Override - public List queryPage(CreatorPageDto params) { - return creatorMapper.queryPage(params); - } - - @Override - public Creator queryDetails(Long id) { - Creator creator = creatorMapper.selectById(id); - creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); - return creator; - } - @Override public List queryThreeImgCreatorList() { List creatorVos = creatorMapper.queryThreeImgCreatorList(); @@ -198,63 +143,7 @@ public class CreatorServiceImpl implements CreatorService { return creatorMapper.queryCreatorDetailsByScanCode(scanCode); } - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Creator::getId, id); - Creator creator = new Creator(); - creator.setIsShow(status); - return creatorMapper.update(creator,wrapper); - } - @Override - @Transactional(rollbackFor = Exception.class) - public int verifyPass(VerifyCreatorDto params) { - //修改状态 - Creator creator = creatorMapper.selectById(params.getId()); - creator.setStatus("1"); - creatorMapper.updateById(creator); - //写入记录 - VerifyLog log = new VerifyLog(); - log.setCreatorId(params.getId()); - log.setAdminId(params.getAdminId()); - log.setReason(params.getReason()); - log.setCreateTime(new Date()); - log.setUpdateTime(new Date()); - log.setIsShow("1"); - log.setStatus("1"); - return verifyLogMapper.insert(log); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int verifyUnPass(VerifyCreatorDto params) { - //修改状态 - Creator creator = creatorMapper.selectById(params.getId()); - creator.setStatus("2"); - creatorMapper.updateById(creator); - //写入记录 - VerifyLog log = new VerifyLog(); - log.setCreatorId(params.getId()); - log.setAdminId(params.getAdminId()); - log.setReason(params.getReason()); - log.setCreateTime(new Date()); - log.setUpdateTime(new Date()); - log.setIsShow("1"); - log.setStatus("0"); - return verifyLogMapper.insert(log); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int reVerify(Long creatorId) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Creator::getId, creatorId); - Creator creator = new Creator(); - creator.setStatus("0"); - return creatorMapper.update(creator,wrapper); - } @Override public Map login(CreatorLoginDto dto) { @@ -306,20 +195,6 @@ public class CreatorServiceImpl implements CreatorService { } - @Override - public List queryPassList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Creator::getStatus, "1"); - wrapper.eq(Creator::getIsShow, "1"); - return creatorMapper.selectList(wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int batchUpdate(List list) { - return creatorMapper.updateBatch(list); - } - @Override public List queryHotCreatorList() { List creatorHotVos = creatorMapper.queryHotCreatorList(); @@ -343,4 +218,14 @@ public class CreatorServiceImpl implements CreatorService { return null; } } + + @Override + @Transactional(rollbackFor = Exception.class) + public int reVerify(Long creatorId) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Creator::getId, creatorId); + Creator creator = new Creator(); + creator.setStatus("0"); + return creatorMapper.update(creator,wrapper); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java index ae2bbfb..708e7b0 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FeedBackServiceImpl.java @@ -1,21 +1,14 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.bnyer.common.core.utils.PageUtils; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.Feedback; +import com.bnyer.common.core.domain.Feedback; import com.bnyer.img.mapper.FeedbackMapper; import com.bnyer.img.service.FeedBackService; -import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; -import java.util.List; @Service @Slf4j @@ -31,45 +24,4 @@ public class FeedBackServiceImpl implements FeedBackService { feedback.setUpdateTime(new Date()); return feedbackMapper.insert(feedback); } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Feedback feedback) { - feedback.setUpdateTime(new Date()); - return feedbackMapper.updateById(feedback); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return feedbackMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(String source,String isShow) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(source)){ - wrapper.eq(Feedback::getSource,source); - } - if(StringUtils.isNotBlank(isShow)){ - wrapper.eq(Feedback::getIsShow,isShow); - } - wrapper.orderByDesc(Feedback::getCreateTime); - return feedbackMapper.selectList(wrapper); - } - - @Override - public Feedback queryDetails(Long id) { - return feedbackMapper.selectById(id); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Feedback::getId, id); - Feedback feedback = new Feedback(); - feedback.setIsShow(status); - return feedbackMapper.update(feedback,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FhUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FhUserServiceImpl.java index 3dae245..6470b78 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FhUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FhUserServiceImpl.java @@ -2,23 +2,16 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.FhUser; +import com.bnyer.common.core.dto.FhLoginDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.Sm4Util; -import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.config.FhConfig; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.FhUser; -import com.bnyer.img.domain.TiktokCollection; -import com.bnyer.img.domain.TiktokLike; -import com.bnyer.img.dto.FhLoginDto; -import com.bnyer.img.dto.FhUserPageDto; import com.bnyer.img.mapper.FhUserMapper; -import com.bnyer.img.mapper.TiktokCollectionMapper; -import com.bnyer.img.mapper.TiktokLikeMapper; import com.bnyer.img.service.FhUserService; import com.bnyer.img.vo.FhSessionInfoVo; import com.bnyer.img.vo.FhUserInfoVo; @@ -27,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; @@ -36,7 +28,10 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.TimeUnit; @Service @@ -49,56 +44,12 @@ public class FhUserServiceImpl implements FhUserService { @Autowired private RedisService redisService; - @Autowired - private TiktokLikeMapper tiktokLikeMapper; - - @Autowired - private TiktokCollectionMapper tiktokCollectionMapper; - @Autowired private FhConfig fhConfig; @Autowired private RestTemplate restTemplate; - @Override - @Transactional(rollbackFor = Exception.class) - public int update(FhUser fhUser) { - fhUser.setUpdateTime(new Date()); - if (StringUtils.isNotBlank(fhUser.getFhCode())) { - fhUser.setFhCode(Sm4Util.sm4Encryption(fhUser.getFhCode())); - } - return fhUserMapper.updateById(fhUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - int delete = fhUserMapper.deleteBatchIds(ids); - //删除对应用户收藏及点赞记录 - LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); - LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); - for (Long id : ids) { - collectionWrapper.eq(TiktokCollection::getUserId, id) - .eq(TiktokCollection::getPlatform, "1"); - tiktokCollectionMapper.delete(collectionWrapper); - likeWrapper.eq(TiktokLike::getUserId, id) - .eq(TiktokLike::getPlatform, "1"); - tiktokLikeMapper.delete(likeWrapper); - } - return delete; - } - - @Override - public List queryPage(FhUserPageDto dto) { - return fhUserMapper.queryPage(dto); - } - - @Override - public FhUser queryDetails(Long id) { - return fhUserMapper.selectById(id); - } - /** * 获取用户openId及sessionKey * @param code 登录凭证code @@ -200,16 +151,6 @@ public class FhUserServiceImpl implements FhUserService { return map; } - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(FhUser::getId, id); - FhUser user = new FhUser(); - user.setIsShow(status); - return fhUserMapper.update(user, wrapper); - } - @Override public boolean checkUserCanDownload(Long userId, String platform, String appType) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FollowServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FollowServiceImpl.java index ab3c208..d9bab2c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FollowServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/FollowServiceImpl.java @@ -1,19 +1,20 @@ package com.bnyer.img.service.impl; +import com.bnyer.common.core.constant.RedisKeyConstant; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.PlatformConstant; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.domain.Creator; import com.bnyer.img.mapper.CreatorMapper; import com.bnyer.img.service.FollowService; import com.bnyer.img.vo.CreatorFollowVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author chengkun @@ -26,9 +27,6 @@ public class FollowServiceImpl implements FollowService { @Autowired private RedisService redisService; - @Autowired - private RedisTemplate redisTemplate; - @Autowired private CreatorMapper creatorMapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/InviteLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/InviteLogServiceImpl.java index e320927..e794f9c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/InviteLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/InviteLogServiceImpl.java @@ -1,19 +1,11 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.InviteLog; -import com.bnyer.img.dto.InviteLogPageDto; -import com.bnyer.img.dto.VerifyPageDto; import com.bnyer.img.mapper.InviteLogMapper; import com.bnyer.img.service.InviteLogService; -import com.bnyer.img.service.VerifyLogService; import com.bnyer.img.vo.InviteLogVo; -import com.bnyer.img.vo.VerifyLogVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -28,30 +20,8 @@ public class InviteLogServiceImpl implements InviteLogService { @Autowired private InviteLogMapper inviteLogMapper; - - @Override - public List queryPage(InviteLogPageDto params) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(params.getIsShow())){ - wrapper.eq(InviteLog::getIsShow,params.getIsShow()); - } - if(StringUtils.isNotBlank(params.getInviteCode())){ - wrapper.eq(InviteLog::getInviteCode,params.getInviteCode()); - } - wrapper.orderByDesc(InviteLog::getCreateTime); - return inviteLogMapper.selectList(wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return inviteLogMapper.deleteBatchIds(ids); - } - @Override public List queryFrontList(Long creatorId) { return inviteLogMapper.queryFrontList(creatorId); } - - } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/NoticeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/NoticeServiceImpl.java index 5af65a7..1ff00bd 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/NoticeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/NoticeServiceImpl.java @@ -1,19 +1,12 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.Notice; -import com.bnyer.img.dto.NoticePageDto; import com.bnyer.img.mapper.NoticeMapper; import com.bnyer.img.service.NoticeService; import com.bnyer.img.vo.NoticeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -23,48 +16,6 @@ public class NoticeServiceImpl implements NoticeService { @Autowired private NoticeMapper noticeMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(Notice notice) { - notice.setCreateTime(new Date()); - notice.setUpdateTime(new Date()); - return noticeMapper.insert(notice); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Notice notice) { - notice.setUpdateTime(new Date()); - return noticeMapper.updateById(notice); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return noticeMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(NoticePageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(dto.getTitle())){ - wrapper.like(Notice::getTitle,dto.getTitle()); - } - if(StringUtils.isNotBlank(dto.getChannel())){ - wrapper.eq(Notice::getChannel, dto.getChannel()); - } - if(StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(Notice::getIsShow, dto.getIsShow()); - } - wrapper.orderByDesc(Notice::getSort); - return noticeMapper.selectList(wrapper); - } - - @Override - public Notice queryDetails(Long id) { - return noticeMapper.selectById(id); - } - @Override public List queryList() { return noticeMapper.queryList(); @@ -74,14 +25,4 @@ public class NoticeServiceImpl implements NoticeService { public NoticeVo queryFrontDetails(Long id) { return noticeMapper.queryFrontDetails(id); } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Notice::getId, id); - Notice notice = new Notice(); - notice.setIsShow(status); - return noticeMapper.update(notice,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProductServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProductServiceImpl.java index 5c38710..fbd58fe 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProductServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProductServiceImpl.java @@ -1,20 +1,12 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.Product; -import com.bnyer.img.dto.ProductPageDto; import com.bnyer.img.mapper.ProductMapper; import com.bnyer.img.service.ProductService; import com.bnyer.img.vo.ProductVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -24,48 +16,6 @@ public class ProductServiceImpl implements ProductService { @Autowired private ProductMapper productMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(Product product) { - product.setCreateTime(new Date()); - product.setUpdateTime(new Date()); - product.setIsShow("1"); - return productMapper.insert(product); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Product product) { - product.setUpdateTime(new Date()); - return productMapper.updateById(product); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return productMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(ProductPageDto params) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(params.getProductName())){ - wrapper.like(Product::getProductName, params.getProductName()); - } - if(StringUtils.isNotBlank(params.getProductType())){ - wrapper.eq(Product::getProductType, params.getProductType()); - } - if(StringUtils.isNotBlank(params.getIsShow())){ - wrapper.eq(Product::getIsShow, params.getIsShow()); - } - return productMapper.selectList(wrapper); - } - - @Override - public Product details(Long id) { - return productMapper.selectById(id); - } - @Override public List queryFrontList() { return productMapper.queryFrontList(); @@ -75,14 +25,4 @@ public class ProductServiceImpl implements ProductService { public ProductVo queryFrontDetails(Long id) { return productMapper.queryFrontDetails(id); } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Product::getId, id); - Product product = new Product(); - product.setIsShow(status); - return productMapper.update(product,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java index df4214b..ed81582 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/SignServiceImpl.java @@ -1,25 +1,16 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.exception.ServiceException; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.ImgSignRelation; -import com.bnyer.img.domain.Sign; -import com.bnyer.img.dto.SignPageDto; +import com.bnyer.common.core.domain.ImgSignRelation; import com.bnyer.img.mapper.ImgSignRelationMapper; import com.bnyer.img.mapper.SignMapper; import com.bnyer.img.service.SignService; import com.bnyer.img.vo.SignImgVo; import com.bnyer.img.vo.SignVo; -import com.bnyer.img.vo.TiktokImgVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -31,78 +22,6 @@ public class SignServiceImpl implements SignService { @Autowired private ImgSignRelationMapper imgSignRelationMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(Sign sign) { - boolean b = checkSign(sign.getName()); - if(b){ - throw new ServiceException("标签名称已存在!"); - }else{ - sign.setCreateTime(new Date()); - sign.setUpdateTime(new Date()); - return signMapper.insert(sign); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Sign sign) { - sign.setUpdateTime(new Date()); - return signMapper.updateById(sign); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - int i = signMapper.deleteBatchIds(ids); - //删除关联relation - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ImgSignRelation::getSignId, ids); - imgSignRelationMapper.delete(wrapper); - //imgSignRelationMapper.batchDelete(ids); - return i; - } - - @Override - public List queryPage(SignPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(dto.getName())){ - wrapper.like(Sign::getName,dto.getName()); - } - if (StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(Sign::getIsShow,dto.getIsShow()); - } - wrapper.orderByDesc(Sign::getSort); - return signMapper.selectList(wrapper); - } - - @Override - public Sign queryDetails(Long id) { - return signMapper.selectById(id); - } - - @Override - public boolean checkSign(String name) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Sign::getName,name); - List signs = signMapper.selectList(wrapper); - if(signs.size() > 0){ - return true; - }else{ - return false; - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Sign::getId,id); - Sign sign = new Sign(); - sign.setIsShow(status); - return signMapper.update(sign,wrapper); - } - @Override public List querySignList() { return signMapper.querySignList(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java index 07d062a..dd3d7e9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokCollectionServiceImpl.java @@ -1,11 +1,11 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokImg; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.PlatformConstant; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.domain.TiktokCollection; -import com.bnyer.img.domain.TiktokImg; import com.bnyer.img.mapper.TiktokCollectionMapper; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.service.TiktokCollectionService; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java index 7fdec7f..bc11359 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java @@ -2,17 +2,14 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.domain.TiktokLike; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.TiktokImgMiniDto; import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.constants.RedisKeyConstant; import com.bnyer.img.constants.StatusImgConstant; -import com.bnyer.img.domain.TiktokCollection; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.domain.TiktokLike; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TiktokImgMiniDto; -import com.bnyer.img.dto.TiktokImgPageDto; import com.bnyer.img.mapper.ImgSignRelationMapper; import com.bnyer.img.mapper.TiktokCollectionMapper; import com.bnyer.img.mapper.TiktokImgMapper; @@ -74,14 +71,6 @@ public class TiktokImgServiceImpl implements TiktokImgService { redisService.hashIncr(redisKey, dto.getCreatorId().toString(), dto.getImgUrl().toArray().length); } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(TiktokImg tiktokImg) { - tiktokImg.setUpdateTime(new Date()); - return tiktokImgMapper.updateById(tiktokImg); - } - @Override @Transactional(rollbackFor = Exception.class) public int delete(List ids) { @@ -99,43 +88,11 @@ public class TiktokImgServiceImpl implements TiktokImgService { return delete; } - @Override - public List queryPage(TiktokImgPageDto dto) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(dto.getCreatorId() != null){ - wrapper.eq(TiktokImg::getCreatorId, dto.getCreatorId()); - } - if(dto.getTypeId() != null){ - wrapper.eq(TiktokImg::getTypeId, dto.getTypeId()); - } - if(StringUtils.isNotBlank(dto.getStatus())){ - wrapper.eq(TiktokImg::getStatus, dto.getStatus()); - } - if(StringUtils.isNotBlank(dto.getIsHot())){ - wrapper.eq(TiktokImg::getIsHot, dto.getIsHot()); - } - if(StringUtils.isNotBlank(dto.getIsShow())){ - wrapper.eq(TiktokImg::getIsShow, dto.getIsShow()); - } - wrapper.orderByDesc(TiktokImg::getCreateTime); - return tiktokImgMapper.selectList(wrapper); - } - - @Override - public TiktokImg queryDetails(Long id) { - return tiktokImgMapper.selectById(id); - } - @Override public List queryInList(String creatorId, String typeId, String status) { return tiktokImgMapper.queryInList(creatorId,typeId,status); } -// @Override -// public List queryOutList(String creatorId, String typeId) { -// return tiktokImgMapper.queryOutList(creatorId,typeId); -// } - @Override public TiktokImgVo queryImgDetails(String imgId) { return tiktokImgMapper.queryDetails(imgId); @@ -146,36 +103,6 @@ public class TiktokImgServiceImpl implements TiktokImgService { return tiktokImgMapper.queryCreatorImgDetails(imgId); } - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(TiktokImg::getId, id); - TiktokImg img = new TiktokImg(); - img.setIsShow(status); - return tiktokImgMapper.update(img,wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeJudge(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(TiktokImg::getId, id); - TiktokImg img = new TiktokImg(); - img.setStatus(status); - return tiktokImgMapper.update(img,wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeHot(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(TiktokImg::getId, id); - TiktokImg img = new TiktokImg(); - img.setIsHot(status); - return tiktokImgMapper.update(img,wrapper); - } - @Override public void writeDownloadTotalNum(String appType, String platform) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -278,5 +205,4 @@ public class TiktokImgServiceImpl implements TiktokImgService { img.setSort(1); return tiktokImgMapper.update(img, wrapper); } - } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java index f8694bf..ebf6b9b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokLikeServiceImpl.java @@ -1,11 +1,11 @@ package com.bnyer.img.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.domain.TiktokLike; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.constants.PlatformConstant; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.domain.TiktokLike; import com.bnyer.img.enums.TiktokLikeEnum; import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.mapper.TiktokLikeMapper; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java index edcbf39..ded12ea 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokUserServiceImpl.java @@ -2,22 +2,15 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.TiktokUser; +import com.bnyer.common.core.dto.TiktokLoginDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.Sm4Util; -import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.config.TiktokConfig; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.TiktokCollection; -import com.bnyer.img.domain.TiktokLike; -import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.TiktokLoginDto; -import com.bnyer.img.dto.TiktokUserPageDto; -import com.bnyer.img.mapper.TiktokCollectionMapper; -import com.bnyer.img.mapper.TiktokLikeMapper; import com.bnyer.img.mapper.TiktokUserMapper; import com.bnyer.img.service.TiktokUserService; import com.bnyer.img.vo.TiktokSessionInfoVo; @@ -25,7 +18,6 @@ import com.bnyer.img.vo.TiktokUserInfoVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; @@ -33,7 +25,10 @@ import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.TimeUnit; @Service @@ -46,54 +41,12 @@ public class TiktokUserServiceImpl implements TiktokUserService { @Autowired private RedisService redisService; - @Autowired - private TiktokLikeMapper tiktokLikeMapper; - - @Autowired - private TiktokCollectionMapper tiktokCollectionMapper; - @Resource private TiktokConfig tiktokConfig; @Autowired private RestTemplate restTemplate; - @Override - @Transactional(rollbackFor = Exception.class) - public int update(TiktokUser tiktokUser) { - tiktokUser.setUpdateTime(new Date()); - if(StringUtils.isNotBlank(tiktokUser.getTiktokCode())){ - tiktokUser.setTiktokCode(Sm4Util.sm4Encryption(tiktokUser.getTiktokCode())); - } - return tiktokUserMapper.updateById(tiktokUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - int delete = tiktokUserMapper.deleteBatchIds(ids); - //删除对应用户收藏及点赞记录 - LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); - LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); - for (Long id : ids) { - collectionWrapper.eq(TiktokCollection::getUserId,id); - tiktokCollectionMapper.delete(collectionWrapper); - likeWrapper.eq(TiktokLike::getUserId, id); - tiktokLikeMapper.delete(likeWrapper); - } - return delete; - } - - @Override - public List queryPage(TiktokUserPageDto dto) { - return tiktokUserMapper.queryPage(dto); - } - - @Override - public TiktokUser queryDetails(Long id) { - return tiktokUserMapper.selectById(id); - } - /** * 获取用户openId及sessionKey * @param code 登录凭证code @@ -202,16 +155,6 @@ public class TiktokUserServiceImpl implements TiktokUserService { return map; } - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(TiktokUser::getId, id); - TiktokUser user = new TiktokUser(); - user.setIsShow(status); - return tiktokUserMapper.update(user,wrapper); - } - @Override public boolean checkUserCanDownload(Long userId, String platform, String appType) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java index 7c52d80..48f8f8d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TypeServiceImpl.java @@ -1,18 +1,12 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.Type; import com.bnyer.img.mapper.TypeMapper; import com.bnyer.img.service.TypeService; import com.bnyer.img.vo.TypeVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -22,57 +16,8 @@ public class TypeServiceImpl implements TypeService { @Autowired private TypeMapper typeMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(Type type) { - type.setCreateTime(new Date()); - type.setUpdateTime(new Date()); - return typeMapper.insert(type); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(Type type) { - type.setUpdateTime(new Date()); - return typeMapper.updateById(type); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return typeMapper.deleteBatchIds(ids); - } - - @Override - public List queryPage(String typeName,String isShow) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(typeName)){ - wrapper.like(Type::getTypeName, typeName); - } - if(StringUtils.isNotBlank(isShow)){ - wrapper.eq(Type::getIsShow, isShow); - } - wrapper.orderByDesc(Type::getSort); - return typeMapper.selectList(wrapper); - } - @Override public List queryList() { return typeMapper.queryList(); } - - @Override - public Type queryDetails(Long id) { - return typeMapper.selectById(id); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(Type::getId, id); - Type type = new Type(); - type.setIsShow(status); - return typeMapper.update(type,wrapper); - } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceImpl.java index b764b88..a6fd3bf 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceImpl.java @@ -1,21 +1,12 @@ package com.bnyer.img.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.core.utils.uuid.IdUtils; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.UserVip; -import com.bnyer.img.dto.UserVipPageDto; import com.bnyer.img.mapper.UserVipMapper; import com.bnyer.img.service.UserVipService; import com.bnyer.img.vo.UserVipVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; @Service @@ -25,59 +16,6 @@ public class UserVipServiceImpl implements UserVipService { @Autowired private UserVipMapper userVipMapper; - @Override - @Transactional(rollbackFor = Exception.class) - public int insert(UserVip userVip) { - userVip.setVipCode(IdUtils.fastSimpleUUID()); - userVip.setCreateTime(new Date()); - userVip.setUpdateTime(new Date()); - userVip.setIsShow("1"); - return userVipMapper.insert(userVip); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(UserVip userVip) { - userVip.setUpdateTime(new Date()); - return userVipMapper.updateById(userVip); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return userVipMapper.deleteBatchIds(ids); - } - - @Override - public UserVip queryDetails(Long id) { - return userVipMapper.selectById(id); - } - - @Override - public List queryPage(UserVipPageDto param) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(param.getVipName())){ - wrapper.like(UserVip::getVipName, param.getVipName()); - } - if(StringUtils.isNotBlank(param.getVipCode())){ - wrapper.eq(UserVip::getVipCode, param.getVipCode()); - } - if(StringUtils.isNotBlank(param.getIsDelay())){ - wrapper.eq(UserVip::getIsDelay, param.getIsDelay()); - } - wrapper.orderByDesc(UserVip::getSort); - return userVipMapper.selectList(wrapper); - } - - @Override - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(UserVip::getId, id); - UserVip userVip = new UserVip(); - userVip.setIsShow(status); - return userVipMapper.update(userVip,wrapper); - } - @Override public List queryFront() { return userVipMapper.queryFront(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java index c03585c..98a7363 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java @@ -1,36 +1,23 @@ package com.bnyer.img.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.UserVipRecord; +import com.bnyer.common.core.dto.PayUserVipDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.DateUtils; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedissonService; -import com.bnyer.img.constants.RedisKeyConstant; import com.bnyer.img.constants.UserVipOrderStatusConstant; import com.bnyer.img.constants.UserVipTypeConstant; -import com.bnyer.img.domain.UserVip; -import com.bnyer.img.domain.UserVipRecord; -import com.bnyer.img.dto.PayUserVipDto; -import com.bnyer.img.dto.UserVipPageDto; -import com.bnyer.img.mapper.UserVipMapper; import com.bnyer.img.mapper.UserVipRecordMapper; import com.bnyer.img.service.UserVipRecordService; -import com.bnyer.img.service.UserVipService; -import com.bnyer.img.vo.UserVipVo; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.time.LocalDateTime; import java.util.Date; -import java.util.List; import java.util.concurrent.TimeUnit; @Service diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/VerifyLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/VerifyLogServiceImpl.java index 8b8fe5e..54907a9 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/VerifyLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/VerifyLogServiceImpl.java @@ -1,36 +1,11 @@ package com.bnyer.img.service.impl; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.bnyer.common.core.exception.ServiceException; -import com.bnyer.common.core.utils.Sm4Util; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.CreatorDto; -import com.bnyer.img.dto.CreatorPageDto; -import com.bnyer.img.dto.VerifyDto; -import com.bnyer.img.dto.VerifyPageDto; -import com.bnyer.img.mapper.CreatorMapper; -import com.bnyer.img.mapper.TiktokImgMapper; import com.bnyer.img.mapper.VerifyLogMapper; -import com.bnyer.img.service.CreatorService; import com.bnyer.img.service.VerifyLogService; -import com.bnyer.img.vo.CreatorVo; import com.bnyer.img.vo.VerifyLogVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author chengkun @@ -43,23 +18,6 @@ public class VerifyLogServiceImpl implements VerifyLogService { @Autowired private VerifyLogMapper verifyLogMapper; - - @Override - public List queryPage(VerifyPageDto params) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(params.getStatus())){ - wrapper.eq(VerifyLog::getStatus,params.getStatus()); - } - wrapper.orderByDesc(VerifyLog::getCreateTime); - return verifyLogMapper.selectList(wrapper); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return verifyLogMapper.deleteBatchIds(ids); - } - @Override public VerifyLogVo queryVerifyStatus(Long creatorId) { return verifyLogMapper.queryVerifyStatus(creatorId); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java index e3e1e96..9d06e7a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WithdrawLogServiceImpl.java @@ -1,40 +1,23 @@ package com.bnyer.img.service.impl; import cn.hutool.core.util.IdUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alipay.api.AlipayApiException; -import com.alipay.api.AlipayClient; -import com.alipay.api.CertAlipayRequest; -import com.alipay.api.DefaultAlipayClient; -import com.alipay.api.domain.AlipayFundTransUniTransferModel; -import com.alipay.api.domain.Participant; -import com.alipay.api.request.AlipayFundTransUniTransferRequest; -import com.alipay.api.response.AlipayFundTransUniTransferResponse; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.domain.WithdrawLog; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.DesensitizedUtils; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.config.AlipayConfig; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.constants.WithdrawConstant; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.domain.WithdrawLog; -import com.bnyer.img.dto.VerifyDto; -import com.bnyer.img.dto.WithdrawPageDto; import com.bnyer.img.mapper.CreatorMapper; import com.bnyer.img.mapper.WithdrawLogMapper; -import com.bnyer.img.service.CreatorAccountService; import com.bnyer.img.service.WithdrawLogService; -import com.bnyer.img.vo.CreatorAccountVo; import com.bnyer.img.vo.WithdrawLogVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -53,14 +36,6 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { @Autowired private CreatorMapper creatorMapper; - @Autowired - private CreatorAccountService creatorAccountService; - - @Resource - private AlipayConfig alipayConfig; - - - @Override @Transactional(rollbackFor = Exception.class) public int insert(WithdrawLog withdrawLog) { @@ -86,57 +61,6 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { return withdrawLogMapper.insert(withdrawLog); } - @Override - public List queryPage(WithdrawPageDto params) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotBlank(params.getStatus())){ - wrapper.eq(WithdrawLog::getStatus,params.getStatus()); - } - if(StringUtils.isNotBlank(params.getChannel())){ - wrapper.eq(WithdrawLog::getChannel,params.getChannel()); - } - if(StringUtils.isNotBlank(params.getOrderId())){ - wrapper.eq(WithdrawLog::getOrderId,params.getOrderId()); - } - if(StringUtils.isNotBlank(params.getBankNo())){ - wrapper.eq(WithdrawLog::getBankNo, Sm4Util.sm4Encryption(params.getBankNo())); - } - if(StringUtils.isNotBlank(params.getPhone())){ - wrapper.eq(WithdrawLog::getPhone, Sm4Util.sm4Encryption(params.getPhone())); - } - wrapper.orderByDesc(WithdrawLog::getCreateTime); - List withdrawLogs = withdrawLogMapper.selectList(wrapper); - for (WithdrawLog withdrawLog : withdrawLogs) { - if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ - withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); - } - if(StringUtils.isNotBlank(withdrawLog.getPhone())){ - withdrawLog.setPhone(Sm4Util.sm4Decrypt(withdrawLog.getPhone())); - } - DesensitizedUtils.getJsonNoCopy(withdrawLog); - } - return withdrawLogs; - } - - @Override - public WithdrawLog queryDetails(Long id) { - WithdrawLog withdrawLog = withdrawLogMapper.selectById(id); - if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ - withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); - } - if(StringUtils.isNotBlank(withdrawLog.getPhone())){ - withdrawLog.setPhone(Sm4Util.sm4Decrypt(withdrawLog.getPhone())); - } - JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLog), WithdrawLog.class); - return withdrawLog; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - return withdrawLogMapper.deleteBatchIds(ids); - } - @Override public List queryFrontList(Long creatorId) { List withdrawLogVos = withdrawLogMapper.queryFrontList(creatorId); @@ -168,123 +92,6 @@ public class WithdrawLogServiceImpl implements WithdrawLogService { return withdrawLogVo; } - /** - * 支付宝打款到指定支付宝账号 - * @param orderId 订单id - * @param amt 金额 - * @param aliPayNo 艺术家支付宝账号 - * @param name 姓名 - * @return - - */ - private AlipayFundTransUniTransferResponse trans(String orderId,String aliPayNo,String name,BigDecimal amt) throws AlipayApiException { - //构造client - CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); - //设置网关地址 - certAlipayRequest.setServerUrl(alipayConfig.getGatewayUrl()); - //设置应用Id - certAlipayRequest.setAppId(alipayConfig.getAppId()); - //设置应用私钥 - certAlipayRequest.setPrivateKey(alipayConfig.getPrivateKey()); - //设置请求格式，固定值json - certAlipayRequest.setFormat("json"); - //设置字符集 - certAlipayRequest.setCharset("UTF8"); - //设置签名类型 - certAlipayRequest.setSignType("RSA2"); - //设置应用公钥证书路径 - certAlipayRequest.setCertPath(alipayConfig.getCertPath()); - //设置支付宝公钥证书路径 - certAlipayRequest.setAlipayPublicCertPath(alipayConfig.getAlipayPublicCertPath()); - //设置支付宝根证书路径 - certAlipayRequest.setRootCertPath(alipayConfig.getRootPath()); - //构造client - AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); - AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest(); - AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel(); - model.setOutBizNo(orderId); - model.setTransAmount(amt.toString()); - model.setProductCode("TRANS_ACCOUNT_NO_PWD"); - /** 场景码，单笔无密转账到支付宝账户固定为：DIRECT_TRANSFER **/ - model.setBizScene("DIRECT_TRANSFER"); - /** 转账业务的标题，用于在支付宝用户的账单里显示 **/ - model.setOrderTitle("次元hub提现打款"); - Participant participant = new Participant(); - /** 参与方的唯一标识,收款支付宝账号或者支付宝吧账号唯一会员ID **/ - participant.setIdentity(aliPayNo); - /** 参与方的标识类型：ALIPAY_USER_ID 支付宝的会员ID ALIPAY_LOGON_ID手机号登录 **/ - participant.setIdentityType("ALIPAY_LOGON_ID"); - /** 参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。当identity_type=ALIPAY_LOGON_ID时，本字段必填 **/ - participant.setName(name); - model.setPayeeInfo(participant); - /** 业务备注 **/ - model.setRemark("提现打款"); - request.setBizModel(model); - log.info("支付宝提现入参为:{}", JSON.toJSONString(request)); - AlipayFundTransUniTransferResponse response = null; - try { - response = alipayClient.certificateExecute(request); - } catch (AlipayApiException e) { - throw e; - } - /** 获取接口调用结果，如果调用失败，可根据返回错误信息到该文档寻找排查方案：https://opensupport.alipay.com/support/helpcenter/107 **/ - log.info("支付宝提现响应结果为:{}",response.getBody()); - return response; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int verify(VerifyDto params) { - WithdrawLog withdrawLog = withdrawLogMapper.selectById(params.getId()); - if(withdrawLog == null){ - throw new ServiceException("该笔提现申请不存在!", TiktokConstant.WITHDRAW_LOG_NOT_EXIST); - } - withdrawLog.setReason(params.getReason()); - if(params.getVerifyStatus().equals(WithdrawConstant.UNPASS)){ - //审核拒绝 - withdrawLog.setStatus("4"); - withdrawLog.setUpdateTime(new Date()); - return withdrawLogMapper.updateById(withdrawLog); - } - //审核通过 - withdrawLog.setStatus("2"); - withdrawLog.setUpdateTime(new Date()); - //此处审核通过，调用支付宝企业付款到用户处方法 - if(withdrawLog.getChannel().equals(WithdrawConstant.ALIPAY)){ - //根据用户id查询其支付宝账户及其真实名称 - CreatorAccountVo creatorAccount = creatorAccountService.queryListByType(withdrawLog.getCreatorId(), "1"); - if(creatorAccount != null){ - try{ - AlipayFundTransUniTransferResponse body = this.trans(withdrawLog.getOrderId(), creatorAccount.getAliPayNo(), creatorAccount.getName(), withdrawLog.getAmt()); - if(!body.getCode().equals(WithdrawConstant.SUCCESS)){ - //提现失败 - withdrawLog.setStatus("3"); - withdrawLog.setReason(body.getSubMsg()); - log.error("艺术家【{}】订单【{}】提现失败!原因为:【{}】",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),body.getSubMsg()); - return withdrawLogMapper.updateById(withdrawLog); - } - //扣除账户余额 - Creator creator = creatorMapper.selectById(withdrawLog.getCreatorId()); - BigDecimal amt = creator.getAmt().subtract(withdrawLog.getAmt()); - creator.setAmt(amt); - creatorMapper.updateById(creator); - //TODO 分布式锁 - }catch (AlipayApiException e){ - log.error("艺术家【{}】订单【{}】提现异常!原因为:【{}】",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),e); - withdrawLog.setStatus("1"); - withdrawLog.setReason(e.getMessage()); - withdrawLogMapper.updateById(withdrawLog); - throw new ServiceException(e.getMessage()); - } - }else{ - throw new ServiceException("该艺术家未绑定支付宝账户!请手动设置!"); - } - }else if(withdrawLog.getChannel().equals(WithdrawConstant.BANK)){ - //TODO 转账到银行卡待开发 - } - log.info("艺术家【{}】订单【{}】提现【{}】元成功!",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),withdrawLog.getAmt()); - return withdrawLogMapper.updateById(withdrawLog); - } - @Override public boolean checkWithdraw(Long creatorId, BigDecimal amt) { Creator creator = creatorMapper.selectById(creatorId); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WxUserServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WxUserServiceImpl.java index 7253829..9fd2430 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WxUserServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/WxUserServiceImpl.java @@ -2,22 +2,16 @@ package com.bnyer.img.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.WxUser; +import com.bnyer.common.core.dto.WxLoginDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.utils.uuid.IdUtils; import com.bnyer.common.redis.service.RedisService; import com.bnyer.img.config.WxConfig; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.constants.TiktokConstant; -import com.bnyer.img.domain.TiktokCollection; -import com.bnyer.img.domain.TiktokLike; -import com.bnyer.img.domain.WxUser; -import com.bnyer.img.dto.WxLoginDto; -import com.bnyer.img.dto.WxUserPageDto; -import com.bnyer.img.mapper.TiktokCollectionMapper; -import com.bnyer.img.mapper.TiktokLikeMapper; import com.bnyer.img.mapper.WxUserMapper; import com.bnyer.img.service.WxUserService; import com.bnyer.img.vo.WxSessionInfoVo; @@ -25,14 +19,16 @@ import com.bnyer.img.vo.WxUserInfoVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.TimeUnit; @Service @@ -45,61 +41,14 @@ public class WxUserServiceImpl implements WxUserService { @Autowired private RedisService redisService; - @Autowired - private TiktokLikeMapper tiktokLikeMapper; - - @Autowired - private TiktokCollectionMapper tiktokCollectionMapper; - @Autowired private WxConfig wxConfig; @Autowired private RestTemplate restTemplate; - - @Override - @Transactional(rollbackFor = Exception.class) - public int update(WxUser wxUser) { - wxUser.setUpdateTime(new Date()); - if (StringUtils.isNotBlank(wxUser.getWxCode())) { - wxUser.setWxCode(Sm4Util.sm4Encryption(wxUser.getWxCode())); - } - return wxUserMapper.updateById(wxUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public int delete(List ids) { - int delete = wxUserMapper.deleteBatchIds(ids); - //删除对应用户收藏及点赞记录 - LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); - LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); - for (Long id : ids) { - collectionWrapper.eq(TiktokCollection::getUserId, id) - .eq(TiktokCollection::getPlatform, "2"); - tiktokCollectionMapper.delete(collectionWrapper); - likeWrapper.eq(TiktokLike::getUserId, id) - .eq(TiktokLike::getPlatform, "2"); - tiktokLikeMapper.delete(likeWrapper); - } - return delete; - } - - @Override - public List queryPage(WxUserPageDto dto) { - return wxUserMapper.queryPage(dto); - } - - @Override - public WxUser queryDetails(Long id) { - return wxUserMapper.selectById(id); - } - - /** * 获取用户openId及sessionKey - * * @param code 登录凭证code * @return - */ @@ -122,7 +71,6 @@ public class WxUserServiceImpl implements WxUserService { /** * 获取用户敏感信息 - * * @param sessionKey - * @param encryptedData 敏感数据 * @param iv 加密向量 @@ -153,7 +101,6 @@ public class WxUserServiceImpl implements WxUserService { /** * 保存用户 - * * @param openId 微信id * @param sessionKey - * @param encryptedData 敏感信息数据 @@ -204,16 +151,6 @@ public class WxUserServiceImpl implements WxUserService { return map; } - @Override - @Transactional(rollbackFor = Exception.class) - public int changeStatus(Long id, String status) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(WxUser::getId, id); - WxUser user = new WxUser(); - user.setIsShow(status); - return wxUserMapper.update(user, wrapper); - } - @Override public boolean checkUserCanDownload(Long userId, String platform, String appType) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/YunmeiServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/YunmeiServiceImpl.java index 4bf0749..28197ee 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/YunmeiServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/YunmeiServiceImpl.java @@ -4,12 +4,12 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.bnyer.common.core.dto.CardBuyOrderDto; +import com.bnyer.common.core.dto.DirectBuyOrderDto; +import com.bnyer.common.core.dto.OrderNotifyDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.img.config.YunmeiConfig; import com.bnyer.img.constants.YunmeiConstant; -import com.bnyer.img.dto.CardBuyOrderDto; -import com.bnyer.img.dto.DirectBuyOrderDto; -import com.bnyer.img.dto.OrderNotifyDto; import com.bnyer.img.enums.YunmeiCallbackEnum; import com.bnyer.img.enums.YunmeiEnum; import com.bnyer.img.service.YunmeiService; diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DateSyncTask.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DateSyncTask.java index b54165d..fadc857 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DateSyncTask.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/task/DateSyncTask.java @@ -1,15 +1,13 @@ package com.bnyer.img.task; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.bnyer.common.core.domain.BzData; import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.domain.BzData; import com.bnyer.img.service.BzDataService; import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.log.XxlJobLogger; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.time.LocalDate; @@ -27,6 +25,7 @@ public class DateSyncTask { private static RedisService redisService; @Autowired private static BzDataService bzDataService; + //@XxlJob("dateSyncTask") //@Scheduled(fixedDelay = 1000 * 60 * 60) public static ReturnT dateSync() { @@ -55,6 +54,4 @@ public class DateSyncTask { XxlJobLogger.log("{} 我执行了同步pv,uv任务", System.currentTimeMillis()); return ReturnT.SUCCESS; } - - } diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/BannerMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/BannerMapper.xml index 5fd1065..461b923 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/BannerMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/BannerMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml index d513914..cfca3a6 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorAccountMapper.xml @@ -1,7 +1,7 @@ - + @@ -22,17 +22,10 @@ id, creator_id, `name`, id_no, bank_no, phone,alipay_no,type, create_time, update_time, sort,is_show - select id, creator_id,name,bank_no,alipay_no,type from img_creator_account where is_show = '1' and creator_id = #{creatorId} - - diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml index 895b67a..cc8e553 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml @@ -1,7 +1,7 @@ - + @@ -76,47 +76,6 @@ order by ic.create_time asc - - - - - update img_creator - - - amt = #{item.amt} - - - where id = #{item.id} - - + - diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml index 1d02a69..c4d5722 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml @@ -1,7 +1,7 @@ - + @@ -150,73 +150,6 @@ - - - - - - - update img_creator_profit - set status = '2',wallet_time = (select NOW()) - where id in - - #{item} - - - - select - - from img_fh_user - - - username like concat('%',#{params.username},'%') - - - and is_vip = #{params.isVip} - - - and is_show = #{params.isShow} - - - order by create_time desc - diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml index 8d8cac4..5aef31d 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ImgSignRelationMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml index 7de3e60..cf1492e 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/InviteLogMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/NoticeMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/NoticeMapper.xml index 5a5b674..05de827 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/NoticeMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/NoticeMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductMapper.xml index cfbc67d..699e6e7 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductOrderMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductOrderMapper.xml index cc4f068..a346bf3 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductOrderMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProductOrderMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml index 170b047..e742881 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/SignMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokCollectionMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokCollectionMapper.xml index da5687c..4040dff 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokCollectionMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokCollectionMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml index cbee975..baa94a9 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokLikeMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokLikeMapper.xml index c1e1396..510d9fd 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokLikeMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokLikeMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml index b6acd3b..9cfed45 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokUserMapper.xml @@ -1,7 +1,7 @@ - + @@ -21,22 +21,4 @@ id, username, tiktok_code,phone, img,is_vip,is_show, create_time, update_time, sort - - diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TypeMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TypeMapper.xml index 1771b3f..bc6f033 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TypeMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TypeMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipMapper.xml index bd68099..84f4c52 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml index b98c13d..29a6113 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/UserVipRecordMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/VerifyLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/VerifyLogMapper.xml index 7a6150b..06468db 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/VerifyLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/VerifyLogMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml index a9681ab..9d423d0 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WithdrawLogMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WxUserMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WxUserMapper.xml index 2a753b1..7a961d3 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WxUserMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/WxUserMapper.xml @@ -1,7 +1,7 @@ - + @@ -19,22 +19,4 @@ id, username, wx_code,phone, img,is_vip, is_show, create_time, update_time, sort - - diff --git a/bnyer-services/bnyer-system/pom.xml b/bnyer-services/bnyer-system/pom.xml index 9fd50b0..cc3aaea 100644 --- a/bnyer-services/bnyer-system/pom.xml +++ b/bnyer-services/bnyer-system/pom.xml @@ -78,6 +78,18 @@ bnyer-common-swagger + + + com.dimensionalnode + bnyer-common-core + + + + + com.alipay.sdk + alipay-sdk-java + + @@ -86,6 +98,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2 diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/config/AlipayConfig.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/config/AlipayConfig.java new file mode 100644 index 0000000..35d7966 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/config/AlipayConfig.java @@ -0,0 +1,54 @@ +package com.bnyer.system.config; + +//import com.bnyer.img.handler.TokenCheckHandler; + +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +/** + * @author chengkun + * @date 2022/4/21 17:43 + */ +@Configuration +@ConfigurationProperties(prefix = "alipay") +@Getter +@RefreshScope +public class AlipayConfig { + + @Value("${alipay.gatewayUrl}") + private String gatewayUrl; + + @Value("${alipay.appId}") + private String appId; + + @Value("${alipay.privateKey}") + private String privateKey; + + @Value("${alipay.publicKey}") + private String publicKey; + + @Value("${alipay.certPath}") + private String certPath; + + @Value("${alipay.alipayPublicCertPath}") + private String alipayPublicCertPath; + + @Value("${alipay.rootPath}") + private String rootPath; + + @Value("${alipay.notifyUrl}") + private String notifyUrl; + + @Value("${alipay.returnUrl}") + private String returnUrl; + + @Value("${alipay.signType}") + private String signType; + + @Value("${alipay.charset}") + private String charset; + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java index 69c38db..db33c91 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BannerController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BannerController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Banner; +import com.bnyer.common.core.dto.BannerDto; +import com.bnyer.common.core.dto.BannerPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.dto.BannerDto; -import com.bnyer.img.dto.BannerPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.BannerService; +import com.bnyer.system.service.IBannerService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】banner接口",tags = "【图文平台】banner接口") @RestController -@RequestMapping("/img/banner") +@RequestMapping("/system/img/banner") @Slf4j public class BannerController extends BaseController { @Autowired - private BannerService bannerService; + private IBannerService bannerService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询banner分页") @@ -49,7 +49,7 @@ public class BannerController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="修改banner") @PostMapping(value = "/update") - public AjaxResult updateBanner(@Validated @RequestBody @ApiParam("banner对象")BannerDto dto){ + public AjaxResult updateBanner(@Validated @RequestBody @ApiParam("banner对象") BannerDto dto){ log.debug("【图文平台后台】修改banner参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(bannerService.update(dto.extractParam())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BzDataController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BzDataController.java similarity index 60% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BzDataController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BzDataController.java index d360df4..b4de15a 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/BzDataController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/BzDataController.java @@ -1,40 +1,32 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSONObject; import com.bnyer.common.core.domain.R; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.redis.service.RedisService; -import com.bnyer.img.dto.BzDto; -import com.bnyer.img.service.BzDataService; +import com.bnyer.system.service.IBzDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @Api(value = "【图文平台】八字运势接口",tags = "【图文平台】八字运势接口") @RestController -@RequestMapping("/img/bz") +@RequestMapping("/system/img/bz") @Slf4j public class BzDataController extends BaseController { @Autowired - private BzDataService bzDataService; + private IBzDataService bzDataService; @Autowired private RedisService redisService; - //@RequiresPermissions("system:config:list") - @ApiOperation(value = "八字算命") - @PostMapping("/getYs") - public R getYs(@RequestBody @ApiParam("八字运势") BzDto dto) { - JSONObject jsonObject = bzDataService.getYs(dto); - if (jsonObject!=null){ - return R.ok(jsonObject); - } - return R.fail(); - } + @ApiOperation(value = "八字页面数据统计") @PostMapping("/dataStatistics") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java index 0ca1871..7539910 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorAccountController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorAccountController.java @@ -1,15 +1,15 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.dto.CreatorAccountDto; +import com.bnyer.common.core.dto.CreatorAccountPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.utils.DesensitizedUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.CreatorAccount; -import com.bnyer.img.dto.CreatorAccountDto; -import com.bnyer.img.dto.CreatorAccountPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.CreatorAccountService; +import com.bnyer.system.service.ICreatorAccountService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,12 +23,12 @@ import java.util.List; @Api(value = "【图文平台】艺术家账户接口",tags = "【图文平台】艺术家账户接口") @RestController -@RequestMapping("/img/creatorAccount") +@RequestMapping("/system/img/creatorAccount") @Slf4j public class CreatorAccountController extends BaseController { @Autowired - private CreatorAccountService creatorAccountService; + private ICreatorAccountService creatorAccountService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorAccount分页") @@ -42,7 +42,7 @@ public class CreatorAccountController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="新增creatorAccount") @PostMapping(value = "/insert") - public AjaxResult insertCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象")CreatorAccountDto dto){ + public AjaxResult insertCreatorAccount(@Validated @RequestBody @ApiParam("creatorAccount对象") CreatorAccountDto dto){ log.debug("【图文平台后台】新增creatorAccount参数为:{}", DesensitizedUtils.getJson(dto)); return AjaxResult.success(creatorAccountService.insert(dto.extractParam())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java similarity index 93% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java index 9594014..38d07de 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorController.java @@ -1,16 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.dto.*; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.*; -import com.bnyer.img.service.CreatorService; -import com.bnyer.img.service.TiktokUserService; +import com.bnyer.system.service.ICreatorService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】艺术家接口",tags = "【图文平台】艺术家接口") @RestController -@RequestMapping("/img/creator") +@RequestMapping("/system/img/creator") @Slf4j public class CreatorController extends BaseController { @Autowired - private CreatorService creatorService; + private ICreatorService creatorService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询艺术家分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java index 56c8491..b20c59e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorProfitController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CreatorProfitController.java @@ -1,15 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.dto.CreatorProfitPageDto; +import com.bnyer.common.core.dto.CreatorProfitUpdateDto; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.vo.CreatorProfitVo; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.CreatorProfit; -import com.bnyer.img.dto.CreatorProfitPageDto; -import com.bnyer.img.dto.CreatorProfitUpdateDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.CreatorProfitService; -import com.bnyer.img.vo.CreatorProfitVo; +import com.bnyer.system.service.ICreatorProfitService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】艺术家收益接口",tags = "【图文平台】艺术家收益接口") @RestController -@RequestMapping("/img/creatorProfit") +@RequestMapping("/system/img/creatorProfit") @Slf4j public class CreatorProfitController extends BaseController { @Autowired - private CreatorProfitService creatorProfitService; + private ICreatorProfitService creatorProfitService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询creatorProfit分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java index 6a5a689..674b7ed 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FeedBackController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FeedBackController.java @@ -1,13 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.dto.FeedBackDto; +import com.bnyer.common.core.dto.FeedBackPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Banner; -import com.bnyer.img.domain.Feedback; -import com.bnyer.img.dto.*; -import com.bnyer.img.service.FeedBackService; +import com.bnyer.system.service.IFeedBackService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】反馈接口",tags = "【图文平台】反馈接口") @RestController -@RequestMapping("/img/feedback") +@RequestMapping("/system/img/feedback") @Slf4j public class FeedBackController extends BaseController { @Autowired - private FeedBackService feedBackService; + private IFeedBackService feedBackService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询feedback分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java index fb2749b..481914f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/FhUserController.java @@ -1,16 +1,16 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.FhUser; +import com.bnyer.common.core.dto.FhUserDto; +import com.bnyer.common.core.dto.FhUserPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.FhUser; -import com.bnyer.img.dto.FhUserDto; -import com.bnyer.img.dto.FhUserPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.FhUserService; +import com.bnyer.system.service.IFhUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,12 +24,12 @@ import java.util.List; @Api(value = "【图文平台】快手用户接口",tags = "【图文平台】快手用户接口") @RestController -@RequestMapping("/img/fhUser") +@RequestMapping("/system/img/fhUser") @Slf4j public class FhUserController extends BaseController { @Autowired - private FhUserService fhUserService; + private IFhUserService fhUserService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询快手用户分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java similarity index 82% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java index 6a579c0..64229a6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/InviteLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/InviteLogController.java @@ -1,13 +1,11 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.dto.InviteLogPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.InviteLog; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.InviteLogPageDto; -import com.bnyer.img.dto.VerifyPageDto; -import com.bnyer.img.service.InviteLogService; +import com.bnyer.system.service.IInviteLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,12 +18,12 @@ import java.util.List; @Api(value = "【图文平台】邀请记录接口",tags = "【图文平台】邀请记录接口") @RestController -@RequestMapping("/img/inviteLog") +@RequestMapping("/system/img/inviteLog") @Slf4j public class InviteLogController extends BaseController { @Autowired - private InviteLogService inviteLogService; + private IInviteLogService inviteLogService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询邀请记录分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/LevelInfoController.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/LevelInfoController.java index ddb5c70..b300f0b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/LevelInfoController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/LevelInfoController.java @@ -1,15 +1,15 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.LevelInfo; +import com.bnyer.common.core.dto.LevelInfoDto; +import com.bnyer.common.core.dto.LevelInfoPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.utils.DesensitizedUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.LevelInfo; -import com.bnyer.img.dto.LevelInfoDto; -import com.bnyer.img.dto.LevelInfoPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.LevelInfoService; +import com.bnyer.system.service.ILevelInfoService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,12 +23,12 @@ import java.util.List; @Api(value = "【图文平台】等级信息接口",tags = "【图文平台】等级信息接口") @RestController -@RequestMapping("/img/levelInfo") +@RequestMapping("/system/img/levelInfo") @Slf4j public class LevelInfoController extends BaseController { @Autowired - private LevelInfoService levelInfoService; + private ILevelInfoService levelInfoService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询等级信息分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java index 314515c..bfade72 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/NoticeController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/NoticeController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Notice; +import com.bnyer.common.core.dto.NoticeDto; +import com.bnyer.common.core.dto.NoticePageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Notice; -import com.bnyer.img.dto.NoticeDto; -import com.bnyer.img.dto.NoticePageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.NoticeService; +import com.bnyer.system.service.INoticeService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】公告接口",tags = "【图文平台】公告接口") @RestController -@RequestMapping("/img/notice") +@RequestMapping("/system/img/notice") @Slf4j public class NoticeController extends BaseController { @Autowired - private NoticeService noticeService; + private INoticeService noticeService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询notice分页") @@ -41,7 +41,7 @@ public class NoticeController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="新增notice") @PostMapping(value = "/insert") - public AjaxResult insertNotice(@Validated @RequestBody @ApiParam("notice对象")NoticeDto dto){ + public AjaxResult insertNotice(@Validated @RequestBody @ApiParam("notice对象") NoticeDto dto){ log.debug("【图文平台后台】新增notice参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(noticeService.insert(dto.extractParam())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProductController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProductController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProductController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProductController.java index cb2cb88..f9173a3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProductController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProductController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Product; +import com.bnyer.common.core.dto.ProductDto; +import com.bnyer.common.core.dto.ProductPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Product; -import com.bnyer.img.dto.ProductDto; -import com.bnyer.img.dto.ProductPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.ProductService; +import com.bnyer.system.service.IProductService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】产品接口",tags = "【图文平台】产品接口") @RestController -@RequestMapping("/img/product") +@RequestMapping("/system/img/product") @Slf4j public class ProductController extends BaseController { @Autowired - private ProductService productService; + private IProductService productService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询产品分页") @@ -49,7 +49,7 @@ public class ProductController extends BaseController { //@RequiresPermissions("system:config:list") @ApiOperation(value="修改产品") @PostMapping(value = "/update") - public AjaxResult updateProduct(@Validated @RequestBody @ApiParam("产品对象")ProductDto dto){ + public AjaxResult updateProduct(@Validated @RequestBody @ApiParam("产品对象") ProductDto dto){ log.debug("【图文平台后台】修改产品参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(productService.update(dto.extractParam())); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java index ac0337c..13d6cc7 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/ProfitVerifyOrderController.java @@ -1,15 +1,15 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.ProfitVerifyOrder; +import com.bnyer.common.core.dto.ProfitVerifyOrderDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderInsertDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderPageDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderUpdateDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.ProfitVerifyOrder; -import com.bnyer.img.dto.ProfitVerifyOrderDto; -import com.bnyer.img.dto.ProfitVerifyOrderInsertDto; -import com.bnyer.img.dto.ProfitVerifyOrderPageDto; -import com.bnyer.img.dto.ProfitVerifyOrderUpdateDto; -import com.bnyer.img.service.ProfitVerifyOrderService; +import com.bnyer.system.service.IProfitVerifyOrderService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,12 +23,12 @@ import java.util.List; @Api(value = "【图文平台】收益审核单接口",tags = "【图文平台】收益审核单接口") @RestController -@RequestMapping("/img/profitVerifyOrder") +@RequestMapping("/system/img/profitVerifyOrder") @Slf4j public class ProfitVerifyOrderController extends BaseController { @Autowired - private ProfitVerifyOrderService profitVerifyOrderService; + private IProfitVerifyOrderService profitVerifyOrderService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询收益审核单分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java index 4177b98..e135c6b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/SignController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SignController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Sign; +import com.bnyer.common.core.dto.SignDto; +import com.bnyer.common.core.dto.SignPageDto; +import com.bnyer.common.core.dto.StatusDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Sign; -import com.bnyer.img.dto.SignDto; -import com.bnyer.img.dto.SignPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.SignService; +import com.bnyer.system.service.ISignService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】图片标签接口",tags = "【图文平台】图片标签接口") @RestController -@RequestMapping("/img/sign") +@RequestMapping("/system/img/sign") @Slf4j public class SignController extends BaseController { @Autowired - private SignService signService; + private ISignService signService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询sign分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java index 92f2dc2..6e7dfbb 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokImgController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokImgController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.TiktokImgDto; +import com.bnyer.common.core.dto.TiktokImgPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.TiktokImg; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TiktokImgDto; -import com.bnyer.img.dto.TiktokImgPageDto; -import com.bnyer.img.service.TiktokImgService; +import com.bnyer.system.service.ITiktokImgService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】图片接口",tags = "【图文平台】图片接口") @RestController -@RequestMapping("/img/tiktokImg") +@RequestMapping("/system/img/tiktokImg") @Slf4j public class TiktokImgController extends BaseController { @Autowired - private TiktokImgService tiktokImgService; + private ITiktokImgService tiktokImgService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询TiktokImg分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java index 67bedaa..c57a42e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TiktokUserController.java @@ -1,16 +1,16 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.TiktokUser; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.TiktokUserDto; +import com.bnyer.common.core.dto.TiktokUserPageDto; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.TiktokUser; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TiktokUserDto; -import com.bnyer.img.dto.TiktokUserPageDto; -import com.bnyer.img.service.TiktokUserService; +import com.bnyer.system.service.ITiktokUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,12 +24,12 @@ import java.util.List; @Api(value = "【图文平台】抖音用户接口",tags = "【图文平台】抖音用户接口") @RestController -@RequestMapping("/img/tiktokUser") +@RequestMapping("/system/img/tiktokUser") @Slf4j public class TiktokUserController extends BaseController { @Autowired - private TiktokUserService tiktokUserService; + private ITiktokUserService tiktokUserService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询抖音用户分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java index a5181f0..d5c8c73 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TypeController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/TypeController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.Type; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.TypeDto; +import com.bnyer.common.core.dto.TypePageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.Type; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.TypeDto; -import com.bnyer.img.dto.TypePageDto; -import com.bnyer.img.service.TypeService; +import com.bnyer.system.service.ITypeService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】图片类型接口",tags = "【图文平台】图片类型接口") @RestController -@RequestMapping("/img/type") +@RequestMapping("/system/img/type") @Slf4j public class TypeController extends BaseController { @Autowired - private TypeService typeService; + private ITypeService typeService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询type分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/UserVipController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/UserVipController.java similarity index 90% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/UserVipController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/UserVipController.java index 6af476f..b651eac 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/UserVipController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/UserVipController.java @@ -1,14 +1,14 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.UserVip; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.UserVipDto; +import com.bnyer.common.core.dto.UserVipPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.UserVip; -import com.bnyer.img.dto.UserVipDto; -import com.bnyer.img.dto.UserVipPageDto; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.service.UserVipService; +import com.bnyer.system.service.IUserVipService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -22,12 +22,12 @@ import java.util.List; @Api(value = "【图文平台】用户会员vip接口",tags = "【图文平台】用户会员vip接口") @RestController -@RequestMapping("/img/userVip") +@RequestMapping("/system/img/userVip") @Slf4j public class UserVipController extends BaseController { @Autowired - private UserVipService userVipService; + private IUserVipService userVipService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询用户会员vip分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java similarity index 84% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java index 9db25f5..8207504 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/VerifyLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/VerifyLogController.java @@ -1,11 +1,11 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; +import com.bnyer.common.core.domain.VerifyLog; +import com.bnyer.common.core.dto.VerifyPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.VerifyLog; -import com.bnyer.img.dto.VerifyPageDto; -import com.bnyer.img.service.VerifyLogService; +import com.bnyer.system.service.IVerifyLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,12 +18,12 @@ import java.util.List; @Api(value = "【图文平台】审核记录接口",tags = "【图文平台】审核记录接口") @RestController -@RequestMapping("/img/verifyLog") +@RequestMapping("/system/img/verifyLog") @Slf4j public class VerifyLogController extends BaseController { @Autowired - private VerifyLogService verifyLogService; + private IVerifyLogService verifyLogService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询审核记录分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java similarity index 86% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java index 0d72ace..5f085f5 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WithdrawLogController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WithdrawLogController.java @@ -1,15 +1,13 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.WithdrawLog; +import com.bnyer.common.core.dto.VerifyDto; +import com.bnyer.common.core.dto.WithdrawPageDto; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.WithdrawLog; -import com.bnyer.img.dto.VerifyDto; -import com.bnyer.img.dto.VerifyPageDto; -import com.bnyer.img.dto.WithdrawPageDto; -import com.bnyer.img.dto.checkWithdrawDto; -import com.bnyer.img.service.WithdrawLogService; +import com.bnyer.system.service.IWithdrawLogService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,12 +21,12 @@ import java.util.List; @Api(value = "【图文平台】提现记录接口",tags = "【图文平台】提现记录接口") @RestController -@RequestMapping("/img/withdrawLog") +@RequestMapping("/system/img/withdrawLog") @Slf4j public class WithdrawLogController extends BaseController { @Autowired - private WithdrawLogService withdrawLogService; + private IWithdrawLogService withdrawLogService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询提现记录分页") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java similarity index 89% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java index 403be24..3eb2b45 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxUserController.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/WxUserController.java @@ -1,16 +1,16 @@ -package com.bnyer.img.controller; +package com.bnyer.system.controller; import com.alibaba.fastjson.JSON; +import com.bnyer.common.core.domain.WxUser; +import com.bnyer.common.core.dto.StatusDto; +import com.bnyer.common.core.dto.WxUserDto; +import com.bnyer.common.core.dto.WxUserPageDto; import com.bnyer.common.core.utils.Sm4Util; import com.bnyer.common.core.utils.StringUtils; import com.bnyer.common.core.web.controller.BaseController; import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.img.domain.WxUser; -import com.bnyer.img.dto.StatusDto; -import com.bnyer.img.dto.WxUserDto; -import com.bnyer.img.dto.WxUserPageDto; -import com.bnyer.img.service.WxUserService; +import com.bnyer.system.service.IWxUserService; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,12 +24,12 @@ import java.util.List; @Api(value = "【图文平台】微信用户接口",tags = "【图文平台】微信用户接口") @RestController -@RequestMapping("/img/wxUser") +@RequestMapping("/system/img/wxUser") @Slf4j public class WxUserController extends BaseController { @Autowired - private WxUserService wxUserService; + private IWxUserService wxUserService; //@RequiresPermissions("system:config:list") @ApiOperation(value="查询微信用户分页") diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BannerMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BannerMapper.java new file mode 100644 index 0000000..ad75062 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BannerMapper.java @@ -0,0 +1,11 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Banner; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BannerMapper extends BaseMapper { + + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BzDataMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BzDataMapper.java new file mode 100644 index 0000000..d765880 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/BzDataMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.BzData; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BzDataMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorAccountMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorAccountMapper.java new file mode 100644 index 0000000..367ebe1 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorAccountMapper.java @@ -0,0 +1,21 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.vo.CreatorAccountVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CreatorAccountMapper extends BaseMapper { + + /** + * 根据类型查询艺术家账户列表 + * @param creatorId 艺术家id + * @param type 类型 + * @return - + */ + CreatorAccountVo queryListByType(@Param("creatorId") Long creatorId, @Param("type") String type); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorMapper.java new file mode 100644 index 0000000..2f6dc32 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorMapper.java @@ -0,0 +1,31 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.dto.CreatorPageDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:25 + */ +@Mapper +public interface CreatorMapper extends BaseMapper { + + /** + * 查询艺术家分页 + * @param params 分页参数 + * @return - + */ + List queryPage(@Param("params") CreatorPageDto params); + + /** + * 批量更新艺术家 + * @param list 艺术家列表 + * @return - + */ + int updateBatch(@Param("list") List list); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorProfitMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorProfitMapper.java new file mode 100644 index 0000000..4a6de7b --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/CreatorProfitMapper.java @@ -0,0 +1,48 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.dto.CreatorProfitPageDto; +import com.bnyer.common.core.vo.ConfirmProfitVo; +import com.bnyer.common.core.vo.CreatorProfitVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/6/8 10:51 + */ +@Mapper +public interface CreatorProfitMapper extends BaseMapper { + + /** + * 查询所有指定平台类型待入账信息 + * @param platform 平台 + * @param appType 应用 + * @param type 收益类型 + * @param date 日期 + * @return - + */ + List queryPreProfit(@Param("platform") String platform, @Param("appType") String appType, @Param("type") String type, @Param("date") String date); + + /** + * 查询艺术家收益分页 + * @param params 参数 + * @return - + */ + List queryPage(@Param("params") CreatorProfitPageDto params); + + /** + * 查询除会员外所有已入账且已确认收益 + * @return - + */ + List queryConfirmList(); + + /** + * 批量更新收益单状态为转入钱包 + * @param list 订单列表 + */ + int batchUpdateTransInfo(@Param("list") List list); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FeedbackMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FeedbackMapper.java new file mode 100644 index 0000000..73f0cd0 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FeedbackMapper.java @@ -0,0 +1,9 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Feedback; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FeedbackMapper extends BaseMapper { +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FhUserMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FhUserMapper.java new file mode 100644 index 0000000..dfe307a --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/FhUserMapper.java @@ -0,0 +1,18 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.FhUser; +import com.bnyer.common.core.dto.FhUserPageDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/7/4 13:58 + */ +@Mapper +public interface FhUserMapper extends BaseMapper { + List queryPage(@Param("params") FhUserPageDto dto); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ImgSignRelationMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ImgSignRelationMapper.java new file mode 100644 index 0000000..dc0b1b3 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ImgSignRelationMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.ImgSignRelation; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ImgSignRelationMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/InviteLogMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/InviteLogMapper.java new file mode 100644 index 0000000..587e1a5 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/InviteLogMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.InviteLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface InviteLogMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/LevelInfoMapper.java similarity index 68% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/LevelInfoMapper.java index 092cbab..21d2852 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/LevelInfoMapper.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/LevelInfoMapper.java @@ -1,7 +1,7 @@ -package com.bnyer.img.mapper; +package com.bnyer.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.LevelInfo; +import com.bnyer.common.core.domain.LevelInfo; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/NoticeMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/NoticeMapper.java new file mode 100644 index 0000000..c9ef980 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/NoticeMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Notice; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface NoticeMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProductMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProductMapper.java new file mode 100644 index 0000000..879f68f --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProductMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Product; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProductMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProfitVerifyOrderMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProfitVerifyOrderMapper.java similarity index 73% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProfitVerifyOrderMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProfitVerifyOrderMapper.java index 5616705..7cac50e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/ProfitVerifyOrderMapper.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/ProfitVerifyOrderMapper.java @@ -1,7 +1,7 @@ -package com.bnyer.img.mapper; +package com.bnyer.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.bnyer.img.domain.ProfitVerifyOrder; +import com.bnyer.common.core.domain.ProfitVerifyOrder; import org.apache.ibatis.annotations.Mapper; /** diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java new file mode 100644 index 0000000..1bb8492 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SignMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Sign; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SignMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokCollectionMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokCollectionMapper.java new file mode 100644 index 0000000..a2b1f46 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokCollectionMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.TiktokCollection; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TiktokCollectionMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokImgMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokImgMapper.java new file mode 100644 index 0000000..91d6cc1 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokImgMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.TiktokImg; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TiktokImgMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokLikeMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokLikeMapper.java new file mode 100644 index 0000000..2ec50d3 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokLikeMapper.java @@ -0,0 +1,13 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.TiktokLike; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author chengkun + * @date 2022/4/21 9:50 + */ +@Mapper +public interface TiktokLikeMapper extends BaseMapper { +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokUserMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokUserMapper.java new file mode 100644 index 0000000..1e87900 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TiktokUserMapper.java @@ -0,0 +1,20 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.TiktokUser; +import com.bnyer.common.core.dto.TiktokUserPageDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface TiktokUserMapper extends BaseMapper { + + /** + * 查询用户分页 + * @param params 分页参数 + * @return - + */ + List queryPage(@Param("params") TiktokUserPageDto params); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TypeMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TypeMapper.java new file mode 100644 index 0000000..f31aca3 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/TypeMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.Type; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TypeMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/UserVipMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/UserVipMapper.java new file mode 100644 index 0000000..4cf1705 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/UserVipMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.UserVip; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserVipMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/VerifyLogMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/VerifyLogMapper.java new file mode 100644 index 0000000..25d0085 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/VerifyLogMapper.java @@ -0,0 +1,14 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.VerifyLog; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author chengkun + * @date 2022/5/31 9:38 + */ +@Mapper +public interface VerifyLogMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WithdrawLogMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WithdrawLogMapper.java new file mode 100644 index 0000000..0b63234 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WithdrawLogMapper.java @@ -0,0 +1,10 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.WithdrawLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WithdrawLogMapper extends BaseMapper { + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WxUserMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WxUserMapper.java new file mode 100644 index 0000000..c37a340 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/WxUserMapper.java @@ -0,0 +1,18 @@ +package com.bnyer.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.WxUser; +import com.bnyer.common.core.dto.WxUserPageDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/7/4 13:58 + */ +@Mapper +public interface WxUserMapper extends BaseMapper { + List queryPage(@Param("params") WxUserPageDto dto); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBannerService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBannerService.java new file mode 100644 index 0000000..3df8a9f --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBannerService.java @@ -0,0 +1,53 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Banner; +import com.bnyer.common.core.dto.BannerPageDto; + +import java.util.List; + +public interface IBannerService { + + /** + * 新增banner + * @param banner - + * @return - + */ + int insert(Banner banner); + + /** + * 修改banner + * @param banner - + * @return - + */ + int update(Banner banner); + + /** + * 批量删除banner + * @param ids ids + * @return - + */ + int delete(List ids); + + /** + * 查询banner分页 + * @param dto 分页对象 + * @return - + */ + List queryPage(BannerPageDto dto); + + /** + * 查询banner详情 + * @param id 主键id + * @return - + */ + Banner queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBzDataService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBzDataService.java new file mode 100644 index 0000000..cdb7a72 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IBzDataService.java @@ -0,0 +1,10 @@ +package com.bnyer.system.service; + +import javax.servlet.http.HttpServletRequest; + +public interface IBzDataService { + + void dataStatistics(String ip, String source); + + String getIpAddr(HttpServletRequest request); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorAccountService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorAccountService.java new file mode 100644 index 0000000..9c94af7 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorAccountService.java @@ -0,0 +1,64 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.dto.CreatorAccountPageDto; +import com.bnyer.common.core.vo.CreatorAccountVo; + +import java.util.List; + +public interface ICreatorAccountService { + + /** + * 新增艺术家账户 + * @param creatorAccount - + * @return - + */ + int insert(CreatorAccount creatorAccount); + + /** + * 修改艺术家账户 + * @param creatorAccount - + * @return - + */ + int update(CreatorAccount creatorAccount); + + /** + * 批量删除艺术家账户 + * @param ids ids + * @return - + */ + int delete(List ids); + + /** + * 查询艺术家账户分页 + * @param dto 分页对象 + * @return - + */ + List queryPage(CreatorAccountPageDto dto); + + /** + * 查询艺术家账户详情 + * @param id 主键id + * @return - + */ + CreatorAccount queryDetails(Long id); + + + + /** + * 根据指定类型查询艺术家账户列表 + * @param creatorId 艺术家id + * @param type 类型 + * @return - + */ + CreatorAccountVo queryListByType(Long creatorId, String type); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); + +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorProfitService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorProfitService.java new file mode 100644 index 0000000..f2f90b3 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorProfitService.java @@ -0,0 +1,82 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.dto.CreatorProfitPageDto; +import com.bnyer.common.core.vo.ConfirmProfitVo; +import com.bnyer.common.core.vo.CreatorProfitVo; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/6/8 10:57 + */ +public interface ICreatorProfitService { + + + /** + * 修改结算收益 + * @param creatorProfit 收益对象 + * @return - + */ + int update(CreatorProfit creatorProfit); + + /** + * 删除结算收益 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询结算收益分页 + * @param params 分页参数 + * @return - + */ + List queryPage(CreatorProfitPageDto params); + + /** + * 查询结算收益详情 + * @param id 主键id + * @return - + */ + CreatorProfit queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeIsShow(Long id, String status); + + /** + * 查询所有指定平台类型待入账信息 + * @param platform 平台 + * @param appType 应用 + * @param type 收益类型 + * @param date 日期 + * @return - + */ + List queryPreProfit(String platform, String appType, String type, String date); + + /** + * 查询除会员外所有已入账且已确认收益 + * @return - + */ + List queryConfirmList(); + + /** + * 根据艺术家id查询收益列表 + * @param creatorId 艺术家id + * @return - + */ + List queryProfitByCreatorId(Long creatorId); + + /** + * 批量更新收益单状态为转入钱包 + * @param list 订单列表 + * @return - + */ + int batchUpdate(List list); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorService.java new file mode 100644 index 0000000..8baf71b --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICreatorService.java @@ -0,0 +1,85 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.dto.CreatorDto; +import com.bnyer.common.core.dto.CreatorPageDto; +import com.bnyer.common.core.dto.VerifyCreatorDto; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:30 + */ +public interface ICreatorService { + + /** + * 成为艺术家 + * @param dto 艺术家参数 + * @return - + */ + int insertCreator(CreatorDto dto); + + /** + * 修改艺术家 + * @param dto 艺术家参数 + * @return - + */ + int updateCreator(Creator dto); + + /** + * 删除艺术家 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询艺术家分页 + * @param params 分页参数 + * @return - + */ + List queryPage(CreatorPageDto params); + + /** + * 查询艺术家详情 + * @param id 主键id + * @return - + */ + Creator queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); + + /** + * 审核通过 + * @param params 审核参数 + * @return - + */ + int verifyPass(VerifyCreatorDto params); + + /** + * 审核不通过 + * @param params 审核参数 + * @return - + */ + int verifyUnPass(VerifyCreatorDto params); + + /** + * 查询所有审核通过的艺术家 + * @return - + */ + List queryPassList(); + + /** + * 批量更新艺术家 + * @param list 艺术家列表 + * @return - + */ + int batchUpdate(List list); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFeedBackService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFeedBackService.java new file mode 100644 index 0000000..c2c17d4 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFeedBackService.java @@ -0,0 +1,45 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Feedback; + +import java.util.List; + +public interface IFeedBackService { + + /** + * 编辑反馈 + * @param feedback 反馈 + * @return + */ + int update(Feedback feedback); + + /** + * 批量删除反馈 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询反馈分页 + * @param source 平台渠道来源 + * @param isShow 是否显示 + * @return - + */ + List queryPage(String source, String isShow); + + /** + * 获取反馈详情 + * @param id 主键id + * @return - + */ + Feedback queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFhUserService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFhUserService.java new file mode 100644 index 0000000..91fcc74 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IFhUserService.java @@ -0,0 +1,45 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.FhUser; +import com.bnyer.common.core.dto.FhUserPageDto; + +import java.util.List; + +public interface IFhUserService { + + /** + * 修改快手用户 + * @param fhUser 快手用户 + * @return - + */ + int update(FhUser fhUser); + + /** + * 批量删除快手用户 + * @param ids 主键Ids + * @return - + */ + int delete(List ids); + + /** + * 查询快手用户分页 + * @param dto 分页条件对象 + * @return - + */ + List queryPage(FhUserPageDto dto); + + /** + * 根据id获取用户 + * @param id 主键id + * @return - + */ + FhUser queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IInviteLogService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IInviteLogService.java new file mode 100644 index 0000000..7cb8e41 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IInviteLogService.java @@ -0,0 +1,27 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.dto.InviteLogPageDto; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/31 10:37 + */ +public interface IInviteLogService { + + /** + * 查询邀请记录分页 + * @param params 分页参数 + * @return - + */ + List queryPage(InviteLogPageDto params); + + /** + * 删除记录 + * @param ids 主键ids + * @return - + */ + int delete(List ids); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ILevelInfoService.java similarity index 83% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ILevelInfoService.java index d6dff88..45fbfb2 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/LevelInfoService.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ILevelInfoService.java @@ -1,11 +1,11 @@ -package com.bnyer.img.service; +package com.bnyer.system.service; -import com.bnyer.img.domain.LevelInfo; -import com.bnyer.img.dto.LevelInfoPageDto; +import com.bnyer.common.core.domain.LevelInfo; +import com.bnyer.common.core.dto.LevelInfoPageDto; import java.util.List; -public interface LevelInfoService { +public interface ILevelInfoService { /** * 新增等级 diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/INoticeService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/INoticeService.java new file mode 100644 index 0000000..c35c91a --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/INoticeService.java @@ -0,0 +1,52 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Notice; +import com.bnyer.common.core.dto.NoticePageDto; + +import java.util.List; + +public interface INoticeService { + + /** + * 新增notice + * @param notice - + * @return - + */ + int insert(Notice notice); + + /** + * 修改notice + * @param notice - + * @return - + */ + int update(Notice notice); + + /** + * 批量删除notice + * @param ids ids + * @return - + */ + int delete(List ids); + + /** + * 查询notice分页 + * @param dto 分页对象 + * @return - + */ + List queryPage(NoticePageDto dto); + + /** + * 查询notice详情 + * @param id 主键id + * @return - + */ + Notice queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProductService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProductService.java new file mode 100644 index 0000000..18eca7b --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProductService.java @@ -0,0 +1,52 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Product; +import com.bnyer.common.core.dto.ProductPageDto; + +import java.util.List; + +public interface IProductService { + + /** + * 新增商品 + * @param product 商品 + * @return - + */ + int insert(Product product); + + /** + * 编辑商品 + * @param product 商品 + * @return - + */ + int update(Product product); + + /** + * 批量删除商品 + * @param ids 商品ids + * @return - + */ + int delete(List ids); + + /** + * 查询商品分页 + * @param params 分页参数 + * @return - + */ + List queryPage(ProductPageDto params); + + /** + * 查询商品详情 + * @param id 主键id + * @return - + */ + Product details(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProfitVerifyOrderService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProfitVerifyOrderService.java similarity index 72% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProfitVerifyOrderService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProfitVerifyOrderService.java index dce73df..86a757e 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/ProfitVerifyOrderService.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IProfitVerifyOrderService.java @@ -1,14 +1,14 @@ -package com.bnyer.img.service; +package com.bnyer.system.service; -import com.bnyer.img.domain.ProfitVerifyOrder; -import com.bnyer.img.dto.ProfitVerifyOrderDto; -import com.bnyer.img.dto.ProfitVerifyOrderInsertDto; -import com.bnyer.img.dto.ProfitVerifyOrderPageDto; -import com.bnyer.img.dto.ProfitVerifyOrderUpdateDto; +import com.bnyer.common.core.domain.ProfitVerifyOrder; +import com.bnyer.common.core.dto.ProfitVerifyOrderDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderInsertDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderPageDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderUpdateDto; import java.util.List; -public interface ProfitVerifyOrderService { +public interface IProfitVerifyOrderService { /** * 新增profitVerifyOrder diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java new file mode 100644 index 0000000..4102acc --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISignService.java @@ -0,0 +1,58 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Sign; +import com.bnyer.common.core.dto.SignPageDto; + +import java.util.List; + +public interface ISignService { + /** + * 后台新增Sign + * @param sign 标签 + * @return - + */ + int insert(Sign sign); + + /** + * 修改sign + * @param sign - + * @return - + */ + int update(Sign sign); + + /** + * 批量删除sign + * @param ids ids + * @return - + */ + int delete(List ids); + + /** + * 查询sign分页 + * @param dto 分页对象 + * @return - + */ + List queryPage(SignPageDto dto); + + /** + * 查询sign详情 + * @param id 主键id + * @return - + */ + Sign queryDetails(Long id); + + /** + * 查询sign是否重复 + * @param name 标签名字 + * @return - + */ + boolean checkSign(String name); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokImgService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokImgService.java new file mode 100644 index 0000000..4ecffc6 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokImgService.java @@ -0,0 +1,61 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.dto.TiktokImgPageDto; + +import java.util.List; + +public interface ITiktokImgService { + + /** + * 修改图片 + * @param tiktokImg 图片 + * @return - + */ + int update(TiktokImg tiktokImg); + + /** + * 批量删除ids + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询抖音图片分页 + * @param dto 分页参数对象 + * @return - + */ + List queryPage(TiktokImgPageDto dto); + + /** + * 查询抖音图片详情 + * @param id 主键id + * @return - + */ + TiktokImg queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); + + /** + * 变更审核状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeJudge(Long id, String status); + + /** + * 变更热门状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeHot(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokUserService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokUserService.java new file mode 100644 index 0000000..e9b03ed --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITiktokUserService.java @@ -0,0 +1,45 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.TiktokUser; +import com.bnyer.common.core.dto.TiktokUserPageDto; + +import java.util.List; + +public interface ITiktokUserService { + + /** + * 修改抖音用户 + * @param tiktokUser 抖音用户 + * @return - + */ + int update(TiktokUser tiktokUser); + + /** + * 批量删除抖音用户 + * @param ids 主键Ids + * @return - + */ + int delete(List ids); + + /** + * 查询抖音用户分页 + * @param dto 分页条件对象 + * @return - + */ + List queryPage(TiktokUserPageDto dto); + + /** + * 根据id获取用户 + * @param id 主键id + * @return - + */ + TiktokUser queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITypeService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITypeService.java new file mode 100644 index 0000000..4f5bce0 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ITypeService.java @@ -0,0 +1,52 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.Type; + +import java.util.List; + +public interface ITypeService { + + /** + * 新增图片分类 + * @param type 类型 + * @return - + */ + int insert(Type type); + + /** + * 修改图片类型 + * @param type 类型 + * @return - + */ + int update(Type type); + + /** + * 批量删除图片分类 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 查询图片分类分页 + * @param typeName 分类名称 + * @param isShow 是否显示 + * @return - + */ + List queryPage(String typeName, String isShow); + + /** + * 查询分类详情 + * @param id 主键id + * @return - + */ + Type queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IUserVipService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IUserVipService.java new file mode 100644 index 0000000..24ed32a --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IUserVipService.java @@ -0,0 +1,52 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.UserVip; +import com.bnyer.common.core.dto.UserVipPageDto; + +import java.util.List; + +public interface IUserVipService { + + /** + * 新增会员vip + * @param userVip vip + * @return - + */ + int insert(UserVip userVip); + + /** + * 修改会员vip + * @param userVip vip + * @return - + */ + int update(UserVip userVip); + + /** + * 删除会员vip + * @param ids vip列表 + * @return - + */ + int delete(List ids); + + /** + * 获取会员vip详情 + * @param id 主键id + * @return - + */ + UserVip queryDetails(Long id); + + /** + * 获取会员vip分页 + * @param param 分页参数 + * @return - + */ + List queryPage(UserVipPageDto param); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IVerifyLogService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IVerifyLogService.java new file mode 100644 index 0000000..51465f0 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IVerifyLogService.java @@ -0,0 +1,27 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.VerifyLog; +import com.bnyer.common.core.dto.VerifyPageDto; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/31 10:37 + */ +public interface IVerifyLogService { + + /** + * 查询审核记录分页 + * @param params 分页参数 + * @return - + */ + List queryPage(VerifyPageDto params); + + /** + * 删除记录 + * @param ids 主键ids + * @return - + */ + int delete(List ids); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWithdrawLogService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWithdrawLogService.java new file mode 100644 index 0000000..1a7b18f --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWithdrawLogService.java @@ -0,0 +1,42 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.WithdrawLog; +import com.bnyer.common.core.dto.VerifyDto; +import com.bnyer.common.core.dto.WithdrawPageDto; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/31 10:37 + */ +public interface IWithdrawLogService { + + /** + * 查询提现记录分页 + * @param params 分页参数 + * @return - + */ + List queryPage(WithdrawPageDto params); + + /** + * 查询提现详情 + * @param id 主键id + * @return - + */ + WithdrawLog queryDetails(Long id); + + /** + * 删除记录 + * @param ids 主键ids + * @return - + */ + int delete(List ids); + + /** + * 审核提现通过 + * @param params 审核参数 + * @return - + */ + int verify(VerifyDto params); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWxUserService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWxUserService.java new file mode 100644 index 0000000..8e642ab --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/IWxUserService.java @@ -0,0 +1,45 @@ +package com.bnyer.system.service; + +import com.bnyer.common.core.domain.WxUser; +import com.bnyer.common.core.dto.WxUserPageDto; + +import java.util.List; + +public interface IWxUserService { + + /** + * 修改微信用户 + * @param wxUser 微信用户 + * @return - + */ + int update(WxUser wxUser); + + /** + * 批量删除微信用户 + * @param ids 主键Ids + * @return - + */ + int delete(List ids); + + /** + * 查询微信用户分页 + * @param dto 分页条件对象 + * @return - + */ + List queryPage(WxUserPageDto dto); + + /** + * 根据id获取用户 + * @param id 主键id + * @return - + */ + WxUser queryDetails(Long id); + + /** + * 变更显示状态 + * @param id 主键id + * @param status 状态 + * @return - + */ + int changeStatus(Long id, String status); +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BannerServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BannerServiceImpl.java new file mode 100644 index 0000000..d427597 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BannerServiceImpl.java @@ -0,0 +1,76 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.Banner; +import com.bnyer.common.core.dto.BannerPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.BannerMapper; +import com.bnyer.system.service.IBannerService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class BannerServiceImpl implements IBannerService { + + @Autowired + private BannerMapper bannerMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(Banner banner) { + banner.setCreateTime(new Date()); + banner.setUpdateTime(new Date()); + return bannerMapper.insert(banner); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Banner banner) { + banner.setUpdateTime(new Date()); + return bannerMapper.updateById(banner); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return bannerMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(BannerPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(dto.getBannerName())){ + wrapper.like(Banner::getBannerName,dto.getBannerName()); + } + if(StringUtils.isNotBlank(dto.getSource())){ + wrapper.eq(Banner::getSource, dto.getSource()); + } + if(StringUtils.isNotBlank(dto.getIsShow())){ + wrapper.eq(Banner::getIsShow, dto.getIsShow()); + } + wrapper.orderByDesc(Banner::getSort); + return bannerMapper.selectList(wrapper); + } + + @Override + public Banner queryDetails(Long id) { + return bannerMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Banner::getId, id); + Banner banner = new Banner(); + banner.setIsShow(status); + return bannerMapper.update(banner,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BzDataServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BzDataServiceImpl.java new file mode 100644 index 0000000..f6d91a4 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/BzDataServiceImpl.java @@ -0,0 +1,90 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.bnyer.common.core.domain.BzData; +import com.bnyer.common.redis.service.RedisService; +import com.bnyer.system.mapper.BzDataMapper; +import com.bnyer.system.service.IBzDataService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.time.LocalDate; +import java.util.List; + +@Service +@Slf4j +public class BzDataServiceImpl implements IBzDataService { + + @Autowired + private RedisService redisService; + @Autowired + private BzDataMapper bzDataMapper; + + @Override + public void dataStatistics(String ip, String source) { + String today = LocalDate.now() + ""; + String page="bzPage_" + source; + //保存今天的key + redisService.redisTemplate.opsForZSet().add("bzPage_key" +today, today+page, 1.0); + //pv统计 + redisService.pvStatistics(today, page); + //uv统计 + redisService.uvStatistics(today, page, ip); + //查看是否已经有了这条数据 + if (!redisService.hasKey(today + source)) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("date", today); + wrapper.eq("source", source); + List bzData = bzDataMapper.selectList(wrapper); + if (bzData.size() <= 0) { + BzData data = new BzData(); + data.setDate(today); + data.setPv(1L); + data.setUv(1L); + data.setSource(source); + data.setMark(today + source); + bzDataMapper.insert(data); + } + } + } + + @Override + public String getIpAddr(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + //System.out.println("x-forwarded-for ip: " + ip); + if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) { + // 多次反向代理后会有多个ip值，第一个ip才是真实ip + if (ip.indexOf(",") != -1) { + ip = ip.split(",")[0]; + } + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + //System.out.println("Proxy-Client-IP ip: " + ip); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + //System.out.println("WL-Proxy-Client-IP ip: " + ip); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + //System.out.println("HTTP_CLIENT_IP ip: " + ip); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + //System.out.println("HTTP_X_FORWARDED_FOR ip: " + ip); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("X-Real-IP"); + //System.out.println("X-Real-IP ip: " + ip); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + //System.out.println("getRemoteAddr ip: " + ip); + } + //System.out.println("获取客户端ip: " + ip); + return ip; + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorAccountServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorAccountServiceImpl.java new file mode 100644 index 0000000..3b9417e --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorAccountServiceImpl.java @@ -0,0 +1,133 @@ +package com.bnyer.system.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.CreatorAccount; +import com.bnyer.common.core.dto.CreatorAccountPageDto; +import com.bnyer.common.core.utils.DesensitizedUtils; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.vo.CreatorAccountVo; +import com.bnyer.system.mapper.CreatorAccountMapper; +import com.bnyer.system.service.ICreatorAccountService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class CreatorAccountServiceImpl implements ICreatorAccountService { + + @Autowired + private CreatorAccountMapper creatorAccountMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(CreatorAccount creatorAccount) { + creatorAccount.setCreateTime(new Date()); + creatorAccount.setUpdateTime(new Date()); + return creatorAccountMapper.insert(creatorAccount); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(CreatorAccount creatorAccount) { + creatorAccount.setUpdateTime(new Date()); + return creatorAccountMapper.updateById(creatorAccount); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return creatorAccountMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(CreatorAccountPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(dto.getName())){ + wrapper.like(CreatorAccount::getName, dto.getName()); + } + if(StringUtils.isNotBlank(dto.getBankNo())){ + wrapper.eq(CreatorAccount::getBankNo, Sm4Util.sm4Encryption(dto.getBankNo())); + } + if(StringUtils.isNotBlank(dto.getIdNo())){ + wrapper.eq(CreatorAccount::getIdNo, Sm4Util.sm4Encryption(dto.getIdNo())); + } + if(StringUtils.isNotBlank(dto.getPhone())){ + wrapper.eq(CreatorAccount::getPhone, Sm4Util.sm4Encryption(dto.getPhone())); + } + if(StringUtils.isNotBlank(dto.getAliPayNo())){ + wrapper.eq(CreatorAccount::getAliPayNo, Sm4Util.sm4Encryption(dto.getAliPayNo())); + } + if(StringUtils.isNotBlank(dto.getIsShow())){ + wrapper.eq(CreatorAccount::getIsShow, dto.getIsShow()); + } + if(StringUtils.isNotBlank(dto.getType())){ + wrapper.eq(CreatorAccount::getType, dto.getType()); + } + wrapper.orderByDesc(CreatorAccount::getSort); + List creatorAccounts = creatorAccountMapper.selectList(wrapper); + for (CreatorAccount creatorAccount : creatorAccounts) { + creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); + creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); + creatorAccount.setName(creatorAccount.getName()); + if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); + } + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); + } + return creatorAccounts; + } + + @Override + public CreatorAccount queryDetails(Long id) { + CreatorAccount creatorAccount = creatorAccountMapper.selectById(id); + if(creatorAccount != null){ + creatorAccount.setIdNo(Sm4Util.sm4Decrypt(creatorAccount.getIdNo())); + creatorAccount.setPhone(Sm4Util.sm4Decrypt(creatorAccount.getPhone())); + creatorAccount.setName(creatorAccount.getName()); + if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); + } + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(creatorAccount), CreatorAccount.class); + } + return creatorAccount; + } + + @Override + public CreatorAccountVo queryListByType(Long creatorId, String type) { + CreatorAccountVo creatorAccount = creatorAccountMapper.queryListByType(creatorId, type); + if(creatorAccount != null){ + if(StringUtils.isNotBlank(creatorAccount.getBankNo())){ + creatorAccount.setBankNo(Sm4Util.sm4Decrypt(creatorAccount.getBankNo())); + } + if(StringUtils.isNotBlank(creatorAccount.getAliPayNo())){ + creatorAccount.setAliPayNo(Sm4Util.sm4Decrypt(creatorAccount.getAliPayNo())); + } + return creatorAccount; + } + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(CreatorAccount::getId, id); + CreatorAccount creatorAccount = new CreatorAccount(); + creatorAccount.setIsShow(status); + return creatorAccountMapper.update(creatorAccount,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorProfitServiceImpl.java new file mode 100644 index 0000000..bbee9ac --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorProfitServiceImpl.java @@ -0,0 +1,84 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.dto.CreatorProfitPageDto; +import com.bnyer.common.core.vo.ConfirmProfitVo; +import com.bnyer.common.core.vo.CreatorProfitVo; +import com.bnyer.system.mapper.CreatorProfitMapper; +import com.bnyer.system.service.ICreatorProfitService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class CreatorProfitServiceImpl implements ICreatorProfitService { + + @Autowired + private CreatorProfitMapper creatorProfitMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(CreatorProfit creatorProfit) { + creatorProfit.setUpdateTime(new Date()); + return creatorProfitMapper.updateById(creatorProfit); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return creatorProfitMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(CreatorProfitPageDto dto) { + return creatorProfitMapper.queryPage(dto); + } + + @Override + public CreatorProfit queryDetails(Long id) { + return creatorProfitMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeIsShow(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(CreatorProfit::getId, id); + CreatorProfit creatorProfit = new CreatorProfit(); + creatorProfit.setIsShow(status); + return creatorProfitMapper.update(creatorProfit, wrapper); + } + + @Override + public List queryPreProfit(String platform, String appType, String type, String date) { + return creatorProfitMapper.queryPreProfit(platform, appType, type, date); + } + + @Override + public List queryConfirmList() { + return creatorProfitMapper.queryConfirmList(); + } + + @Override + public List queryProfitByCreatorId(Long creatorId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CreatorProfit::getCreatorId, creatorId); + wrapper.eq(CreatorProfit::getStatus, "1"); + wrapper.eq(CreatorProfit::getConfirmStatus, "1"); + wrapper.notIn(CreatorProfit::getType, "2"); + return creatorProfitMapper.selectList(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int batchUpdate(List list) { + return creatorProfitMapper.batchUpdateTransInfo(list); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorServiceImpl.java new file mode 100644 index 0000000..7493a18 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CreatorServiceImpl.java @@ -0,0 +1,193 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.domain.VerifyLog; +import com.bnyer.common.core.dto.CreatorDto; +import com.bnyer.common.core.dto.CreatorPageDto; +import com.bnyer.common.core.dto.VerifyCreatorDto; +import com.bnyer.common.core.exception.ServiceException; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.utils.uuid.IdUtils; +import com.bnyer.system.mapper.CreatorMapper; +import com.bnyer.system.mapper.InviteLogMapper; +import com.bnyer.system.mapper.TiktokImgMapper; +import com.bnyer.system.mapper.VerifyLogMapper; +import com.bnyer.system.service.ICreatorService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:46 + */ +@Service +@Slf4j +public class CreatorServiceImpl implements ICreatorService { + + @Autowired + private CreatorMapper creatorMapper; + + @Autowired + private TiktokImgMapper tiktokImgMapper; + + @Autowired + private VerifyLogMapper verifyLogMapper; + + @Autowired + private InviteLogMapper inviteLogMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insertCreator(CreatorDto dto) { + //检查邀请码是否存在 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Creator::getInviteCode, StringUtils.trim(dto.getInviteCode())); + Creator creatorProtoType = creatorMapper.selectOne(wrapper); + if(creatorProtoType == null){ + throw new ServiceException("邀请码不存在,请重新编辑！", TiktokConstant.INVITE_CODE_NOT_EXIST); + } + Creator creator = new Creator(); + creator.setName(StringUtils.trim(dto.getName())); + creator.setPassword(Sm4Util.sm4Encryption(StringUtils.trim(dto.getPassword()))); + creator.setImg(StringUtils.trim(dto.getImg())); + creator.setIntro(StringUtils.trim(dto.getIntro())); + creator.setScanCode(StringUtils.trim(dto.getScanCode())); + creator.setInviteCode(IdUtils.inviteCodeGen()); + creator.setUrl(StringUtils.trim(dto.getUrl())); + creator.setPhone(Sm4Util.sm4Encryption(StringUtils.trim(dto.getPhone()))); + creator.setIsHot("0"); + creator.setStatus("0"); + creator.setIsShow("1"); + creator.setAmt(BigDecimal.valueOf(0)); + creator.setSort(0); + creator.setCreateTime(new Date()); + creator.setUpdateTime(new Date()); + int insert = creatorMapper.insert(creator); + log.info("手机号【{}】成为艺术家成功!待审核",StringUtils.trim(dto.getPhone())); + //保存邀请记录 + InviteLog inviteLog = new InviteLog(); + inviteLog.setInviteCode(StringUtils.trim(dto.getInviteCode())); + inviteLog.setInvitedCreatorId(creator.getId()); + inviteLog.setCreatorId(creatorProtoType.getId()); + inviteLog.setCreateTime(new Date()); + inviteLog.setIsShow("1"); + inviteLog.setUpdateTime(new Date()); + inviteLog.setSort(0); + inviteLogMapper.insert(inviteLog); + log.info("艺术家id【{}】被邀请码【{}】邀请成功!记录写入数据库完成!",creator.getId(),StringUtils.trim(dto.getInviteCode())); + return insert; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int updateCreator(Creator dto) { + if(StringUtils.isNotBlank(dto.getPhone())){ + dto.setPhone(Sm4Util.sm4Encryption(dto.getPhone())); + } + dto.setUpdateTime(new Date()); + return creatorMapper.updateById(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int delete = creatorMapper.deleteBatchIds(ids); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper verifyLogWrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + //删除对应艺术家图片 + wrapper.eq(TiktokImg::getCreatorId,id); + tiktokImgMapper.delete(wrapper); + //删除对应审核记录 + verifyLogWrapper.eq(VerifyLog::getCreatorId, id); + verifyLogMapper.delete(verifyLogWrapper); + } + return delete; + } + + @Override + public List queryPage(CreatorPageDto params) { + return creatorMapper.queryPage(params); + } + + @Override + public Creator queryDetails(Long id) { + Creator creator = creatorMapper.selectById(id); + creator.setPhone(Sm4Util.sm4Decrypt(creator.getPhone())); + return creator; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Creator::getId, id); + Creator creator = new Creator(); + creator.setIsShow(status); + return creatorMapper.update(creator,wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int verifyPass(VerifyCreatorDto params) { + //修改状态 + Creator creator = creatorMapper.selectById(params.getId()); + creator.setStatus("1"); + creatorMapper.updateById(creator); + //写入记录 + VerifyLog log = new VerifyLog(); + log.setCreatorId(params.getId()); + log.setAdminId(params.getAdminId()); + log.setReason(params.getReason()); + log.setCreateTime(new Date()); + log.setUpdateTime(new Date()); + log.setIsShow("1"); + log.setStatus("1"); + return verifyLogMapper.insert(log); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int verifyUnPass(VerifyCreatorDto params) { + //修改状态 + Creator creator = creatorMapper.selectById(params.getId()); + creator.setStatus("2"); + creatorMapper.updateById(creator); + //写入记录 + VerifyLog log = new VerifyLog(); + log.setCreatorId(params.getId()); + log.setAdminId(params.getAdminId()); + log.setReason(params.getReason()); + log.setCreateTime(new Date()); + log.setUpdateTime(new Date()); + log.setIsShow("1"); + log.setStatus("0"); + return verifyLogMapper.insert(log); + } + + @Override + public List queryPassList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Creator::getStatus, "1"); + wrapper.eq(Creator::getIsShow, "1"); + return creatorMapper.selectList(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int batchUpdate(List list) { + return creatorMapper.updateBatch(list); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FeedBackServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FeedBackServiceImpl.java new file mode 100644 index 0000000..c3eee21 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FeedBackServiceImpl.java @@ -0,0 +1,64 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.Feedback; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.FeedbackMapper; +import com.bnyer.system.service.IFeedBackService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class FeedBackServiceImpl implements IFeedBackService { + + @Autowired + private FeedbackMapper feedbackMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Feedback feedback) { + feedback.setUpdateTime(new Date()); + return feedbackMapper.updateById(feedback); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return feedbackMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(String source,String isShow) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(source)){ + wrapper.eq(Feedback::getSource,source); + } + if(StringUtils.isNotBlank(isShow)){ + wrapper.eq(Feedback::getIsShow,isShow); + } + wrapper.orderByDesc(Feedback::getCreateTime); + return feedbackMapper.selectList(wrapper); + } + + @Override + public Feedback queryDetails(Long id) { + return feedbackMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Feedback::getId, id); + Feedback feedback = new Feedback(); + feedback.setIsShow(status); + return feedbackMapper.update(feedback,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FhUserServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FhUserServiceImpl.java new file mode 100644 index 0000000..b3ea09b --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/FhUserServiceImpl.java @@ -0,0 +1,83 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.FhUser; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokLike; +import com.bnyer.common.core.dto.FhUserPageDto; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.FhUserMapper; +import com.bnyer.system.mapper.TiktokCollectionMapper; +import com.bnyer.system.mapper.TiktokLikeMapper; +import com.bnyer.system.service.IFhUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class FhUserServiceImpl implements IFhUserService { + + @Autowired + private FhUserMapper fhUserMapper; + + @Autowired + private TiktokLikeMapper tiktokLikeMapper; + + @Autowired + private TiktokCollectionMapper tiktokCollectionMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(FhUser fhUser) { + fhUser.setUpdateTime(new Date()); + if (StringUtils.isNotBlank(fhUser.getFhCode())) { + fhUser.setFhCode(Sm4Util.sm4Encryption(fhUser.getFhCode())); + } + return fhUserMapper.updateById(fhUser); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int delete = fhUserMapper.deleteBatchIds(ids); + //删除对应用户收藏及点赞记录 + LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + collectionWrapper.eq(TiktokCollection::getUserId, id) + .eq(TiktokCollection::getPlatform, "1"); + tiktokCollectionMapper.delete(collectionWrapper); + likeWrapper.eq(TiktokLike::getUserId, id) + .eq(TiktokLike::getPlatform, "1"); + tiktokLikeMapper.delete(likeWrapper); + } + return delete; + } + + @Override + public List queryPage(FhUserPageDto dto) { + return fhUserMapper.queryPage(dto); + } + + @Override + public FhUser queryDetails(Long id) { + return fhUserMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(FhUser::getId, id); + FhUser user = new FhUser(); + user.setIsShow(status); + return fhUserMapper.update(user, wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/InviteLogServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/InviteLogServiceImpl.java new file mode 100644 index 0000000..4b4abda --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/InviteLogServiceImpl.java @@ -0,0 +1,47 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.domain.InviteLog; +import com.bnyer.common.core.dto.InviteLogPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.InviteLogMapper; +import com.bnyer.system.service.IInviteLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:46 + */ +@Service +@Slf4j +public class InviteLogServiceImpl implements IInviteLogService { + + @Autowired + private InviteLogMapper inviteLogMapper; + + + @Override + public List queryPage(InviteLogPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getIsShow())){ + wrapper.eq(InviteLog::getIsShow,params.getIsShow()); + } + if(StringUtils.isNotBlank(params.getInviteCode())){ + wrapper.eq(InviteLog::getInviteCode,params.getInviteCode()); + } + wrapper.orderByDesc(InviteLog::getCreateTime); + return inviteLogMapper.selectList(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return inviteLogMapper.deleteBatchIds(ids); + } + +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/LevelInfoServiceImpl.java similarity index 88% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/LevelInfoServiceImpl.java index 4b81069..a105f3b 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/LevelInfoServiceImpl.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/LevelInfoServiceImpl.java @@ -1,13 +1,12 @@ -package com.bnyer.img.service.impl; +package com.bnyer.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.LevelInfo; +import com.bnyer.common.core.dto.LevelInfoPageDto; import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.img.domain.LevelInfo; -import com.bnyer.img.domain.Notice; -import com.bnyer.img.dto.LevelInfoPageDto; -import com.bnyer.img.mapper.LevelInfoMapper; -import com.bnyer.img.service.LevelInfoService; +import com.bnyer.system.mapper.LevelInfoMapper; +import com.bnyer.system.service.ILevelInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,7 +15,7 @@ import java.util.Date; import java.util.List; @Service -public class LevelInfoServiceImpl implements LevelInfoService { +public class LevelInfoServiceImpl implements ILevelInfoService { @Autowired private LevelInfoMapper levelInfoMapper; diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/NoticeServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/NoticeServiceImpl.java new file mode 100644 index 0000000..84f5161 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/NoticeServiceImpl.java @@ -0,0 +1,76 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.Notice; +import com.bnyer.common.core.dto.NoticePageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.NoticeMapper; +import com.bnyer.system.service.INoticeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class NoticeServiceImpl implements INoticeService { + + @Autowired + private NoticeMapper noticeMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(Notice notice) { + notice.setCreateTime(new Date()); + notice.setUpdateTime(new Date()); + return noticeMapper.insert(notice); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Notice notice) { + notice.setUpdateTime(new Date()); + return noticeMapper.updateById(notice); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return noticeMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(NoticePageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(dto.getTitle())){ + wrapper.like(Notice::getTitle,dto.getTitle()); + } + if(StringUtils.isNotBlank(dto.getChannel())){ + wrapper.eq(Notice::getChannel, dto.getChannel()); + } + if(StringUtils.isNotBlank(dto.getIsShow())){ + wrapper.eq(Notice::getIsShow, dto.getIsShow()); + } + wrapper.orderByDesc(Notice::getSort); + return noticeMapper.selectList(wrapper); + } + + @Override + public Notice queryDetails(Long id) { + return noticeMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Notice::getId, id); + Notice notice = new Notice(); + notice.setIsShow(status); + return noticeMapper.update(notice,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProductServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProductServiceImpl.java new file mode 100644 index 0000000..c67498d --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProductServiceImpl.java @@ -0,0 +1,76 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.Product; +import com.bnyer.common.core.dto.ProductPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.ProductMapper; +import com.bnyer.system.service.IProductService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class ProductServiceImpl implements IProductService { + + @Autowired + private ProductMapper productMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(Product product) { + product.setCreateTime(new Date()); + product.setUpdateTime(new Date()); + product.setIsShow("1"); + return productMapper.insert(product); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Product product) { + product.setUpdateTime(new Date()); + return productMapper.updateById(product); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return productMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(ProductPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getProductName())){ + wrapper.like(Product::getProductName, params.getProductName()); + } + if(StringUtils.isNotBlank(params.getProductType())){ + wrapper.eq(Product::getProductType, params.getProductType()); + } + if(StringUtils.isNotBlank(params.getIsShow())){ + wrapper.eq(Product::getIsShow, params.getIsShow()); + } + return productMapper.selectList(wrapper); + } + + @Override + public Product details(Long id) { + return productMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Product::getId, id); + Product product = new Product(); + product.setIsShow(status); + return productMapper.update(product,wrapper); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java similarity index 91% rename from bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java index eb0a392..4cfb244 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java @@ -1,25 +1,25 @@ -package com.bnyer.img.service.impl; +package com.bnyer.system.service.impl; import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.constant.ProfitOrderConstant; +import com.bnyer.common.core.constant.RedisKeyConstant; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.domain.CreatorProfit; +import com.bnyer.common.core.domain.ProfitVerifyOrder; +import com.bnyer.common.core.dto.ProfitVerifyOrderDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderInsertDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderPageDto; +import com.bnyer.common.core.dto.ProfitVerifyOrderUpdateDto; import com.bnyer.common.core.exception.ServiceException; import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.vo.ConfirmProfitVo; import com.bnyer.common.redis.service.RedisService; import com.bnyer.common.redis.service.RedissonService; -import com.bnyer.img.constants.ProfitOrderConstant; -import com.bnyer.img.constants.RedisKeyConstant; -import com.bnyer.img.domain.Creator; -import com.bnyer.img.domain.CreatorProfit; -import com.bnyer.img.domain.ProfitVerifyOrder; -import com.bnyer.img.dto.ProfitVerifyOrderDto; -import com.bnyer.img.dto.ProfitVerifyOrderInsertDto; -import com.bnyer.img.dto.ProfitVerifyOrderPageDto; -import com.bnyer.img.dto.ProfitVerifyOrderUpdateDto; -import com.bnyer.img.mapper.ProfitVerifyOrderMapper; -import com.bnyer.img.service.CreatorProfitService; -import com.bnyer.img.service.CreatorService; -import com.bnyer.img.service.ProfitVerifyOrderService; -import com.bnyer.img.vo.ConfirmProfitVo; +import com.bnyer.system.mapper.ProfitVerifyOrderMapper; +import com.bnyer.system.service.ICreatorProfitService; +import com.bnyer.system.service.ICreatorService; +import com.bnyer.system.service.IProfitVerifyOrderService; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; @Service @Slf4j -public class ProfitVerifyOrderServiceImpl implements ProfitVerifyOrderService { +public class ProfitVerifyOrderServiceImpl implements IProfitVerifyOrderService { @Autowired private ProfitVerifyOrderMapper profitVerifyOrderMapper; @@ -44,10 +44,10 @@ public class ProfitVerifyOrderServiceImpl implements ProfitVerifyOrderService { private RedisService redisService; @Autowired - private CreatorProfitService creatorProfitService; + private ICreatorProfitService creatorProfitService; @Autowired - private CreatorService creatorService; + private ICreatorService creatorService; @Autowired private RedissonService redissonService; diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java new file mode 100644 index 0000000..af7417c --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SignServiceImpl.java @@ -0,0 +1,101 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.ImgSignRelation; +import com.bnyer.common.core.domain.Sign; +import com.bnyer.common.core.dto.SignPageDto; +import com.bnyer.common.core.exception.ServiceException; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.ImgSignRelationMapper; +import com.bnyer.system.mapper.SignMapper; +import com.bnyer.system.service.ISignService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class SignServiceImpl implements ISignService { + @Autowired + private SignMapper signMapper; + + @Autowired + private ImgSignRelationMapper imgSignRelationMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(Sign sign) { + boolean b = checkSign(sign.getName()); + if(b){ + throw new ServiceException("标签名称已存在!"); + }else{ + sign.setCreateTime(new Date()); + sign.setUpdateTime(new Date()); + return signMapper.insert(sign); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Sign sign) { + sign.setUpdateTime(new Date()); + return signMapper.updateById(sign); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int i = signMapper.deleteBatchIds(ids); + //删除关联relation + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ImgSignRelation::getSignId, ids); + imgSignRelationMapper.delete(wrapper); + //imgSignRelationMapper.batchDelete(ids); + return i; + } + + @Override + public List queryPage(SignPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(dto.getName())){ + wrapper.like(Sign::getName,dto.getName()); + } + if (StringUtils.isNotBlank(dto.getIsShow())){ + wrapper.eq(Sign::getIsShow,dto.getIsShow()); + } + wrapper.orderByDesc(Sign::getSort); + return signMapper.selectList(wrapper); + } + + @Override + public Sign queryDetails(Long id) { + return signMapper.selectById(id); + } + + @Override + public boolean checkSign(String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(Sign::getName,name); + List signs = signMapper.selectList(wrapper); + if(signs.size() > 0){ + return true; + }else{ + return false; + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Sign::getId,id); + Sign sign = new Sign(); + sign.setIsShow(status); + return signMapper.update(sign,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java new file mode 100644 index 0000000..0d2ec98 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokImgServiceImpl.java @@ -0,0 +1,115 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokImg; +import com.bnyer.common.core.domain.TiktokLike; +import com.bnyer.common.core.dto.TiktokImgPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.TiktokCollectionMapper; +import com.bnyer.system.mapper.TiktokImgMapper; +import com.bnyer.system.mapper.TiktokLikeMapper; +import com.bnyer.system.service.ITiktokImgService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class TiktokImgServiceImpl implements ITiktokImgService { + + @Autowired + private TiktokImgMapper tiktokImgMapper; + + @Autowired + private TiktokCollectionMapper tiktokCollectionMapper; + + @Autowired + private TiktokLikeMapper tiktokLikeMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(TiktokImg tiktokImg) { + tiktokImg.setUpdateTime(new Date()); + return tiktokImgMapper.updateById(tiktokImg); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int delete = tiktokImgMapper.deleteBatchIds(ids); + LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + likeWrapper.in(TiktokLike::getImgId, id); + collectionWrapper.in(TiktokCollection::getImgId, id); + } + //删除点赞关联 + tiktokLikeMapper.delete(likeWrapper); + //删除收藏关联 + tiktokCollectionMapper.delete(collectionWrapper); + return delete; + } + + @Override + public List queryPage(TiktokImgPageDto dto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(dto.getCreatorId() != null){ + wrapper.eq(TiktokImg::getCreatorId, dto.getCreatorId()); + } + if(dto.getTypeId() != null){ + wrapper.eq(TiktokImg::getTypeId, dto.getTypeId()); + } + if(StringUtils.isNotBlank(dto.getStatus())){ + wrapper.eq(TiktokImg::getStatus, dto.getStatus()); + } + if(StringUtils.isNotBlank(dto.getIsHot())){ + wrapper.eq(TiktokImg::getIsHot, dto.getIsHot()); + } + if(StringUtils.isNotBlank(dto.getIsShow())){ + wrapper.eq(TiktokImg::getIsShow, dto.getIsShow()); + } + wrapper.orderByDesc(TiktokImg::getCreateTime); + return tiktokImgMapper.selectList(wrapper); + } + + @Override + public TiktokImg queryDetails(Long id) { + return tiktokImgMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokImg::getId, id); + TiktokImg img = new TiktokImg(); + img.setIsShow(status); + return tiktokImgMapper.update(img,wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeJudge(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokImg::getId, id); + TiktokImg img = new TiktokImg(); + img.setStatus(status); + return tiktokImgMapper.update(img,wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeHot(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokImg::getId, id); + TiktokImg img = new TiktokImg(); + img.setIsHot(status); + return tiktokImgMapper.update(img,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokUserServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokUserServiceImpl.java new file mode 100644 index 0000000..7edc7a1 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TiktokUserServiceImpl.java @@ -0,0 +1,82 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokLike; +import com.bnyer.common.core.domain.TiktokUser; +import com.bnyer.common.core.dto.TiktokUserPageDto; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.TiktokCollectionMapper; +import com.bnyer.system.mapper.TiktokLikeMapper; +import com.bnyer.system.mapper.TiktokUserMapper; +import com.bnyer.system.service.ITiktokUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class TiktokUserServiceImpl implements ITiktokUserService { + + @Autowired + private TiktokUserMapper tiktokUserMapper; + + @Autowired + private TiktokLikeMapper tiktokLikeMapper; + + @Autowired + private TiktokCollectionMapper tiktokCollectionMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(TiktokUser tiktokUser) { + tiktokUser.setUpdateTime(new Date()); + if(StringUtils.isNotBlank(tiktokUser.getTiktokCode())){ + tiktokUser.setTiktokCode(Sm4Util.sm4Encryption(tiktokUser.getTiktokCode())); + } + return tiktokUserMapper.updateById(tiktokUser); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int delete = tiktokUserMapper.deleteBatchIds(ids); + //删除对应用户收藏及点赞记录 + LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + collectionWrapper.eq(TiktokCollection::getUserId,id); + tiktokCollectionMapper.delete(collectionWrapper); + likeWrapper.eq(TiktokLike::getUserId, id); + tiktokLikeMapper.delete(likeWrapper); + } + return delete; + } + + @Override + public List queryPage(TiktokUserPageDto dto) { + return tiktokUserMapper.queryPage(dto); + } + + @Override + public TiktokUser queryDetails(Long id) { + return tiktokUserMapper.selectById(id); + } + + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(TiktokUser::getId, id); + TiktokUser user = new TiktokUser(); + user.setIsShow(status); + return tiktokUserMapper.update(user,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TypeServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TypeServiceImpl.java new file mode 100644 index 0000000..823cb43 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/TypeServiceImpl.java @@ -0,0 +1,72 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.Type; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.TypeMapper; +import com.bnyer.system.service.ITypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class TypeServiceImpl implements ITypeService { + + @Autowired + private TypeMapper typeMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(Type type) { + type.setCreateTime(new Date()); + type.setUpdateTime(new Date()); + return typeMapper.insert(type); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(Type type) { + type.setUpdateTime(new Date()); + return typeMapper.updateById(type); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return typeMapper.deleteBatchIds(ids); + } + + @Override + public List queryPage(String typeName,String isShow) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(typeName)){ + wrapper.like(Type::getTypeName, typeName); + } + if(StringUtils.isNotBlank(isShow)){ + wrapper.eq(Type::getIsShow, isShow); + } + wrapper.orderByDesc(Type::getSort); + return typeMapper.selectList(wrapper); + } + + @Override + public Type queryDetails(Long id) { + return typeMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Type::getId, id); + Type type = new Type(); + type.setIsShow(status); + return typeMapper.update(type,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/UserVipServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/UserVipServiceImpl.java new file mode 100644 index 0000000..e6677c2 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/UserVipServiceImpl.java @@ -0,0 +1,78 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.UserVip; +import com.bnyer.common.core.dto.UserVipPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.utils.uuid.IdUtils; +import com.bnyer.system.mapper.UserVipMapper; +import com.bnyer.system.service.IUserVipService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class UserVipServiceImpl implements IUserVipService { + + @Autowired + private UserVipMapper userVipMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(UserVip userVip) { + userVip.setVipCode(IdUtils.fastSimpleUUID()); + userVip.setCreateTime(new Date()); + userVip.setUpdateTime(new Date()); + userVip.setIsShow("1"); + return userVipMapper.insert(userVip); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(UserVip userVip) { + userVip.setUpdateTime(new Date()); + return userVipMapper.updateById(userVip); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return userVipMapper.deleteBatchIds(ids); + } + + @Override + public UserVip queryDetails(Long id) { + return userVipMapper.selectById(id); + } + + @Override + public List queryPage(UserVipPageDto param) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(param.getVipName())){ + wrapper.like(UserVip::getVipName, param.getVipName()); + } + if(StringUtils.isNotBlank(param.getVipCode())){ + wrapper.eq(UserVip::getVipCode, param.getVipCode()); + } + if(StringUtils.isNotBlank(param.getIsDelay())){ + wrapper.eq(UserVip::getIsDelay, param.getIsDelay()); + } + wrapper.orderByDesc(UserVip::getSort); + return userVipMapper.selectList(wrapper); + } + + @Override + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(UserVip::getId, id); + UserVip userVip = new UserVip(); + userVip.setIsShow(status); + return userVipMapper.update(userVip,wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/VerifyLogServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/VerifyLogServiceImpl.java new file mode 100644 index 0000000..31bdf1a --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/VerifyLogServiceImpl.java @@ -0,0 +1,43 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.domain.VerifyLog; +import com.bnyer.common.core.dto.VerifyPageDto; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.VerifyLogMapper; +import com.bnyer.system.service.IVerifyLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:46 + */ +@Service +@Slf4j +public class VerifyLogServiceImpl implements IVerifyLogService { + + @Autowired + private VerifyLogMapper verifyLogMapper; + + + @Override + public List queryPage(VerifyPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getStatus())){ + wrapper.eq(VerifyLog::getStatus,params.getStatus()); + } + wrapper.orderByDesc(VerifyLog::getCreateTime); + return verifyLogMapper.selectList(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return verifyLogMapper.deleteBatchIds(ids); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java new file mode 100644 index 0000000..4276742 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WithdrawLogServiceImpl.java @@ -0,0 +1,227 @@ +package com.bnyer.system.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alipay.api.AlipayApiException; +import com.alipay.api.AlipayClient; +import com.alipay.api.CertAlipayRequest; +import com.alipay.api.DefaultAlipayClient; +import com.alipay.api.domain.AlipayFundTransUniTransferModel; +import com.alipay.api.domain.Participant; +import com.alipay.api.request.AlipayFundTransUniTransferRequest; +import com.alipay.api.response.AlipayFundTransUniTransferResponse; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.constant.TiktokConstant; +import com.bnyer.common.core.constant.WithdrawConstant; +import com.bnyer.common.core.domain.Creator; +import com.bnyer.common.core.domain.WithdrawLog; +import com.bnyer.common.core.dto.VerifyDto; +import com.bnyer.common.core.dto.WithdrawPageDto; +import com.bnyer.common.core.exception.ServiceException; +import com.bnyer.common.core.utils.DesensitizedUtils; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.common.core.vo.CreatorAccountVo; +import com.bnyer.system.config.AlipayConfig; +import com.bnyer.system.mapper.CreatorMapper; +import com.bnyer.system.mapper.WithdrawLogMapper; +import com.bnyer.system.service.ICreatorAccountService; +import com.bnyer.system.service.IWithdrawLogService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * @author chengkun + * @date 2022/5/30 16:46 + */ +@Service +@Slf4j +public class WithdrawLogServiceImpl implements IWithdrawLogService { + + @Autowired + private WithdrawLogMapper withdrawLogMapper; + + @Autowired + private CreatorMapper creatorMapper; + + @Autowired + private ICreatorAccountService creatorAccountService; + + @Resource + private AlipayConfig alipayConfig; + + @Override + public List queryPage(WithdrawPageDto params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotBlank(params.getStatus())){ + wrapper.eq(WithdrawLog::getStatus,params.getStatus()); + } + if(StringUtils.isNotBlank(params.getChannel())){ + wrapper.eq(WithdrawLog::getChannel,params.getChannel()); + } + if(StringUtils.isNotBlank(params.getOrderId())){ + wrapper.eq(WithdrawLog::getOrderId,params.getOrderId()); + } + if(StringUtils.isNotBlank(params.getBankNo())){ + wrapper.eq(WithdrawLog::getBankNo, Sm4Util.sm4Encryption(params.getBankNo())); + } + if(StringUtils.isNotBlank(params.getPhone())){ + wrapper.eq(WithdrawLog::getPhone, Sm4Util.sm4Encryption(params.getPhone())); + } + wrapper.orderByDesc(WithdrawLog::getCreateTime); + List withdrawLogs = withdrawLogMapper.selectList(wrapper); + for (WithdrawLog withdrawLog : withdrawLogs) { + if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ + withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); + } + if(StringUtils.isNotBlank(withdrawLog.getPhone())){ + withdrawLog.setPhone(Sm4Util.sm4Decrypt(withdrawLog.getPhone())); + } + DesensitizedUtils.getJsonNoCopy(withdrawLog); + } + return withdrawLogs; + } + + @Override + public WithdrawLog queryDetails(Long id) { + WithdrawLog withdrawLog = withdrawLogMapper.selectById(id); + if(StringUtils.isNotBlank(withdrawLog.getBankNo())){ + withdrawLog.setBankNo(Sm4Util.sm4Decrypt(withdrawLog.getBankNo())); + } + if(StringUtils.isNotBlank(withdrawLog.getPhone())){ + withdrawLog.setPhone(Sm4Util.sm4Decrypt(withdrawLog.getPhone())); + } + JSONObject.parseObject(DesensitizedUtils.getJsonNoCopy(withdrawLog), WithdrawLog.class); + return withdrawLog; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + return withdrawLogMapper.deleteBatchIds(ids); + } + + /** + * 支付宝打款到指定支付宝账号 + * @param orderId 订单id + * @param amt 金额 + * @param aliPayNo 艺术家支付宝账号 + * @param name 姓名 + * @return - + */ + private AlipayFundTransUniTransferResponse trans(String orderId,String aliPayNo,String name,BigDecimal amt) throws AlipayApiException { + //构造client + CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); + //设置网关地址 + certAlipayRequest.setServerUrl(alipayConfig.getGatewayUrl()); + //设置应用Id + certAlipayRequest.setAppId(alipayConfig.getAppId()); + //设置应用私钥 + certAlipayRequest.setPrivateKey(alipayConfig.getPrivateKey()); + //设置请求格式，固定值json + certAlipayRequest.setFormat("json"); + //设置字符集 + certAlipayRequest.setCharset("UTF8"); + //设置签名类型 + certAlipayRequest.setSignType("RSA2"); + //设置应用公钥证书路径 + certAlipayRequest.setCertPath(alipayConfig.getCertPath()); + //设置支付宝公钥证书路径 + certAlipayRequest.setAlipayPublicCertPath(alipayConfig.getAlipayPublicCertPath()); + //设置支付宝根证书路径 + certAlipayRequest.setRootCertPath(alipayConfig.getRootPath()); + //构造client + AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest); + AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest(); + AlipayFundTransUniTransferModel model = new AlipayFundTransUniTransferModel(); + model.setOutBizNo(orderId); + model.setTransAmount(amt.toString()); + model.setProductCode("TRANS_ACCOUNT_NO_PWD"); + /** 场景码，单笔无密转账到支付宝账户固定为：DIRECT_TRANSFER **/ + model.setBizScene("DIRECT_TRANSFER"); + /** 转账业务的标题，用于在支付宝用户的账单里显示 **/ + model.setOrderTitle("次元hub提现打款"); + Participant participant = new Participant(); + /** 参与方的唯一标识,收款支付宝账号或者支付宝吧账号唯一会员ID **/ + participant.setIdentity(aliPayNo); + /** 参与方的标识类型：ALIPAY_USER_ID 支付宝的会员ID ALIPAY_LOGON_ID手机号登录 **/ + participant.setIdentityType("ALIPAY_LOGON_ID"); + /** 参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。当identity_type=ALIPAY_LOGON_ID时，本字段必填 **/ + participant.setName(name); + model.setPayeeInfo(participant); + /** 业务备注 **/ + model.setRemark("提现打款"); + request.setBizModel(model); + log.info("支付宝提现入参为:{}", JSON.toJSONString(request)); + AlipayFundTransUniTransferResponse response = null; + try { + response = alipayClient.certificateExecute(request); + } catch (AlipayApiException e) { + throw e; + } + /** 获取接口调用结果，如果调用失败，可根据返回错误信息到该文档寻找排查方案：https://opensupport.alipay.com/support/helpcenter/107 **/ + log.info("支付宝提现响应结果为:{}",response.getBody()); + return response; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int verify(VerifyDto params) { + WithdrawLog withdrawLog = withdrawLogMapper.selectById(params.getId()); + if(withdrawLog == null){ + throw new ServiceException("该笔提现申请不存在!", TiktokConstant.WITHDRAW_LOG_NOT_EXIST); + } + withdrawLog.setReason(params.getReason()); + if(params.getVerifyStatus().equals(WithdrawConstant.UNPASS)){ + //审核拒绝 + withdrawLog.setStatus("4"); + withdrawLog.setUpdateTime(new Date()); + return withdrawLogMapper.updateById(withdrawLog); + } + //审核通过 + withdrawLog.setStatus("2"); + withdrawLog.setUpdateTime(new Date()); + //此处审核通过，调用支付宝企业付款到用户处方法 + if(withdrawLog.getChannel().equals(WithdrawConstant.ALIPAY)){ + //根据用户id查询其支付宝账户及其真实名称 + CreatorAccountVo creatorAccount = creatorAccountService.queryListByType(withdrawLog.getCreatorId(), "1"); + if(creatorAccount != null){ + try{ + AlipayFundTransUniTransferResponse body = this.trans(withdrawLog.getOrderId(), creatorAccount.getAliPayNo(), creatorAccount.getName(), withdrawLog.getAmt()); + if(!body.getCode().equals(WithdrawConstant.SUCCESS)){ + //提现失败 + withdrawLog.setStatus("3"); + withdrawLog.setReason(body.getSubMsg()); + log.error("艺术家【{}】订单【{}】提现失败!原因为:【{}】",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),body.getSubMsg()); + return withdrawLogMapper.updateById(withdrawLog); + } + //扣除账户余额 + Creator creator = creatorMapper.selectById(withdrawLog.getCreatorId()); + BigDecimal amt = creator.getAmt().subtract(withdrawLog.getAmt()); + creator.setAmt(amt); + creatorMapper.updateById(creator); + //TODO 分布式锁 + }catch (AlipayApiException e){ + log.error("艺术家【{}】订单【{}】提现异常!原因为:【{}】",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),e); + withdrawLog.setStatus("1"); + withdrawLog.setReason(e.getMessage()); + withdrawLogMapper.updateById(withdrawLog); + throw new ServiceException(e.getMessage()); + } + }else{ + throw new ServiceException("该艺术家未绑定支付宝账户!请手动设置!"); + } + }else if(withdrawLog.getChannel().equals(WithdrawConstant.BANK)){ + //TODO 转账到银行卡待开发 + } + log.info("艺术家【{}】订单【{}】提现【{}】元成功!",withdrawLog.getCreatorId(),withdrawLog.getOrderId(),withdrawLog.getAmt()); + return withdrawLogMapper.updateById(withdrawLog); + } +} diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WxUserServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WxUserServiceImpl.java new file mode 100644 index 0000000..5219c91 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/WxUserServiceImpl.java @@ -0,0 +1,83 @@ +package com.bnyer.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bnyer.common.core.domain.TiktokCollection; +import com.bnyer.common.core.domain.TiktokLike; +import com.bnyer.common.core.domain.WxUser; +import com.bnyer.common.core.dto.WxUserPageDto; +import com.bnyer.common.core.utils.Sm4Util; +import com.bnyer.common.core.utils.StringUtils; +import com.bnyer.system.mapper.TiktokCollectionMapper; +import com.bnyer.system.mapper.TiktokLikeMapper; +import com.bnyer.system.mapper.WxUserMapper; +import com.bnyer.system.service.IWxUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Service +@Slf4j +public class WxUserServiceImpl implements IWxUserService { + + @Autowired + private WxUserMapper wxUserMapper; + + @Autowired + private TiktokLikeMapper tiktokLikeMapper; + + @Autowired + private TiktokCollectionMapper tiktokCollectionMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int update(WxUser wxUser) { + wxUser.setUpdateTime(new Date()); + if (StringUtils.isNotBlank(wxUser.getWxCode())) { + wxUser.setWxCode(Sm4Util.sm4Encryption(wxUser.getWxCode())); + } + return wxUserMapper.updateById(wxUser); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int delete(List ids) { + int delete = wxUserMapper.deleteBatchIds(ids); + //删除对应用户收藏及点赞记录 + LambdaQueryWrapper collectionWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper likeWrapper = new LambdaQueryWrapper<>(); + for (Long id : ids) { + collectionWrapper.eq(TiktokCollection::getUserId, id) + .eq(TiktokCollection::getPlatform, "2"); + tiktokCollectionMapper.delete(collectionWrapper); + likeWrapper.eq(TiktokLike::getUserId, id) + .eq(TiktokLike::getPlatform, "2"); + tiktokLikeMapper.delete(likeWrapper); + } + return delete; + } + + @Override + public List queryPage(WxUserPageDto dto) { + return wxUserMapper.queryPage(dto); + } + + @Override + public WxUser queryDetails(Long id) { + return wxUserMapper.selectById(id); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int changeStatus(Long id, String status) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(WxUser::getId, id); + WxUser user = new WxUser(); + user.setIsShow(status); + return wxUserMapper.update(user, wrapper); + } +} diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorAccountMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorAccountMapper.xml new file mode 100644 index 0000000..1d6a2bc --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorAccountMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + id, creator_id, `name`, id_no, bank_no, phone,alipay_no,type, create_time, update_time, sort,is_show + + + + diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorMapper.xml new file mode 100644 index 0000000..d835615 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, `name`,password, scan_code, phone, img, intro, invite_code, url, status, is_hot, is_show, create_time, + update_time, sort, amt, last_login_time,level_id,exp + + + + + + + update img_creator + + + amt = #{item.amt} + + + where id = #{item.id} + + + diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorProfitMapper.xml new file mode 100644 index 0000000..ffa76dc --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/CreatorProfitMapper.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_no, creator_id,scan_code, img_id, profit, platform, app_type, `type`, `status`, confirm_type, + confirm_status, download_num, is_show, create_time, income_time, confirm_time, + wallet_time, update_time, sort, mark + + + + + + + + + update img_creator_profit + set status = '2',wallet_time = (select NOW()) + where id in + + #{item} + + + diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/FhUserMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/FhUserMapper.xml new file mode 100644 index 0000000..db816a3 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/FhUserMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + id, username, fh_code,phone, img,is_vip, is_show, create_time, update_time, sort + + + + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/LevelInfoMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/LevelInfoMapper.xml similarity index 87% rename from bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/LevelInfoMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/LevelInfoMapper.xml index 2b1569c..c1fb349 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/LevelInfoMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/LevelInfoMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProfitVerifyOrderMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/ProfitVerifyOrderMapper.xml similarity index 86% rename from bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProfitVerifyOrderMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/ProfitVerifyOrderMapper.xml index 3fb0b47..76982e6 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/ProfitVerifyOrderMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/ProfitVerifyOrderMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -20,6 +20,6 @@ id, amt, admin_id, verify_status, reason, verify_admin_id, create_time, verify_time, - update_admin_id,updateTime,platform,app_type + update_admin_id,update_time,platform,app_type diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml index 8bf6eab..e364a32 100644 --- a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml @@ -120,7 +120,7 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/TiktokUserMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/TiktokUserMapper.xml new file mode 100644 index 0000000..cc7f8fd --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/TiktokUserMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + id, username, tiktok_code,phone, img,is_vip,is_show, create_time, update_time, sort + + + + diff --git a/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/WxUserMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/WxUserMapper.xml new file mode 100644 index 0000000..b1f76d2 --- /dev/null +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/WxUserMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + id, username, wx_code,phone, img,is_vip, is_show, create_time, update_time, sort + + + + diff --git a/bnyer-visual/bnyer-monitor/pom.xml b/bnyer-visual/bnyer-monitor/pom.xml index 86613cf..68f4d45 100644 --- a/bnyer-visual/bnyer-monitor/pom.xml +++ b/bnyer-visual/bnyer-monitor/pom.xml @@ -61,6 +61,7 @@ org.springframework.boot spring-boot-maven-plugin + 2.6.2