From a4e9550ac1f85466799b370aa6ce1a70eb873d4f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 15 七月 2024 12:10:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 3dbee62..3c9c591 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
@@ -1,11 +1,12 @@
package com.doumee.api.web;
+import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.Member;
-import com.doumee.dao.web.reqeust.EditMemberRequest;
-import com.doumee.dao.web.reqeust.WxPhoneRequest;
+import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
import com.doumee.service.business.BjParamService;
@@ -16,6 +17,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -44,6 +46,8 @@
@Autowired
private CustomerService customerService;
+ @Autowired
+ private ZbomCRMService zbomCRMService;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -94,8 +98,53 @@
}
+ @LoginRequired
+ @ApiOperation(value = "瑁呬慨璁＄畻鍣ㄤ俊鎭瓨鍌�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveRenovationCalculator")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveRenovationCalculator(@RequestBody RenovationCalculatorDTO renovationCalculatorDTO) {
+ renovationCalculatorDTO.setMemberId(getMemberId());
+ CustomerLog customerLog =customerService.saveRenovationCalculator(renovationCalculatorDTO);
+ zbomCRMService.dealCustomerLogData(customerLog);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+ @LoginRequired
+ @ApiOperation(value = "0鍏冨畾鍒朵俊鎭�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveFreeCustomizationApply")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveFreeCustomizationApply(@RequestBody FreeCustomizationDTO freeCustomizationDTO) {
+ freeCustomizationDTO.setMemberId(getMemberId());
+ CustomerLog customerLog = customerService.saveFreeCustomizationApply(freeCustomizationDTO);
+ zbomCRMService.dealCustomerLogData(customerLog);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "娴嬭瘯瑁呬慨椋庢牸", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/saveTestTrimStyle")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
+ testTrimStyleDTO.setMemberId(getMemberId());
+ CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
+ zbomCRMService.dealCustomerLogData(customerLog);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/logOff")
+ public ApiResponse logOff() {
+ memberService.logOff(getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
}
--
Gitblit v1.9.3