Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa

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

@@ -1341,15 +1341,15 @@ public class OrderServiceImpl implements Orderservice {
                 }
                 queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
                 // 造假数据 fisherman
-                if (CollectionUtils.isEmpty(result.getNewPayGift())) {
-                    queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
-                }
+                //if (CollectionUtils.isEmpty(result.getNewPayGift())) {
+                //    queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+                //}
 
             }else {
-                queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+               // queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
             }
         }catch (Exception e){
-            queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
+            //queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
         }
 
     }