Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
ba02b860
提交
ba02b860
authored
10月 19, 2023
作者:
liruixin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除之前的sdk
上级
c1494636
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
3 行增加
和
200 行删除
+3
-200
OrderGoodsFeignController.java
...rformance/controller/feign/OrderGoodsFeignController.java
+0
-1
ThirdPartyController.java
.../clx/performance/controller/sdk/ThirdPartyController.java
+0
-40
EncryptService.java
.../com/clx/performance/extranal/encrypt/EncryptService.java
+0
-14
EncryptServiceImpl.java
...performance/extranal/encrypt/impl/EncryptServiceImpl.java
+0
-49
OrderChildDtsListener.java
...a/com/clx/performance/listener/OrderChildDtsListener.java
+3
-6
ThirdSettlementOwnerServiceImpl.java
...ce/impl/settle/third/ThirdSettlementOwnerServiceImpl.java
+0
-77
ThirdSettlementOwnerService.java
...nce/service/settle/third/ThirdSettlementOwnerService.java
+0
-13
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java
浏览文件 @
ba02b860
package
com
.
clx
.
performance
.
controller
.
feign
;
import
com.clx.performance.service.OrderChildService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.vo.feign.OrderGoodsFeignVO
;
import
io.swagger.annotations.Api
;
...
...
performance-web/src/main/java/com/clx/performance/controller/sdk/ThirdPartyController.java
deleted
100644 → 0
浏览文件 @
c1494636
//package com.clx.performance.controller.sdk;
//
//import com.alibaba.fastjson.JSON;
//import com.clx.performance.sdk.constant.ActionConstants;
//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
//import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
//import com.msl.common.dto.HttpDTO;
//import com.msl.common.result.Result;
//import io.swagger.annotations.Api;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import javax.servlet.http.HttpServletRequest;
//import java.util.Objects;
//
//import static org.bouncycastle.cms.CMSSignedGenerator.DATA;
//
//@Api(tags = "第三方")
//@RestController
//@RequestMapping("/encrypt/third")
//@Slf4j
//@AllArgsConstructor
//public class ThirdPartyController {
//
// private final ThirdSettlementOwnerService thirdSettlementOwnerService;
//
//
// @PostMapping("/doAction")
// public Object doAction(HttpServletRequest request) {
// HttpDTO httpDTO = (HttpDTO) request.getAttribute(DATA);
// String action = httpDTO.getAction();
// if (Objects.equals(action, ActionConstants.PAYMENT_SETTLEMENT)) {
// thirdSettlementOwnerService.updateThirdPaymentSettlement(JSON.parseObject(httpDTO.getData(), PaymentSettlementAction.class));
// }
// return Result.ok();
// }
//}
performance-web/src/main/java/com/clx/performance/extranal/encrypt/EncryptService.java
deleted
100644 → 0
浏览文件 @
c1494636
package
com
.
clx
.
performance
.
extranal
.
encrypt
;
import
com.msl.common.result.Result
;
public
interface
EncryptService
{
/**
* @Author kavin
* @Description 加密请求
* @Param [appId, secret, url, param, action]
* @return
**/
Result
<?>
encryptPost
(
String
appId
,
String
secret
,
String
url
,
String
param
,
String
action
);
}
performance-web/src/main/java/com/clx/performance/extranal/encrypt/impl/EncryptServiceImpl.java
deleted
100644 → 0
浏览文件 @
c1494636
package
com
.
clx
.
performance
.
extranal
.
encrypt
.
impl
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.clx.performance.extranal.encrypt.EncryptService
;
import
com.google.gson.Gson
;
import
com.msl.common.dto.HttpDTO
;
import
com.msl.common.exception.ServiceSystemException
;
import
com.msl.common.result.Result
;
import
com.msl.common.utils.EncryptUtil
;
import
com.msl.common.utils.HttpUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.stereotype.Service
;
import
java.security.GeneralSecurityException
;
import
static
com
.
clx
.
user
.
enums
.
result
.
UserResultEnum
.
HTTP_ERROR
;
@Service
@Slf4j
public
class
EncryptServiceImpl
implements
EncryptService
{
@Override
public
Result
<?>
encryptPost
(
String
appId
,
String
secret
,
String
url
,
String
param
,
String
action
)
{
log
.
info
(
"开始请求交易平台接口,请求action:{},请求参数:{}"
,
action
,
param
);
try
{
HttpDTO
httpDTO
=
EncryptUtil
.
buildDTO
(
appId
,
param
,
secret
,
System
.
currentTimeMillis
());
httpDTO
.
setAction
(
action
);
return
HttpUtil
.
post
(
url
,
null
,
httpDTO
)
.
map
(
r
->
JSON
.
parseObject
(
r
,
new
TypeReference
<
HttpDTO
>()
{
}))
.
peek
(
dto
->
log
.
info
(
"http请求返回------dto->{}"
,
dto
))
.
map
(
HttpDTO:
:
getData
)
.
mapTry
(
d
->
EncryptUtil
.
decrypt
(
d
,
secret
))
.
mapWithObj
(
new
TypeReference
<
Result
<
Object
>>()
{
},
this
::
covertResult
)
.
orElseThrow
(
HTTP_ERROR
);
}
catch
(
GeneralSecurityException
e
)
{
log
.
error
(
"解密失败"
,
e
);
throw
new
ServiceSystemException
(
HTTP_ERROR
);
}
}
private
<
T
>
Result
<
T
>
covertResult
(
String
result
,
TypeReference
<
Result
<
T
>>
reference
)
{
return
new
Gson
().
fromJson
(
result
,
reference
.
getType
());
}
}
performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
浏览文件 @
ba02b860
...
...
@@ -6,7 +6,6 @@ import com.clx.performance.constant.RabbitKeyConstants;
import
com.clx.performance.dto.dts.DataTransportDTO
;
import
com.clx.performance.enums.DtsOperationTypeEnum
;
import
com.clx.performance.enums.OrderChildEnum
;
import
com.clx.performance.extranal.encrypt.EncryptService
;
import
com.msl.common.utils.DtsMapConvertUtil
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -22,8 +21,6 @@ import java.util.Objects;
@AllArgsConstructor
public
class
OrderChildDtsListener
{
private
final
EncryptService
encryptService
;
@RabbitListener
(
queues
=
RabbitKeyConstants
.
CLX_PERFORMANCE_ORDER_CHILD_QUEUE
)
public
void
onMessage
(
Message
message
)
{
...
...
@@ -39,17 +36,17 @@ public class OrderChildDtsListener {
if
(
Objects
.
equals
(
DtsOperationTypeEnum
.
INSERT
.
getCode
(),
dataTransportDTO
.
getOperationType
().
getCode
())){
//同步after数据
log
.
info
(
"新增:{}"
+
after
);
//encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
}
else
if
(
Objects
.
equals
(
DtsOperationTypeEnum
.
UPDATE
.
getCode
(),
dataTransportDTO
.
getOperationType
().
getCode
())){
if
(
OrderChildEnum
.
SYNC_STATUS_lIST
.
contains
(
after
.
getStatus
())
&&
!
Objects
.
equals
(
before
.
getStatus
(),
after
.
getStatus
())){
//同步after数据
log
.
info
(
"修改:{}"
+
after
);
//encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(after),after.topic());
}
}
else
if
(
Objects
.
equals
(
DtsOperationTypeEnum
.
DELETE
.
getCode
(),
dataTransportDTO
.
getOperationType
().
getCode
())){
//数据删除
log
.
info
(
"删除:{}"
+
before
);
//encryptService.encryptPost(APP_ID,APP_SECRET,ORDER_CHILD_INFO_SYNC_URL,JSON.toJSONString(before),before.topic());
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/third/ThirdSettlementOwnerServiceImpl.java
deleted
100644 → 0
浏览文件 @
c1494636
//package com.clx.performance.service.impl.settle.third;
//
//import com.clx.performance.dao.settle.SettlementLogDao;
//import com.clx.performance.dao.settle.SettlementOwnerDao;
//import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
//import com.clx.performance.enums.OrderChildLogEnum;
//import com.clx.performance.enums.PerformanceResultEnum;
//import com.clx.performance.enums.settle.SettlementLogEnum;
//import com.clx.performance.enums.settle.SettlementOwnerEnum;
//import com.clx.performance.model.settle.SettlementOwner;
//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
//import com.clx.performance.service.OwnerAccountService;
//import com.clx.performance.service.settle.SettlementLogService;
//import com.clx.performance.service.settle.third.ThirdSettlementOwnerService;
//import com.clx.performance.struct.settle.SettlementLogStruct;
//import com.clx.performance.struct.settle.SettlementOwnerStruct;
//import com.msl.common.exception.ServiceSystemException;
//import com.msl.user.data.UserSessionData;
//import com.msl.user.utils.TokenUtil;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Service;
//
//import java.util.Objects;
//
///**
// * @author liruixin
// * Date 2023-10-12
// * Time 09:43
// */
//@Slf4j
//@Service
//@AllArgsConstructor
//public class ThirdSettlementOwnerServiceImpl implements ThirdSettlementOwnerService {
//
// private final SettlementOwnerDao settlementOwnerDao;
//
// private final SettlementOwnerStruct settlementOwnerStruct;
//
// private final SettlementLogDao settlementLogDao;
//
// private final SettlementLogStruct settlementLogStruct;
//
// private final SettlementPlatformAccountDao settlementPlatformAccountDao;
//
// private final SettlementLogService settlementLogService;
//
// private final OwnerAccountService ownerAccountService;
//
// @Override
// public void updateThirdPaymentSettlement(PaymentSettlementAction param) {
// //结算单详情
// SettlementOwner settlementOwner =settlementOwnerDao.selectBySettlementNo(param.getSettlementNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
//
// //状态判断
// if(!Objects.equals(settlementOwner.getStatus(), SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode())){
// throw new ServiceSystemException(PerformanceResultEnum.SETTLEMENT_ORDER_STATUS_CHANGED);
// }
//
// String settlementNo = settlementOwner.getSettlementNo();
// //更新状态为平台确认货主付款
// SettlementOwner settlement = SettlementOwner.builder().payee(param.getPayee()).payeeBankCardNo(param.getPayeeBankCardNo())
// .payeeBankName(param.getPayeeBankName()).paymentBankCardNo(param.getPaymentBankCardNo())
// .paymentBankName(param.getPaymentBankName()).paymentImg(param.getPaymentImg())
// .settlementNo(settlementOwner.getSettlementNo())
// .status(SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode()).build();
// settlementOwnerDao.updatePayment(settlement);
//
// UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
// //保存结算单日志
// settlementLogService.saveSettlementLog(settlementNo,
// SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getCode(),SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getMsg(),
// OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
// }
//
//
//}
performance-web/src/main/java/com/clx/performance/service/settle/third/ThirdSettlementOwnerService.java
deleted
100644 → 0
浏览文件 @
c1494636
//package com.clx.performance.service.settle.third;
//
//import com.clx.performance.sdk.request.action.PaymentSettlementAction;
//
///**
// * @author liruixin
// * Date 2023-10-12
// * Time 09:43
// */
//public interface ThirdSettlementOwnerService {
//
// void updateThirdPaymentSettlement(PaymentSettlementAction action);
//}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论