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/CustomerApi.java | 424 ++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 327 insertions(+), 97 deletions(-) diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java index f3dfd5f..07abd7e 100644 --- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java +++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java @@ -2,19 +2,17 @@ import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.biz.zbom.ZbomCRMService; -import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest; -import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest; +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.CustomerLog; -import com.doumee.dao.business.model.Member; -import com.doumee.dao.business.model.Shop; -import com.doumee.dao.business.model.Users; +import com.doumee.core.wx.SendWxMessage; +import com.doumee.dao.business.model.*; import com.doumee.dao.web.reqeust.*; import com.doumee.dao.web.response.AccountResponse; import com.doumee.dao.web.response.BjParamConfigResponse; @@ -33,8 +31,10 @@ import javax.imageio.ImageIO; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.beans.Customizer; import java.io.InputStream; import java.util.List; +import java.util.Objects; /** * Created by IntelliJ IDEA. @@ -48,9 +48,6 @@ @RequestMapping("/web/customer") @Slf4j public class CustomerApi extends ApiController{ - - - @Autowired private MemberService memberService; @@ -74,20 +71,39 @@ @Autowired private CustomerUserService customerUserService; + @Autowired private SystemDictDataBiz systemDictDataBiz; @Autowired private CustomerLogService customerLogService; + @Autowired + private NewsService newsService; + + @Autowired + private ActionsService actionsService; + + @ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭") @GetMapping("/wxLoginCustomer") @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "userId", value = "瀵艰喘涓婚敭", required = false), }) - public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code) { - return ApiResponse.success(memberService.wxLogin(code)); + public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String userId) { + return ApiResponse.success(memberService.wxLogin(code,userId)); } + + @ApiOperation(value = "test瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/testWxLoginCustomer") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "寰俊code", required = true), + }) + public ApiResponse<AccountResponse> testWxLoginCustomer(@RequestParam String openid) { + return ApiResponse.success(memberService.testLogin(openid)); + } + @LoginRequired @ApiOperation(value = "鑾峰彇鎵嬫満鍙�", notes = "瀹㈡埛绔皬绋嬪簭") @@ -107,11 +123,14 @@ }) public ApiResponse<Member> editMember(@RequestBody EditMemberRequest editMemberRequest) { editMemberRequest.setId(getMemberId()); + String phone = editMemberRequest.getPhone(); //鍚屾瀵艰喘缁戝畾淇℃伅 - if(StringUtils.isNotBlank(editMemberRequest.getPhone())){ - customerUserService.syncByPhone(editMemberRequest.getPhone()); + Member member =memberService.updMemberDetail(editMemberRequest); + if(StringUtils.isNotBlank(phone)){ + customerUserService.syncByPhone(member); + member = memberService.getMemberInfo(member.getId()); } - return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberDetail(editMemberRequest)); + return ApiResponse.success("鏇存柊鎴愬姛",member); } @LoginRequired @@ -122,11 +141,14 @@ }) public ApiResponse<Member> binDingPhone(@RequestBody EditMemberRequest editMemberRequest) { editMemberRequest.setId(getMemberId()); + String phone =editMemberRequest.getPhone(); + Member member = memberService.updMemberPhone(editMemberRequest); //鍚屾瀵艰喘缁戝畾淇℃伅 - if(StringUtils.isNotBlank(editMemberRequest.getPhone())){ - customerUserService.syncByPhone(editMemberRequest.getPhone()); + if(StringUtils.isNotBlank(phone)){ + customerUserService.syncByPhone(member); + member = memberService.getMemberInfo(getMemberId()); } - return ApiResponse.success("鏇存柊鎴愬姛",memberService.updMemberPhone(editMemberRequest)); + return ApiResponse.success("鏇存柊鎴愬姛",member); } @@ -138,7 +160,9 @@ @ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙蜂俊鎭�", required = true), }) public ApiResponse syncCustomerUser(@RequestParam String phone) { - customerUserService.syncByPhone(phone); + if(StringUtils.isNotBlank(getLoginMemberInfo().getPhone())){ + customerUserService.syncByPhone(getLoginMemberInfo()); + } return ApiResponse.success("鍚屾鎴愬姛"); } @@ -187,7 +211,7 @@ return ApiResponse.success("鎿嶄綔鎴愬姛"); } - @LoginRequired + /* @LoginRequired @ApiOperation(value = "娴嬭瘯瑁呬慨椋庢牸", notes = "瀹㈡埛绔皬绋嬪簭") @PostMapping("/saveTestTrimStyle") @ApiImplicitParams({ @@ -196,25 +220,41 @@ public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) { testTrimStyleDTO.setMemberId(getMemberId()); CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO); -// zbomCRMService.dealCustomerLogData(customerLog); + zbomCRMService.dealCustomerLogData(customerLog); return ApiResponse.success("鎿嶄綔鎴愬姛"); - } + }*/ @LoginRequired @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭") @GetMapping("/logOff") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + }) public ApiResponse logOff() { - memberService.logOff(getMemberId()); + ZTBaseRequst ztBaseRequst = memberService.logOff(getUserId(),getToken()); + if(Objects.nonNull(ztBaseRequst)){ + getZhongTaiDataService.userLogout(ztBaseRequst); + } return ApiResponse.success("鎿嶄綔鎴愬姛"); } @LoginRequired @ApiOperation(value = "闂ㄥ簵鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭") - @PostMapping("/shopPage") @ApiImplicitParams({ + @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.queryShopByLL(pageWrap)); + PageData<Shop> pageData = shopService.queryShopByLL(pageWrap); + if(Objects.nonNull(pageWrap.getModel().getLatitude())&&Objects.nonNull(pageWrap.getModel().getLongitude())){ + //鏇存柊浜哄憳缁忕含搴︿俊鎭� + EditMemberRequest editMemberRequest = new EditMemberRequest(); + editMemberRequest.setId(getMemberId()); + editMemberRequest.setLatitude(pageWrap.getModel().getLatitude()); + editMemberRequest.setLongitude(pageWrap.getModel().getLongitude()); + memberService.updMemberDetail(editMemberRequest); + } + return ApiResponse.success(pageData); } @@ -237,6 +277,7 @@ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) public ApiResponse<PageData<Users>> myUserPage (@RequestBody PageWrap<Users> pageWrap) { + pageWrap.getModel().setMemberId(getMemberId()); return ApiResponse.success(usersService.findPage(pageWrap)); } @@ -250,18 +291,6 @@ }) public ApiResponse<Users> usersDetailByIamId (@RequestParam String iamId) { return ApiResponse.success(usersService.usersDetailByIamId(iamId)); - } - - - @LoginRequired - @ApiOperation(value = "娴嬭瘯灏忕▼搴廡oken", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/testToken") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) - }) - public ApiResponse testToken () { - systemDictDataBiz.updWxMiniToken(); - return ApiResponse.success("鏇存柊鎴愬姛"); } @@ -286,19 +315,21 @@ } @LoginRequired - @ApiOperation(value = "鎴戠殑棰勭害鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭") + @ApiOperation(value = "鎴戠殑棰勭害 鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭") @PostMapping("/customerLogPage") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) public ApiResponse<PageData<CustomerLog>> customerLogPage(@RequestBody PageWrap<CustomerLog> pageWrap) { - pageWrap.getModel().setCostomerId(getMemberId().toString()); + pageWrap.getModel().setMemberId(getMemberId()); + pageWrap.getModel().setIsHiddenPhone(Constants.ZERO); return ApiResponse.success(customerLogService.findPage(pageWrap)); } + @UserLoginRequired @LoginRequired @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") @PostMapping("/getCatalogList") @@ -306,12 +337,15 @@ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) { + ztCatalogListRequest.setUserId(getMemberId()+""); + ztCatalogListRequest.setUserType(getUserType()); List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest); return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList); } + @UserLoginRequired @LoginRequired @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") @PostMapping("/getCataLogTagList") @@ -319,94 +353,290 @@ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) { + ztCatalogListRequest.setUserId(getMemberId()+""); + ztCatalogListRequest.setUserType(getUserType()); List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest); return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList); } + + + @UserLoginRequired @LoginRequired - @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @PostMapping("/getZTCatalogInfoResponse") + @ApiOperation(value = "琛屼负鍐呭鎺ュ彛 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/actionDo") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true), + }) + public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) { + getZhongTaiDataService.actionDo(getMemberId(),getUserType(),id,actionType); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/getCustomizedNewsList") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) - public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) { - List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest); - return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponse); + public ApiResponse<List<News>> getCustomizedNewsList() { + return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null)); + } + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/getCustomizedNewsDetail") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "涓氬姟鏁版嵁涓婚敭", required = true), + }) + public ApiResponse<News> getCustomizedNewsDetail(@RequestParam Long id) { + return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsDetail(id)); + } + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/saveShareRecord") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "鎺ㄥ箍鍜ㄨ涓婚敭", required = true), + }) + public ApiResponse saveShareRecord(@RequestParam Long id) { + newsService.saveShareRecord(id,getMemberId()); + return ApiResponse.success("鎿嶄綔鎴愬姛"); } @LoginRequired - @ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @PostMapping("/pageContentList") + @ApiOperation(value = "鎴戠殑鍠滄鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiCusFavorite") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) - public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) { - ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest); + public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest); + return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse); + } + + + + @LoginRequired + @ApiOperation(value = "杞挱鍥惧垪琛�", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiCarouselImage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest); + return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList); + } + + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiCarouselImageDetail") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) { + ztDataDetailRequest.setUserId(getMemberId()+""); + ztDataDetailRequest.setUserType(getUserType()); + ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest); + return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse); + } + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiProductNewsPage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTProductNewsInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest); return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); } + + + + + + @UserLoginRequired @LoginRequired - @ApiOperation(value = "鍐呭璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/getContentInfo") + @ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiProductPage") @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), - @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) - public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) { - ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.CUSTOMER,getMemberId()); - return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse); + public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); } + @UserLoginRequired @LoginRequired - @ApiOperation(value = "鍐呭鏀惰棌 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/collectContent") + @ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiRealcasePage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTRealcaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); + } + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiVideoPage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTVideoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); + } + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiWholecasePage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); + } + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/getZhongTaiZbDecoPage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) { + ztContentListRequest.setUserId(getMemberId()+""); + ztContentListRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTZbDecoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); + } + + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/getWholecaseInfo") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false), }) - public ApiResponse collectContent(@RequestParam String id) { - getZhongTaiDataService.collectContent(getMemberId(),Constants.CUSTOMER,id); + public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id,String salesId) { + ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId(),salesId); + return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse); + } + + + + @UserLoginRequired + @LoginRequired + @GetMapping("/getProductNewsInfo") + @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false), + }) + public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id,String salesId) { + ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId(),salesId); + return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse); + } + + + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "瀹炴櫙妗堜緥 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/getRealcaseInfo") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false), + }) + public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id,String salesId) { + ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId(),salesId); + return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse); + } + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "浜у搧璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/getProductInfo") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "salesId", value = "瀵艰喘涓婚敭锛堜簩缁寸爜鍒嗕韩锛�", required = false), + }) + public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id,String salesId) { + ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,getUserType(),getMemberId(),salesId); + return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse); + } + + + @UserLoginRequired + @LoginRequired + @ApiOperation(value = "鎴戠殑鏀惰棌/鍠滄鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") + @PostMapping("/collectLikePage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) + }) + public ApiResponse<ZTBasePageResponse<ZTCollectLikeInfoResponse>> collectLikePage(@RequestBody ZTCollectLikeRequest ztCollectLikeRequest) { + ztCollectLikeRequest.setUserId(getMemberId()+""); + ztCollectLikeRequest.setUserType(getUserType()); + ZTBasePageResponse<ZTCollectLikeInfoResponse> ztBasePageResponse= getZhongTaiDataService.collectLikePage(ztCollectLikeRequest); + return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse); + } + + @ApiOperation(value = "娴嬭瘯鍙戦�佸井淇℃秷鎭�", notes = "瀹㈡埛绔皬绋嬪簭") + @GetMapping("/testSendWxMessage") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "灏忕▼搴廼d", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "token", required = true), + }) + public ApiResponse testSendWxMessage(@RequestParam String openid,@RequestParam String token) { + SendWxMessage sendWxMessage = new SendWxMessage(); + sendWxMessage.testMessage(openid,token); return ApiResponse.success("鎿嶄綔鎴愬姛"); } - - @LoginRequired - @ApiOperation(value = "鍐呭鍠滄 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/likeContent") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), - @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), - }) - public ApiResponse likeContent(@RequestParam String id) { - getZhongTaiDataService.likeContent(getMemberId(),Constants.CUSTOMER,id); - return ApiResponse.success("鎿嶄綔鎴愬姛"); - } - - - @LoginRequired - @ApiOperation(value = "鍐呭鍒嗕韩 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/shareContent") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), - @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), - }) - public ApiResponse shareContent(@RequestParam String id) { - getZhongTaiDataService.shareContent(getMemberId(),Constants.CUSTOMER,id); - return ApiResponse.success("鎿嶄綔鎴愬姛"); - } - - - @LoginRequired - @ApiOperation(value = "鍐呭娴忚 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭") - @GetMapping("/viewContent") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), - @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true), - }) - public ApiResponse viewContent(@RequestParam String id) { - getZhongTaiDataService.viewContent(getMemberId(),Constants.CUSTOMER,id); - return ApiResponse.success("鎿嶄綔鎴愬姛"); - } - } -- Gitblit v1.9.3