Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

Helius

2021-07-15 bea4cd8cceb220189fd1fed5c2c1ff22d3e8a9ed

 gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java

@@ -7,10 +7,12 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.entity.UserHeadRelate;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.user.dto.*;
import com.xzx.gc.user.mapper.AccountMapper;
import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.mapper.UserHeadRelateMapper;
import com.xzx.gc.user.service.DistribService;
import com.xzx.gc.user.vo.*;
import io.swagger.annotations.Api;
@@ -38,6 +40,9 @@

    @Autowired
    private AccountMapper accountMapper;

    @Autowired
    private UserHeadRelateMapper userHeadRelateMapper;

    /**
     * 查看分銷系統设置详情
@@ -108,6 +113,12 @@
                || accountInfo.getIsProhibit() == "1"){
            return JsonResult.failMessage("账户已冻结！");
        }
        //团员不能当团长
        String userId = accountInfo.getUserId();
        UserHeadRelate userHeadRelate = userHeadRelateMapper.selectMemberByUserId(userId);
        if(ObjectUtil.isNotEmpty(userHeadRelate)){
            return JsonResult.failMessage("账户不能申请成为团长！");
        }
        distribService.adddistrib(model);
        OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--新增团长-"+id).build();
@@ -176,7 +187,16 @@
        return  JsonResult.success("操作成功！");
    }

    @ApiOperation(value = "团长数据")
    @ApiOperation(value = "团长数据--头部")
    @ApiResponses(
            @ApiResponse(code = 200, message = "success", response = DistribDataInfoVo.class)
    )
    @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/distrib/distribDataInfo.json")
    public JsonResult<DistribDataInfoVo> distribDataInfo(@RequestBody DistribDataInfoDto distribDataInfoDto) {
        return JsonResult.success(distribService.distribDataInfo(distribDataInfoDto));
    }

    @ApiOperation(value = "团长数据--列表")
    @ApiResponses(
            @ApiResponse(code = 200, message = "success", response = DistribDataListVo.class)
    )