Skip to content

O
order-group
Commit 9c787453 by 周晓航
Options

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

parents 30efb32d 6e4b48ac
Showing with 5 additions and 5 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -1341,15 +1341,15 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1341,15 +1341,15 @@ public class OrderServiceImpl implements Orderservice {
} }
queryOrderResponseVo.setNewPayGift(result.getNewPayGift()); queryOrderResponseVo.setNewPayGift(result.getNewPayGift());
// 造假数据 fisherman // 造假数据 fisherman
if (CollectionUtils.isEmpty(result.getNewPayGift())) { //if (CollectionUtils.isEmpty(result.getNewPayGift())) {
queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData()); // queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
} //}
}else { }else {
queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData()); // queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
} }
}catch (Exception e){ }catch (Exception e){
queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData()); //queryOrderResponseVo.setNewPayGift(new DemoDataMsg().getDemoData());
} }
} }
......
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