diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java index fd4a688..cbbbdb1 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java @@ -79,6 +79,13 @@ public class ShopDealerUserController extends BaseController { return fail("添加失败"); } + @PreAuthorize("hasAuthority('shop:shopDealerUser:update')") + @Operation(summary = "开启/关闭分销商用户核销权限") + @PutMapping("/verifyEnable") + public ApiResult verifyEnable(@RequestParam("id") Integer id) { + return success(shopDealerUserService.verifyEnable(id)); + } + @PreAuthorize("hasAuthority('shop:shopDealerUser:update')") @Operation(summary = "修改分销商用户记录表") @PutMapping() diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java index 8db36da..4272a7e 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java @@ -1,12 +1,11 @@ package com.gxwebsoft.shop.entity; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; + +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; @@ -105,6 +104,9 @@ public class ShopDealerUser implements Serializable { @Schema(description = "排序号") private Integer sortNumber; + @Schema(description = "核销权限是否开启 0-未开启 1-已开启") + private Boolean verifyFlag; + @Schema(description = "是否删除") private Integer isDelete; @@ -115,6 +117,9 @@ public class ShopDealerUser implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; + @Schema(description = "更新人") + private Integer updater; + @Schema(description = "修改时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; @@ -122,4 +127,8 @@ public class ShopDealerUser implements Serializable { @Schema(description = "分销商等级:0-普通用户 1-超级管理员 2-合伙人(总店) 3-合伙人(分店)") private Integer dealerLevel; + @Schema(description = "删除 0-未删 1-已删") + @TableLogic + private Integer deleted; + } diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java index 9977568..1a13058 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java @@ -67,4 +67,11 @@ public interface ShopDealerUserService extends IService { */ Boolean settlementBatch(ShopDealerSettlementDto dto); + /** + * 开启/关闭分销商用户核销权限 + * @param id + * @return + */ + Boolean verifyEnable(Integer id); + } diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java index bd64ae2..e783c1c 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java @@ -420,6 +420,25 @@ public class ShopDealerUserServiceImpl extends ServiceImpl().eq(ShopDealerUser::getUserId, userId)); if(shopDealerUser == null){ diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index 82f5440..ec1a344 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -441,8 +441,8 @@ public class ShopOrderServiceImpl extends ServiceImpl