From 90b875e67b03c516390a79347e1de366644a969c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 15 Apr 2025 17:20:07 +0800 Subject: [PATCH] feat:POS --- .../com/cool/store/service/PushService.java | 1 + .../store/service/impl/PushServiceImpl.java | 20 +++++++++---------- .../controller/webb/PCTestController.java | 12 ++--------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java index d67ad77ad..a1589df57 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PushService.java @@ -58,6 +58,7 @@ public interface PushService { */ String getPosToken(GetAccessTokenDTO dto); + List getXgjOrganization(String parentId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index c3ce425fe..8c2d3d85c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import okhttp3.*; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -28,6 +29,7 @@ import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -142,6 +144,7 @@ public class PushServiceImpl implements PushService { return executeApiCall(apiUrl, dto, String.class, username, secret); } + @Override public List getXgjOrganization(String parentId) { String key = active+"_XgjOrganization_" + eid; @@ -271,16 +274,17 @@ public class PushServiceImpl implements PushService { RequestBody body = RequestBody.create(MediaType.parse("application/json"), JSONObject.toJSONString(requestBody) ); - - return new Request.Builder() + Request.Builder builder = new Request.Builder() .url(url) .post(body) .addHeader("Content-Type", "application/json") .addHeader("Accept", "application/json") .addHeader("x-Date", authHeaders.get("x-Date")) - .addHeader("Digest", authHeaders.get("Digest")) - .addHeader("Authorization", authHeaders.get("Authorization")) - .build(); + .addHeader("Digest", authHeaders.get("Digest")); + if (!url.contains("get-token-byshopcode")){ + builder.addHeader("Authorization", authHeaders.get("Authorization")); + } + return builder.build(); } catch (Exception e) { throw new ServiceException(ErrorCodeEnum.THIRD_API_SIGN_ERROR); } @@ -334,12 +338,6 @@ public class PushServiceImpl implements PushService { private Request buildGetRequest(String url, String username, String secret) { try { -// Map authHeaders = HmacSigner.generateHeaders( -// username, secret,null); - -// log.debug("签名生成 - 签名结果: {}", JSONObject.toJSONString(authHeaders)); - - return new Request.Builder() .url(url) .get() diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index 7fc943b20..5c2875571 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -1,14 +1,11 @@ package com.cool.store.controller.webb; -import com.alibaba.fastjson.JSONObject; -import com.cool.store.constants.CommonConstants; import com.cool.store.dao.*; import com.cool.store.dto.GetAccessTokenDTO; import com.cool.store.dto.ModifyPasswordDTO; import com.cool.store.entity.*; import com.cool.store.enums.DownSystemTypeEnum; import com.cool.store.enums.MessageEnum; -import com.cool.store.enums.QWMessageEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.job.XxlJobHandler; import com.cool.store.mq.util.HttpRestTemplateService; @@ -16,7 +13,6 @@ import com.cool.store.request.GetPasswordDTO; import com.cool.store.request.bigdata.ProfitDataRequest; import com.cool.store.request.huoma.ShopBasicInfoRequest; import com.cool.store.request.oppty.*; -import com.cool.store.request.xfsgFirstOrderListRequest; import com.cool.store.response.ResponseResult; import com.cool.store.response.bigdata.ActDataResponse; import com.cool.store.response.bigdata.ProfitDataResponse; @@ -25,17 +21,11 @@ import com.cool.store.response.huoma.ShopBaseInfoResponse; import com.cool.store.response.oppty.CityResponse; import com.cool.store.response.oppty.OpportunityDetailResponse; import com.cool.store.response.oppty.OpportunityInfoPageResponse; -import com.cool.store.response.oppty.OpportunityInfoResponse; -import com.cool.store.response.xfsgFirstOderListResponse; import com.cool.store.service.*; import com.cool.store.service.impl.CommonService; -import com.google.gson.JsonObject; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -288,6 +278,8 @@ public class PCTestController { return ResponseResult.success(pushService.getPosToken(dto)); } + + @ApiOperation("获取加密子串") @PostMapping("/getEncryptedSubstring") public ResponseResult getEncryptedSubstring(@RequestBody GetPasswordDTO dto) {