소스 검색

星闪豹支付改动

wangming 1 주 전
부모
커밋
dc3f607c21
1개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 6 2
      yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

+ 6 - 2
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -890,8 +890,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 List<OrderItem> orderItems = orderItemMapper.getListByOrderNumber(c.getOrderNumber());
                 c.setOrderItems(orderItems);
                 c.setGoodsTotalCount(orderItems.stream().map(OrderItem::getProdCount).reduce(0, Integer::sum));
-                c.setReceiver(c.getConsigneeName());
-                c.setUserMobile(c.getConsigneeMobile());
+                if (c.getReceiver() == null){
+                    c.setReceiver(c.getConsigneeName());
+                }
+                if (c.getUserMobile() == null){
+                    c.setUserMobile(c.getConsigneeMobile());
+                }
             });
         }
         return page;