记得上下班打卡 | git大法好,push需谨慎

Commit 893ba709 authored by Administrator's avatar Administrator 🎨

Merge branch 'pre' into 'master'

Pre

See merge request !312
parents ce2503cc af8f3a0c
...@@ -34,12 +34,13 @@ public class KylinArActiveController { ...@@ -34,12 +34,13 @@ public class KylinArActiveController {
@PostMapping("getUserStatus") @PostMapping("getUserStatus")
@ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效[目前失效没有用]") @ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效[目前失效没有用]")
public ResponseDto<String> getUserStatus() { public ResponseDto<String> getUserStatus() {
String uid = CurrentUtil.getCurrentUid(); return ResponseDto.success("1");
if(null==dataUtils.getUserStatus(uid)){ // String uid = CurrentUtil.getCurrentUid();
return ResponseDto.success("0"); // if(null==dataUtils.getUserStatus(uid)){
}else{ // return ResponseDto.success("0");
return ResponseDto.success(dataUtils.getUserStatus(uid)); // }else{
} // return ResponseDto.success(dataUtils.getUserStatus(uid));
// }
} }
@PostMapping("exchangeCode") @PostMapping("exchangeCode")
@ApiOperation("兑换码兑换") @ApiOperation("兑换码兑换")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment