|
|
@@ -4,12 +4,15 @@ package com.fs.app.controller;
|
|
|
import cn.hutool.core.img.ImgUtil;
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.fs.app.annotation.Login;
|
|
|
import com.fs.common.config.FSConfig;
|
|
|
import com.fs.common.core.domain.R;
|
|
|
+import com.fs.common.core.domain.ResponseResult;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.param.BaseQueryParam;
|
|
|
import com.fs.common.utils.OrderUtils;
|
|
|
+import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
|
|
|
import com.fs.store.domain.FsStoreOrder;
|
|
|
import com.fs.store.domain.FsUser;
|
|
|
import com.fs.store.domain.FsUserBill;
|
|
|
@@ -24,6 +27,7 @@ import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -31,6 +35,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import javax.validation.Valid;
|
|
|
import java.awt.*;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
@@ -42,6 +47,7 @@ import java.util.List;
|
|
|
@Api("个人中心")
|
|
|
@RestController
|
|
|
@RequestMapping(value="/app/user")
|
|
|
+@Slf4j
|
|
|
public class UserController extends AppBaseController {
|
|
|
|
|
|
@Autowired
|
|
|
@@ -59,6 +65,9 @@ public class UserController extends AppBaseController {
|
|
|
private IFsUserExtractService userExtractService;
|
|
|
@Autowired
|
|
|
private IFsUserPromoterApplyService userPromoterApplyService;
|
|
|
+ @Autowired
|
|
|
+ private IFsUserService fsUserService;
|
|
|
+
|
|
|
/**
|
|
|
* 获取用户信息
|
|
|
* @param request
|
|
|
@@ -331,4 +340,11 @@ public class UserController extends AppBaseController {
|
|
|
return R.error("您已是推广员,不能重复绑定");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation("会员关联绑定销售")
|
|
|
+ @PostMapping("/beMember")
|
|
|
+ public ResponseResult<Boolean> becomeMember(@Valid @RequestBody FsUserCourseBeMemberParam param) {
|
|
|
+ log.debug("会员关联绑定销售 param:{}", JSON.toJSONString(param));
|
|
|
+ return fsUserService.becomeMember(param);
|
|
|
+ }
|
|
|
}
|
