From 89c51da30386b5001805778b666043041bc155fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 26 七月 2024 17:40:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 116 insertions(+), 15 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 f1ad343..4899dd7 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,23 +1,27 @@
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.web.reqeust.EditMemberRequest;
-import com.doumee.dao.web.reqeust.EditShopDTO;
-import com.doumee.dao.web.reqeust.EditUsersRequest;
-import com.doumee.dao.web.reqeust.ContentShareImgDto;
+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.ShopService;
-import com.doumee.service.business.SmsEmailService;
-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;
@@ -27,6 +31,10 @@
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -50,6 +58,13 @@
@Autowired
public ShopService shopService;
+ @Autowired
+ public GetCrmDataService getCrmDataService;
+
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
+
+
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByWx")
@ApiImplicitParams({
@@ -72,7 +87,6 @@
}
-
@ApiOperation(value = "鎵嬫満鍙烽獙璇佺爜鐧婚檰", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByPhone")
@ApiImplicitParams({
@@ -92,9 +106,17 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
})
public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ usersService.bindingOpenid(code,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 = "鍛樺伐绔皬绋嬪簭")
@@ -102,9 +124,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse getUserDetail() {
- usersService.usersDetailById(getMemberId());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse<Users> getUserDetail() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",usersService.usersDetailById(getUserId()));
}
@UserLoginRequired
@@ -114,10 +135,11 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
- editUsersRequest.setUserId(getMemberId());
+ editUsersRequest.setUserId(getUserId());
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
+
@UserLoginRequired
@ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/shopPage")
@@ -126,6 +148,16 @@
})
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
@@ -141,7 +173,7 @@
@UserLoginRequired
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/updShop")
+ @PostMapping("/updShop")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
@@ -150,15 +182,84 @@
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