suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
shuo.wang
2025-04-17 17:07:05 +08:00
parent 7c638677bb 51207f3df2
commit f3ec2c1939
6 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java
View File

@@ -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<OldShopDO> list = oldShopMapper.selectByExample(example);
return list.isEmpty() ? null : list.get(0);

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
View File

@@ -199,8 +199,7 @@ public class PushServiceImpl implements PushService {
OpportunityApiResponse<T> 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<T> 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();

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdBigDataServiceImpl.java
View File

@@ -123,8 +123,7 @@ public class ThirdBigDataServiceImpl implements ThirdBigDataService {
OpportunityApiResponse<T> 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();

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdHuoMaServiceImpl.java
View File

@@ -112,8 +112,7 @@ public class ThirdHuoMaServiceImpl implements HuoMaService {
OpportunityApiResponse<T> 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();

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdOpportunityServiceImpl.java
View File

@@ -123,8 +123,7 @@ public class ThirdOpportunityServiceImpl implements ThirdOpportunityService {
OpportunityApiResponse<T> 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();

6
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -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