From f57cbfa78ff65aefdd2a013172b57aefb8e148d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 17 Apr 2025 16:45:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E4=BA=91=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 70900f85c..507ba18c7 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -110,7 +110,11 @@ xgj.api.auth.username=6446346061e043e392dd53c9c8d1af0b xgj.api.auth.secret=3ba6e4c5632547b8b2b3acefe08667bb #云流水账号 -yls.api.auth.url=http://scm330-test.366ec.net +#yls.api.auth.url=http://scm330-test.366ec.net +#yls.api.auth.username=096d4009072c927c +#yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6 + +yls.api.auth.url=http://yuanguiwuliu.com yls.api.auth.username=096d4009072c927c yls.api.auth.secret=3b56198f096d4009072c927c96fbc8b6 From 7bd4f2503d4c98e71e3aaba33588c8cc9543b349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 17 Apr 2025 16:48:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E4=BA=91=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PushServiceImpl.java | 6 ++---- .../cool/store/service/impl/ThirdBigDataServiceImpl.java | 3 +-- .../com/cool/store/service/impl/ThirdHuoMaServiceImpl.java | 3 +-- .../store/service/impl/ThirdOpportunityServiceImpl.java | 3 +-- .../src/main/resources/application.properties | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) 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 0c58e4c83..43896e2f2 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 @@ -199,8 +199,7 @@ public class PushServiceImpl implements PushService { OpportunityApiResponse apiResponse = objectMapper.readValue(responseBody, javaType); if (apiResponse.getCode() != 200) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, - "业务逻辑错误: " + apiResponse.getMsg()); + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,apiResponse.getMsg()); } return apiResponse.getData(); } @@ -320,8 +319,7 @@ public class PushServiceImpl implements PushService { XgjBaseResponse apiResponse = objectMapper.readValue(responseBody, javaType); if (apiResponse.getRetCode() != 200) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, - "业务逻辑错误: " + apiResponse.getRetMsg()); + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,apiResponse.getRetMsg()); } return apiResponse.getRetData(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java index e4dc343ce..ee6331d45 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java @@ -123,8 +123,7 @@ public class ThirdBigDataServiceImpl implements ThirdBigDataService { OpportunityApiResponse apiResponse = objectMapper.readValue(responseBody, javaType); if (apiResponse.getCode() != 0) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, - "业务逻辑错误: " + apiResponse.getMsg()); + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, apiResponse.getMsg()); } return apiResponse.getData(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java index f2dccfc55..e782f319b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java @@ -112,8 +112,7 @@ public class ThirdHuoMaServiceImpl implements HuoMaService { OpportunityApiResponse apiResponse = objectMapper.readValue(responseBody, javaType); if (apiResponse.getCode() != 200) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, - "业务逻辑错误: " + apiResponse.getMsg()); + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,apiResponse.getMsg()); } return apiResponse.getData(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdOpportunityServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdOpportunityServiceImpl.java index ea62088b3..fa5019c32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdOpportunityServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdOpportunityServiceImpl.java @@ -123,8 +123,7 @@ public class ThirdOpportunityServiceImpl implements ThirdOpportunityService { OpportunityApiResponse apiResponse = objectMapper.readValue(responseBody, javaType); if (apiResponse.getCode() != 200) { - throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, - "业务逻辑错误: " + apiResponse.getMsg()); + throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,apiResponse.getMsg()); } return apiResponse.getData(); diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 81fd7fbd4..9df1c53c8 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=zxjp-web -spring.profiles.active=@profileActive@ +spring.profiles.active=test server.port=40300 server.servlet.context-path=/zxjp From d1fb8d99ff9d22cf65b9e88ea24b1a44f5aba981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 17 Apr 2025 16:49:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=BA=91=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coolstore-partner-web/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 9df1c53c8..81fd7fbd4 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=zxjp-web -spring.profiles.active=test +spring.profiles.active=@profileActive@ server.port=40300 server.servlet.context-path=/zxjp From 51207f3df2719697ea0248b4ef4dfb85769126a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 17 Apr 2025 16:56:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=E4=BA=91=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/OldShopDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java index 2487db6fc..27a6dc3eb 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java @@ -35,7 +35,7 @@ public class OldShopDAO { return null; } Example example = new Example(OldShopDO.class); - example.createCriteria().andEqualTo("ylsShopCode", code); + example.createCriteria().andEqualTo("shopCode", code); example.setOrderByClause("id ASC LIMIT 1"); List list = oldShopMapper.selectByExample(example); return list.isEmpty() ? null : list.get(0);