增加分销员推广核销能力业务

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<Boolean> verifyEnable(@RequestParam("id") Integer id) {
+        return success(shopDealerUserService.verifyEnable(id));
+    }
+
     @PreAuthorize("hasAuthority('shop:shopDealerUser:update')")
     @Operation(summary = "修改分销商用户记录表")
     @PutMapping()

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

src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java

@@ -67,4 +67,11 @@ public interface ShopDealerUserService extends IService<ShopDealerUser> {
      */
     Boolean settlementBatch(ShopDealerSettlementDto dto);
 
+    /**
+     * 开启/关闭分销商用户核销权限
+     * @param id
+     * @return
+     */
+    Boolean verifyEnable(Integer id);
+
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java

@@ -420,6 +420,25 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
         return Boolean.TRUE;
     }
 
+    @Override
+    public Boolean verifyEnable(Integer id) {
+        ShopDealerUser dealerUser = baseMapper.selectById(id);
+        if(dealerUser != null){
+            if(dealerUser.getVerifyFlag()){
+                dealerUser.setVerifyFlag(false);
+            }else {
+                dealerUser.setVerifyFlag(true);
+            }
+            dealerUser.setUpdateTime(LocalDateTime.now());
+            User loginUser = LoginUserUtil.getLoginUser();
+            if(loginUser != null){
+                dealerUser.setUpdater(loginUser.getUserId());
+            }
+            baseMapper.updateById(dealerUser);
+        }
+        return Boolean.TRUE;
+    }
+
     public ShopDealerUser getDealerUser(Integer userId){
         ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper<ShopDealerUser>().eq(ShopDealerUser::getUserId, userId));
         if(shopDealerUser == null){

src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java

@@ -441,8 +441,8 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             //2.判断是否有核销权限
             Integer verifyType = verifyDto.getVerifyType();
             if(verifyType == 2){
-                User user = userMapper.getById(loginUser.getUserId());
-                if(!(user != null && user.getVerifyFlag() != null && user.getVerifyFlag() == 1)){
+                ShopDealerUser shopDealerUser = shopDealerUserService.getByUserIdRel(loginUser.getUserId());
+                if(!(shopDealerUser != null && shopDealerUser.getVerifyFlag() != null && shopDealerUser.getVerifyFlag())){
                     throw new RuntimeException("暂无核销权限！");
                 }
             }