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

c5371b1e · 周晓航 · 0c8b163c · 29828c54 · c5371b1e
Commit c5371b1e authored Jun 25, 2021 by 周晓航
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -1343,6 +1343,8 @@ public class OrderServiceImpl implements Orderservice {
                queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
            }

+        }else {
+            queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
        }
    }