From 5f49840dcf78085b888cab90f61b1efd68c54d4d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Dec 2021 18:41:10 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
index 48790e2..d9cd20b 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
@@ -22,6 +22,7 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.common.utils.*;
import com.xzx.gc.common.utils.ali.SmsUtil;
+import com.xzx.gc.common.utils.wxpay.WxUtil;
import com.xzx.gc.entity.*;
import com.xzx.gc.model.IdDTO;
import com.xzx.gc.model.JsonResult;
@@ -31,6 +32,9 @@
import com.xzx.gc.user.dto.*;
import com.xzx.gc.user.mapper.*;
import com.xzx.gc.user.service.*;
+import com.xzx.gc.user.vo.JhyInfoListVo;
+import com.xzx.gc.user.vo.TgmxInfoListVo;
+import com.xzx.gc.user.vo.UserIdentityVo;
import com.xzx.gc.util.DoubleUtil;
import com.xzx.gc.util.SessionUtil;
import io.swagger.annotations.*;
@@ -119,6 +123,9 @@
@Autowired
private CityPartnerService cityPartnerService;
+ @Autowired
+ private WxUtil wxUtil;
+
/**
* 查询我的环保金
@@ -204,6 +211,11 @@
return result;
}
+ @ApiOperation(value = "获取用户身份状态")
+ @PostMapping("/user/query/userIdentity")
+ public JsonResult<UserIdentityVo> userIdentity(HttpServletRequest request) {
+ return JsonResult.success(userService.userIdentity(getUserId(request)));
+ }
/**
* 验证支付密码
@@ -389,6 +401,18 @@
}
}
+ @ApiOperation(value = "获取二维码")
+ @PostMapping(value = "/user/share/acode")
+ public Result getAcode(HttpServletRequest request) {
+ Result result = new Result();
+ String userId = getUserId(request);
+ UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ String imgName="/user_" + userId + "_acode_1.jpg";
+ String s = wxUtil.generateAcode("poster=" + userInfo.getMobilePhone() + "&chiefId=" + userInfo.getUserId(), "pages/login/login", imgName, "800px", 1);
+ result.setData(s);
+ return result;
+ }
+
@ApiOperation(value = "分页查看用户的分享提成详情")
@PostMapping(value = "/user/findPercentageDetail")
@@ -467,7 +491,6 @@
@ApiImplicitParam(paramType="query", name = "userType", value = "用户类型(1为普通用户,2为回收员,3为代丢员,4入库员,5运营员)", required = true, dataType = "String"),
@ApiImplicitParam(paramType="query", name = "mobilePhone", value = "手机号", required = true, dataType = "String")
})
-// @ApiResponses({@ApiResponse( code = 200, message = "success", response = UserModel.class)})
public JsonResult<Map<String, Object>> queryUserApiList(@RequestBody UserModel userModel){
Map<String, Object> map = userService.queryCuserForTimeList(userModel);
return JsonResult.success(map);
@@ -1034,5 +1057,17 @@
return Result.success();
}
+
+
+
+ @ApiOperation(value = "推广明细列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = TgmxInfoListVo.class)
+ )
+ @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/user/tgmxInfo.json")
+ public JsonResult<Map<String, Object>> tgmxInfo(@RequestBody TgmxInfoListDto tgmxInfoListDto) {
+ return JsonResult.success(userService.tgmxInfo(tgmxInfoListDto));
+ }
+
}
--
Gitblit v1.9.1