From 80958793a4c8ddeba65cf0276b8ef7f597118cc8 Mon Sep 17 00:00:00 2001
From: LGH <1242479791@qq.com>
Date: Thu, 2 Apr 2020 09:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=A2=AB=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AE=A1=E7=AE=97=E8=BF=90=E8=B4=B9=E4=BB=8E=E8=80=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E8=BF=9B=E8=A1=8C=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TransportServiceImpl.java    | 47 ++++++++-----------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java
index 3ae8ef3..5229bf6 100644
--- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java
@@ -10,49 +10,37 @@
 
 package com.yami.shop.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.yami.shop.bean.model.Area;
-import com.yami.shop.bean.model.Transcity;
-import com.yami.shop.bean.model.TranscityFree;
-import com.yami.shop.bean.model.Transfee;
-import com.yami.shop.bean.model.TransfeeFree;
-import com.yami.shop.bean.model.Transport;
+import com.yami.shop.bean.model.*;
 import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.dao.TranscityMapper;
 import com.yami.shop.dao.TransfeeMapper;
 import com.yami.shop.dao.TransportMapper;
 import com.yami.shop.service.TransportService;
+import lombok.AllArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import cn.hutool.core.collection.CollectionUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *
  * @author lgh on 2018/11/16.
  */
 @Service
+@AllArgsConstructor
 public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport> implements TransportService {
 
-    @Autowired
-    private TransportMapper transportMapper;
+	private final TransportMapper transportMapper;
 
-    @Autowired
-    private TransfeeMapper transfeeMapper;
+	private final TransfeeMapper transfeeMapper;
 
-    @Autowired
-    private TranscityMapper transcityMapper;
-
-    @Autowired
-    private TransportService transportService;
+	private final TranscityMapper transcityMapper;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -73,7 +61,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 	@Transactional(rollbackFor = Exception.class)
 	@CacheEvict(cacheNames = "TransportAndAllItems", key = "#transport.transportId")
 	public void updateTransportAndTransfee(Transport transport) {
-		Transport dbTransport = transportService.getTransportAndAllItems(transport.getTransportId());
+		Transport dbTransport = getTransportAndAllItems(transport.getTransportId());
 
 		// 删除所有的运费项
 		transfeeMapper.deleteByTransportId(transport.getTransportId());
@@ -169,7 +157,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 
 
 		for (Long id : ids) {
-			Transport dbTransport = transportService.getTransportAndAllItems(id);
+			Transport dbTransport = getTransportAndAllItems(id);
 			List<Long> transfeeIds = dbTransport.getTransfees().stream().map(Transfee::getTransfeeId).collect(Collectors.toList());
 			// 删除所有运费项包含的城市
 			transcityMapper.deleteBatchByTransfeeIds(transfeeIds);
@@ -185,6 +173,9 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 	@Cacheable(cacheNames = "TransportAndAllItems", key = "#transportId")
 	public Transport getTransportAndAllItems(Long transportId) {
 		Transport transport = transportMapper.getTransportAndTransfeeAndTranscity(transportId);
+		if (transport == null) {
+			return null;
+		}
 		List<TransfeeFree> transfeeFrees = transportMapper.getTransfeeFreeAndTranscityFreeByTransportId(transportId);
 		transport.setTransfeeFrees(transfeeFrees);
 		return transport;