陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderItem.java

@@ -368,6 +368,9 @@ public class OrderItem implements Serializable {
 	private String addressDetail;
 
 	@TableField(exist = false)
+	private List<OrderAddress> orderAddressList;
+
+	@TableField(exist = false)
 	private List<CommonFile> fileList;
 
 	@TableField(exist = false)
@@ -391,4 +394,7 @@ public class OrderItem implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal profit;
 
+	@TableField(exist = false)
+	private String source;
+
 }

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -40,8 +40,10 @@ import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.land.entity.Order;
+import org.springblade.land.entity.OrderAddress;
 import org.springblade.land.entity.OrderChange;
 import org.springblade.land.entity.OrderItem;
+import org.springblade.land.mapper.OrderAddressMapper;
 import org.springblade.land.mapper.OrderChangeMapper;
 import org.springblade.land.mapper.OrderItemMapper;
 import org.springblade.land.mapper.OrderMapper;
@@ -69,6 +71,8 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 
 	private final OrderChangeMapper orderChangeMapper;
 
+	private final OrderAddressMapper orderAddressMapper;
+
 	private final ICorpsDescClient corpsDescClient;
 
 	private final ILandDriverClient landDriverClient;
@@ -153,6 +157,15 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				BigDecimal c = record.getLandAmountC().add(record.getOneFeeC()).add(record.getTwoFeeC()).add(record.getThreeFeeC()).add(record.getFourFeeC()).add(record.getFiveFeeC());
 				record.setProfit(d.subtract(c));
 			}
+
+			// 手机端
+			if (StringUtil.isNotBlank(orderItem.getSource())) {
+				List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
+					.eq(OrderAddress::getOrderId, record.getOrderId())
+					.eq(OrderAddress::getIsDeleted, 0)
+				);
+				record.setOrderAddressList(orderAddressList);
+			}
 		});
 		return pages;
 	}