Skip to content

O
order-group
Commit af52a4ea by xiaoer.li
Options

Merge remote-tracking branch 'remotes/origin/feature/switch' into qa

parents 49e17a28 deff5416
Showing with 3 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -3452,10 +3452,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3452,10 +3452,11 @@ public class OrderServiceImpl implements Orderservice {
query = svcComPayClient.query(requestDto); query = svcComPayClient.query(requestDto);
if (query!=null) break; if (query!=null) break;
} }
log.info("order checkSvcComPay:{}",JSON.toJSONString(query));
if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) { if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
return false; return false;
} }
if (partnerId.equals(query.getResult().getValue())) { if (query.getResult()!=null && query.getResult().getValue()) {
return true; return true;
} }
else { else {
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -2115,7 +2115,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2115,7 +2115,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) { if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
return false; return false;
} }
if (partnerId.equals(query.getResult().getValue())) { if (query.getResult()!=null && query.getResult().getValue()) {
return true; return true;
} }
else { else {
......
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