Commit 7c319713 by 周晓航

上生产 修改版本信息

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 99d40d8f
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.freemud.thirdparty.sdk</groupId> <groupId>com.freemud.thirdparty.sdk</groupId>
<artifactId>thirdparty-weichat-sdk</artifactId> <artifactId>thirdparty-weichat-sdk</artifactId>
<version>0.1-BETA</version> <version>1.0.0.RELEASE</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
...@@ -58,6 +58,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar ...@@ -58,6 +58,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.entities.v1.*; import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
import com.freemud.application.sdk.api.ordercenter.enums.*; import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq; import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
...@@ -4553,6 +4554,10 @@ public class OrderAdapter { ...@@ -4553,6 +4554,10 @@ public class OrderAdapter {
} }
} else { } else {
refundStatusDesc = Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())).map(RefundStatus::getDesc).orElse(""); refundStatusDesc = Optional.ofNullable(RefundStatus.getByCode(refundBean.getStatus())).map(RefundStatus::getDesc).orElse("");
if (Objects.equals(orderBean.getStatus(), OrderStatus.CALCEL.getCode()) || Objects.equals(orderBean.getStatusV2(), OrderStatusV1.CLOSED.getV2Code())) {
// 表示订单超时自动取消, 修改提示语
refundStatusDesc = "超时未支付关闭订单";
}
} }
return refundStatusDesc; return refundStatusDesc;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment