From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 209 insertions(+), 12 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index cce994c..4878c92 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -1,21 +1,40 @@
package com.doumee.api.web;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.zbom.ZbomCRMService;
+import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
+import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
+import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
+import com.doumee.biz.zbom.model.zhongtai.*;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Shop;
+import com.doumee.dao.business.model.SmsEmail;
+import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
-import com.doumee.service.business.MemberService;
-import com.doumee.service.business.UsersService;
+import com.doumee.service.business.*;
+import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -23,7 +42,7 @@
* @Author : Rk
* @create 2024/7/10 18:06
*/
-@Api(tags = "鍛樺伐绔皬绋嬪簭鐢ㄦ埛涓氬姟")
+@Api(tags = "銆怋绔皬绋嬪簭銆戠敤鎴蜂笟鍔�")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/personnel")
@@ -32,6 +51,18 @@
@Autowired
public UsersService usersService;
+
+ @Autowired
+ public SmsEmailService smsEmailService;
+
+ @Autowired
+ public ShopService shopService;
+
+ @Autowired
+ public GetCrmDataService getCrmDataService;
+
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@@ -43,15 +74,28 @@
return ApiResponse.success(usersService.wxLogin(code));
}
+ @ApiOperation(value = "鍙戦�佺煭淇￠獙璇佺爜", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/sendSms")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
+ })
+ public ApiResponse sendSms(@RequestParam String phone) {
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setPhone(phone);
+ smsEmailService.sendSms(smsEmail);
+ return ApiResponse.success("鍙戦�佹垚鍔�");
+ }
+
@ApiOperation(value = "鎵嬫満鍙烽獙璇佺爜鐧婚檰", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByPhone")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "鐭俊楠岃瘉鐮�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = false),
})
- public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code) {
- return ApiResponse.success(usersService.phoneLogin(phone,code));
+ public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code,String openid) {
+ return ApiResponse.success(usersService.phoneLogin(phone,code,openid));
}
@@ -59,11 +103,164 @@
@ApiOperation(value = "缁戝畾openid", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/bindingOpenid")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
})
- public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ public ApiResponse bindingOpenid(@RequestParam String openid) {
+ usersService.bindingOpenid(openid,getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @ApiOperation(value = "鎵嬫満鍙峰揩鎹风櫥褰�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getWxMiniPhoneLogin")
+ public ApiResponse<AccountResponse> getWxMiniPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
+ return ApiResponse.success("鑾峰彇鎴愬姛",usersService.getWxMiniPhoneLogin(wxPhoneRequest));
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇涓汉淇℃伅璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/getUserDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<Users> getUserDetail() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",usersService.usersDetailById(getUserId()));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "鏇存柊涓汉淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/editUsers")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
+ editUsersRequest.setUserId(getUserId());
+ usersService.editUserInfo(editUsersRequest);
+ return ApiResponse.success("鏇存柊鎴愬姛");
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/shopPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<PageData<Shop>> shopPage (@RequestBody PageWrap<Shop> pageWrap) {
+ return ApiResponse.success(shopService.findPage(pageWrap));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇鍛樺伐绠＄悊闂ㄥ簵鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/userShopList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Shop>> userShopList () {
+ return ApiResponse.success(shopService.getUserShopList(getMemberId()));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "闂ㄥ簵璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/shopDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "shopId", value = "闂ㄥ簵涓婚敭", required = true)
+ })
+ public ApiResponse<Shop> shopDetail (@RequestParam Long shopId) {
+ return ApiResponse.success(shopService.shopDetail(shopId,null));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "淇敼闂ㄥ簵淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/updShop")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse updShop(@RequestBody EditShopDTO editShopDTO) {
+ shopService.updShop(editShopDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇涓汉鍚嶇墖", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getUserCard")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<String> getUserCard() {
+ return ApiResponse.success(usersService.getUserCard(this.getLoginUserInfo()));
+ }
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+ @UserLoginRequired
+ @LoginRequired
+ @ApiOperation(value = "鏇存柊token", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/updateToken")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse updateToken () {
+ systemDictDataBiz.updWxMiniToken();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇鍐呭鍒嗕韩娴锋姤", notes = "鑾峰彇鍐呭鍒嗕韩娴锋姤锛屽姞灏忕▼搴忕爜")
+ @PostMapping("/getContentShareImg")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<String> getContentShareImg(@RequestBody ContentShareImgDto param) {
+ return ApiResponse.success(usersService.getContentShareImg(this.getLoginUserInfo(),param));
+ }
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇瀹㈡埛/娼滃鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getCustomerList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<CRMBaseResponse<List<CRMCustomerListResponse>>> getCustomerList(@RequestBody CrmCustomerListRequest crmCustomerListRequest) {
+ crmCustomerListRequest.setUserId(getUserId());
+ return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
+ }
+
+
+ @UserLoginRequired
+ @LoginRequired
+ @ApiOperation(value = "鎵归噺娣诲姞鍠滄缁欏鎴�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/batchAddLike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse batchAddLike(@RequestBody ZTBatchAddListRequest ztBatchAddListRequest) {
+ ztBatchAddListRequest.setUserType(getUserType());
+ ztBatchAddListRequest.setUserId(getUserId().toString());
+ getZhongTaiDataService.batchAddLike(ztBatchAddListRequest);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
+ @UserLoginRequired
+ @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/logOff")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse logOff() {
+ ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId(),getToken());
+ if(Objects.nonNull(ztBaseRequst)){
+ getZhongTaiDataService.userLogout(ztBaseRequst);
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3