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

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3452,10 +3452,11 @@ public class OrderServiceImpl implements Orderservice {
             query = svcComPayClient.query(requestDto);
             if (query!=null) break;
         }
+        log.info("order checkSvcComPay:{}",JSON.toJSONString(query));
         if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
             return false;
         }
-        if (partnerId.equals(query.getResult().getValue())) {
+        if (query.getResult()!=null && query.getResult().getValue()) {
             return true;
         }
         else {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -2115,7 +2115,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (query==null || !ResponseResult.SUCCESS.getCode().equals(query.getCode())) {
             return false;
         }
-        if (partnerId.equals(query.getResult().getValue())) {
+        if (query.getResult()!=null && query.getResult().getValue()) {
             return true;
         }
         else {