From 1be9f9fdb13f7c5cdcf29494cb72ced35cd7af10 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 16 七月 2024 22:18:04 +0800
Subject: [PATCH] 提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 0b00507..dc15110 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,13 @@
package com.doumee.api.web;
+import com.doumee.biz.system.SystemDictDataBiz;
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.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;
@@ -25,7 +27,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.InputStream;
/**
* Created by IntelliJ IDEA.
@@ -61,6 +66,8 @@
@Autowired
private CustomerUserService customerUserService;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -151,7 +158,7 @@
public ApiResponse saveRenovationCalculator(@RequestBody RenovationCalculatorDTO renovationCalculatorDTO) {
renovationCalculatorDTO.setMemberId(getMemberId());
CustomerLog customerLog =customerService.saveRenovationCalculator(renovationCalculatorDTO);
- zbomCRMService.dealCustomerLogData(customerLog);
+// zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -165,7 +172,7 @@
public ApiResponse saveFreeCustomizationApply(@RequestBody FreeCustomizationDTO freeCustomizationDTO) {
freeCustomizationDTO.setMemberId(getMemberId());
CustomerLog customerLog = customerService.saveFreeCustomizationApply(freeCustomizationDTO);
- zbomCRMService.dealCustomerLogData(customerLog);
+// zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -178,7 +185,7 @@
public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
testTrimStyleDTO.setMemberId(getMemberId());
CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
- zbomCRMService.dealCustomerLogData(customerLog);
+// zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -242,11 +249,32 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse testToken () {
- memberService.updWxMiniToken();
+ systemDictDataBiz.updWxMiniToken();
return ApiResponse.success("鏇存柊鎴愬姛");
}
+ @LoginRequired
+ @ApiOperation(value = "鑾峰彇鍒嗕韩灏忕▼搴忎簩缁寸爜锛堝浘鐗囨祦锛宨mg鏍囩src鎸囧畾锛�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/generateImg")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public void generateImg(HttpServletResponse response) {
+ try{
+ response.setHeader("Cache-Control", "no-store, no-cache");
+ response.setContentType("image/jpeg");
+ InputStream inputStream = Constants.generateWxMiniImgStream(
+ systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_TOKEN_CUSTOMER).getCode(),"123",""
+ );
+ ImageIO.write(ImageIO.read(inputStream),"png",response.getOutputStream());
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
}
--
Gitblit v1.9.3