|
@@ -5,30 +5,29 @@ import java.util.stream.Collectors;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
-import com.game.business.domain.AppGame;
|
|
|
-import com.game.business.domain.AppGameBetting;
|
|
|
-import com.game.business.domain.AppGameCommission;
|
|
|
+import cn.hutool.core.util.RandomUtil;
|
|
|
+import com.game.business.domain.*;
|
|
|
import com.game.business.dto.AppUserAgentDTO;
|
|
|
+import com.game.business.dto.AppUserDTO;
|
|
|
import com.game.business.service.IAppGameCommissionService;
|
|
|
import com.game.business.service.IAppGameService;
|
|
|
+import com.game.business.service.IAppUserService;
|
|
|
+import com.game.business.util.Md5Utils;
|
|
|
import com.game.business.vo.AppGameBettingDetailsCountVO;
|
|
|
import com.game.business.vo.AppGameCommissionVO;
|
|
|
import com.game.business.vo.AppUserAgentVO;
|
|
|
import com.game.common.annotation.Anonymous;
|
|
|
-import com.game.common.core.domain.HttpRet;
|
|
|
-import com.game.common.core.domain.HttpRetPageArr;
|
|
|
-import com.game.common.core.domain.R;
|
|
|
+import com.game.common.core.domain.*;
|
|
|
+import com.game.common.utils.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import com.game.common.annotation.Log;
|
|
|
import com.game.common.core.controller.BaseController;
|
|
|
-import com.game.common.core.domain.AjaxResult;
|
|
|
import com.game.common.enums.BusinessType;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import com.game.business.domain.AppUserAgent;
|
|
|
import com.game.business.service.IAppUserAgentService;
|
|
|
import com.game.common.utils.poi.ExcelUtil;
|
|
|
import com.game.common.core.page.TableDataInfo;
|
|
@@ -53,30 +52,26 @@ public class AppUserAgentController extends BaseController
|
|
|
@Autowired
|
|
|
private IAppGameService appGameService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IAppUserService appUserService;
|
|
|
+
|
|
|
|
|
|
@Anonymous
|
|
|
- @PostMapping("/add")
|
|
|
+ @PostMapping("/addAgent")
|
|
|
@ApiOperation(value = "添加代理", notes = "添加代理")
|
|
|
- public HttpRet addAgent(@RequestBody AppUserAgentDTO appUserAgent)
|
|
|
+ public HttpRet addAgent(@RequestBody AppUserDTO appUserDTO)
|
|
|
{
|
|
|
- if(appUserAgent == null){
|
|
|
- return HttpRet.fail("代理数据为空。");
|
|
|
- }
|
|
|
|
|
|
- if(appUserAgent.getPid() == null){
|
|
|
- return HttpRet.fail("上级代理ID为空。");
|
|
|
+ if(appUserService.getMobileCount(appUserDTO.getMobile())){
|
|
|
+ return HttpRet.fail("用户手机号码已存在。");
|
|
|
}
|
|
|
|
|
|
- AppUserAgent userAgent = new AppUserAgent();
|
|
|
- userAgent.setUserId(appUserAgent.getUserId());
|
|
|
- List<AppUserAgent> list = appUserAgentService.selectAppUserAgentList(userAgent);
|
|
|
+ AppUser appUser = getAppUser(appUserDTO.getMobile(), appUserDTO.getPassWord());
|
|
|
|
|
|
- if(list != null && !list.isEmpty()){
|
|
|
- return HttpRet.fail("当前用户已经是代理。");
|
|
|
- }
|
|
|
+ appUserService.insertAppUser(appUser);
|
|
|
|
|
|
AppUserAgent pUserAgent = new AppUserAgent();
|
|
|
- pUserAgent.setUserId(appUserAgent.getPid());
|
|
|
+ pUserAgent.setUserId(appUserDTO.getUserId());
|
|
|
List<AppUserAgent> pList = appUserAgentService.selectAppUserAgentList(pUserAgent);
|
|
|
|
|
|
if(pList == null || pList.isEmpty()){
|
|
@@ -84,38 +79,31 @@ public class AppUserAgentController extends BaseController
|
|
|
}
|
|
|
|
|
|
AppUserAgent dbPuserAgent = pList.get(0);
|
|
|
- AppUserAgent dbUserAgent = new AppUserAgent();
|
|
|
- BeanUtils.copyProperties(appUserAgent, dbUserAgent);
|
|
|
|
|
|
- dbUserAgent.setTopId(dbPuserAgent.getTopId());
|
|
|
- dbUserAgent.setAuditStatus("0");
|
|
|
- dbUserAgent.setCreateTime(new Date());
|
|
|
- dbUserAgent.setId(IdUtil.getSnowflakeNextId());
|
|
|
- appUserAgentService.insertAppUserAgent(dbUserAgent);
|
|
|
+ AppUserAgent appUserAgent = new AppUserAgent();
|
|
|
+ appUserAgent.setTopId(dbPuserAgent.getTopId() == null ? dbPuserAgent.getUserId() : dbPuserAgent.getTopId());
|
|
|
+ appUserAgent.setPid(dbPuserAgent.getUserId());
|
|
|
+ appUserAgent.setUserId(appUser.getUserid());
|
|
|
+ appUserAgent.setAuditStatus("1");
|
|
|
+ appUserAgent.setCreateTime(new Date());
|
|
|
|
|
|
- if(appUserAgent.getCommissions() != null && !appUserAgent.getCommissions().isEmpty()){
|
|
|
- List<AppGameCommission> commissionList = appUserAgent.getCommissions();
|
|
|
- for(AppGameCommission commission : commissionList){
|
|
|
- if(commission.getPid() == null){
|
|
|
- commission.setPid(appUserAgent.getPid());
|
|
|
- }
|
|
|
- commission.setId(IdUtil.getSnowflakeNextId());
|
|
|
- appGameCommissionService.insertAppGameCommission(commission);
|
|
|
- }
|
|
|
- }
|
|
|
+ appUserAgentService.insertAppUserAgent(appUserAgent);
|
|
|
|
|
|
- return HttpRet.success("添加成功");
|
|
|
+ return HttpRet.success("添加成功");
|
|
|
}
|
|
|
|
|
|
+
|
|
|
@Anonymous
|
|
|
- @PostMapping("/update")
|
|
|
- @ApiOperation(value = "修改代理", notes = "修改代理")
|
|
|
- public HttpRet updateAgent(@RequestBody AppUserAgentDTO appUserAgent)
|
|
|
+ @PostMapping("/updateConfig")
|
|
|
+ @ApiOperation(value = "修改代理配置", notes = "修改代理配置")
|
|
|
+ public HttpRet addAgent(@RequestBody AppUserAgentDTO appUserAgent)
|
|
|
{
|
|
|
+ if(appUserAgent == null){
|
|
|
+ return HttpRet.fail("代理数据为空。");
|
|
|
+ }
|
|
|
|
|
|
AppUserAgent dbUserAgent = new AppUserAgent();
|
|
|
- dbUserAgent.setLiveRate(appUserAgent.getLiveRate());
|
|
|
- dbUserAgent.setDividendGuaranteeRate(appUserAgent.getDividendGuaranteeRate());
|
|
|
+ BeanUtils.copyProperties(appUserAgent, dbUserAgent);
|
|
|
dbUserAgent.setUpdateTime(new Date());
|
|
|
appUserAgentService.updateAppUserAgent(dbUserAgent);
|
|
|
|
|
@@ -125,9 +113,9 @@ public class AppUserAgentController extends BaseController
|
|
|
if(commission.getId() == null){
|
|
|
if(commission.getPid() == null){
|
|
|
commission.setPid(appUserAgent.getPid());
|
|
|
+ commission.setId(IdUtil.getSnowflakeNextId());
|
|
|
+ appGameCommissionService.insertAppGameCommission(commission);
|
|
|
}
|
|
|
- commission.setId(IdUtil.getSnowflakeNextId());
|
|
|
- appGameCommissionService.insertAppGameCommission(commission);
|
|
|
}else{
|
|
|
appGameCommissionService.updateAppGameCommission(commission);
|
|
|
}
|
|
@@ -138,7 +126,32 @@ public class AppUserAgentController extends BaseController
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 游戏输赢详情列表
|
|
|
+ * 获取代理成员列表
|
|
|
+ */
|
|
|
+ @Anonymous
|
|
|
+ @PostMapping(value = "/getUserAgentList")
|
|
|
+ @ApiOperation(value = "获取代理成员列表", notes = "获取代理成员列表")
|
|
|
+ public HttpRetArr<AppUserAgentVO> getUserAgentList(@RequestParam(name = "userId") Long userId)
|
|
|
+ {
|
|
|
+ AppUserAgent userAgent = new AppUserAgent();
|
|
|
+ userAgent.setPid(userId);
|
|
|
+ List<AppUserAgent> userAgents = appUserAgentService.selectAppUserAgentList(userAgent);
|
|
|
+ List<AppUserAgentVO> resultList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < userAgents.size(); i++) {
|
|
|
+ AppUserAgentVO appUserAgentVO = new AppUserAgentVO();
|
|
|
+ BeanUtils.copyProperties(userAgents.get(0), appUserAgentVO);
|
|
|
+
|
|
|
+ AppUser appUser = appUserService.selectAppUserByUserid(appUserAgentVO.getUserId());
|
|
|
+ if(appUser != null){
|
|
|
+ appUserAgentVO.setNickName(appUser.getNickname());
|
|
|
+ appUserAgentVO.setAvatar(appUser.getAvatar());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return HttpRetArr.success("查询成功", resultList);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取代理成员设置
|
|
|
*/
|
|
|
@Anonymous
|
|
|
@PostMapping(value = "/getUserAgent")
|
|
@@ -161,7 +174,7 @@ public class AppUserAgentController extends BaseController
|
|
|
appGameCommission.setPid(pid);
|
|
|
appGameCommission.setUserId(userId);
|
|
|
List<AppGameCommission> gameCommissions = appGameCommissionService.selectAppGameCommissionList(appGameCommission);
|
|
|
- Map<Long, List<AppGameCommission>> idGameMap = null;
|
|
|
+ Map<Long, List<AppGameCommission>> idGameMap;
|
|
|
if(gameCommissions != null && !gameCommissions.isEmpty()){
|
|
|
idGameMap = gameCommissions.stream().collect(Collectors.groupingBy(AppGameCommission::getGameId));
|
|
|
}else{
|
|
@@ -194,4 +207,87 @@ public class AppUserAgentController extends BaseController
|
|
|
appUserAgentVO.setCommissions(gameCommissionVOList);
|
|
|
return HttpRet.success("查询成功", appUserAgentVO);
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 新增用户
|
|
|
+ * @return 用户id
|
|
|
+ * @author jiang
|
|
|
+ * @date 2021/9/25 16:28
|
|
|
+ */
|
|
|
+ public AppUser getAppUser(String mobile, String password) {
|
|
|
+
|
|
|
+ AppUser appUser = new AppUser();
|
|
|
+
|
|
|
+ appUser.setUserid(IdUtil.getSnowflakeNextId());
|
|
|
+ if (StringUtils.isNotBlank(password)) {
|
|
|
+ appUser.setPassword(Md5Utils.md5(Md5Utils.md5(password) + appUser.getSalt()));
|
|
|
+ }
|
|
|
+ appUser.setUsername(mobile);
|
|
|
+ appUser.setAvatar(null);
|
|
|
+ appUser.setSex(0L);
|
|
|
+ appUser.setSignature("这家伙很懒...");
|
|
|
+ appUser.setSalt(RandomUtil.randomString(8));
|
|
|
+
|
|
|
+ // 基础信息
|
|
|
+ appUser.setMobile(mobile);
|
|
|
+ appUser.setPassword(password);
|
|
|
+ appUser.setRegType(0L);
|
|
|
+ appUser.setOpenid(null);
|
|
|
+ appUser.setRegisterIp("127.0.0.1");
|
|
|
+ appUser.setRegType(0L);
|
|
|
+ appUser.setCreateTime(new Date());
|
|
|
+ appUser.setLoginType("1");
|
|
|
+
|
|
|
+ appUser.setUserType(2L);
|
|
|
+ appUser.setBirthday("1990-01-01");
|
|
|
+ appUser.setStatus(0L);
|
|
|
+ appUser.setDelFlag(0L);
|
|
|
+ appUser.setIshot(1L);
|
|
|
+ appUser.setIsRecommend(0L);
|
|
|
+ appUser.setIssuper(1L);
|
|
|
+ appUser.setRole(0L);
|
|
|
+ appUser.setCity("墨西哥");
|
|
|
+ appUser.setAddress("墨西哥");
|
|
|
+ appUser.setLat(114.31);
|
|
|
+ appUser.setLng(30.52);
|
|
|
+
|
|
|
+ // 用户开关
|
|
|
+ appUser.setGiftGlobalBroadcast(1L);
|
|
|
+ appUser.setIsShowHomePage(1L);
|
|
|
+
|
|
|
+ // 金币相关
|
|
|
+ appUser.setCoin(0.00);
|
|
|
+ appUser.setVotes(0.00);
|
|
|
+ appUser.setAmount(0.00);
|
|
|
+ appUser.setTotalAmount(0.00);
|
|
|
+ appUser.setVotestotal(0.00);
|
|
|
+ appUser.setTotalCharge(0.00);
|
|
|
+ appUser.setTotalAmountCash(0.00);
|
|
|
+ appUser.setTotalCash(0.00);
|
|
|
+ appUser.setConsumption(0.00);
|
|
|
+
|
|
|
+ // 等级积分相关
|
|
|
+ appUser.setUserPoint(0L);
|
|
|
+ appUser.setAnchorPoint(0L);
|
|
|
+ appUser.setCharmPoint(0L);
|
|
|
+ appUser.setUserGrade(1L);
|
|
|
+ appUser.setAnchorGrade(1L);
|
|
|
+ appUser.setWealthGrade(1L);
|
|
|
+ appUser.setNobleGrade(0L);
|
|
|
+ appUser.setCharmGrade(0L);
|
|
|
+
|
|
|
+ appUser.setIsShowHomePage(1L);
|
|
|
+ appUser.setIpaddr("墨西哥");
|
|
|
+ appUser.setAppVersion(null);
|
|
|
+ appUser.setAppVersionCode(null);
|
|
|
+ appUser.setPhoneSystem(null);
|
|
|
+ appUser.setPhoneFirm(null);
|
|
|
+ appUser.setPhoneModel(null);
|
|
|
+ appUser.setPhoneUuid(null);
|
|
|
+ appUser.setSource(null);
|
|
|
+ appUser.setIszombie(1L);
|
|
|
+ appUser.setIszombiep(1L);
|
|
|
+
|
|
|
+ return appUser;
|
|
|
+ }
|
|
|
}
|