czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

替换收银呗字样，更改创客错误状态,更改提现时手机号显示,分享注册，提现算法列表,后台推广员列表补充推送

Browse Source
This commit is contained in:
liuyingfang
2023-07-18 15:37:00 +08:00
parent 0a7da333b2
commit b92f72b53e
18 changed files with 139 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java
View File

@@ -41,12 +41,12 @@ public class IntroduceController {
if (Objects.equals(entity.getType(), "1")) {
String type = httpServletRequest.getHeader("type");
//TODO 暂时安卓开发IOS不开
if ("1".equals(type) || "2".equals(type)){
if ("1".equals(type)){
return ResultGenerator.genSuccessResult(entity.getContent());
}
// else if ("2".equals(type)){
// return ResultGenerator.genFailResult("");
// }
else if ("2".equals(type)){
return ResultGenerator.genFailResult("");
}
return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
}else {
return ResultGenerator.genFailResult("");
@@ -73,11 +73,11 @@ public class IntroduceController {
if (Objects.equals(entity.getType(), "1")) {
String type = httpServletRequest.getHeader("type");
//TODO 暂时安卓开发IOS不开
if ("1".equals(type) || "2".equals(type)){
return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));}
// }else if ("2".equals(type)){
// return ResultGenerator.genFailResult("");
// }
if ("1".equals(type)){
return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));
}else if ("2".equals(type)){
return ResultGenerator.genFailResult("");
}
return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
}else {
return ResultGenerator.genFailResult("");

9
pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java
View File

@@ -1781,12 +1781,7 @@ public class UserAppController {
@GetMapping(value = "/applyMarker")
public Result<Object> applyMarker(@RequestParam("code") String code){
UserApp userApp = userAppService.checkApiToken();
try {
userAppService.applyMarker(userApp, code);
return ResultGenerator.genSuccessResult();
} catch (Exception e) {
e.printStackTrace();
}
return ResultGenerator.genFailResult("申请失败");
userAppService.applyMarker(userApp, code);
return ResultGenerator.genSuccessResult();
}
}