Commit 33ca3974 by ping.wu

Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of…

Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
parents 025ff020 2cab6da4
...@@ -629,7 +629,7 @@ public class OrderVerifyHandle { ...@@ -629,7 +629,7 @@ public class OrderVerifyHandle {
*/ */
private boolean checkSaasWm(OrderBeanV1 orderBean) { private boolean checkSaasWm(OrderBeanV1 orderBean) {
return 1 == orderBean.getOrderType() return 1 == orderBean.getOrderType()
&& OrderSourceV1.SAAS.getCode().equals(orderBean.getSource()) && (Objects.equals(OrderClientType.SAAS.getIndex().toString(),orderBean.getOrderClient()) || Objects.equals(OrderClientType.ALIPAY.getIndex().toString(),orderBean.getOrderClient()))
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType()); && THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType());
} }
private boolean verifyThirdFlow(OrderBeanV1 orderBean,OrderManagerRequest request) { private boolean verifyThirdFlow(OrderBeanV1 orderBean,OrderManagerRequest request) {
......
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