提交 02871dca authored 作者: huyufan's avatar huyufan

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into…

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into v6.5_transport_open_20231115 # Conflicts: # performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java
...@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc.transport; ...@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc.transport;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.clx.performance.component.ThirdComponent; import com.clx.performance.component.ThirdComponent;
import com.clx.performance.dao.OrderChildDao; import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.OrderGoodsDao; import com.clx.performance.dao.OrderGoodsDao;
...@@ -62,7 +63,7 @@ public class TransportSyncController { ...@@ -62,7 +63,7 @@ public class TransportSyncController {
String decrypt = ThirdComponent.decrypt(""); String decrypt = ThirdComponent.decrypt("");
log.info("payStatusNotify 解密后:{}", decrypt); log.info("payStatusNotify 解密后:{}", decrypt);
return Result.ok(ThirdComponent.encrypt("success")); return Result.ok(decrypt);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论