2023年8月9日18:51:56

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxItemController.java

@@ -26,6 +26,8 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.box.tube.entity.TradingBox;
+import org.springblade.box.tube.entity.TradingBoxFiles;
+import org.springblade.box.tube.service.ITradingBoxFilesService;
 import org.springblade.common.annotation.RepeatSubmit;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -57,6 +59,8 @@ public class TradingBoxItemController extends BladeController {
 
 	private final ITradingBoxItemService tradingBoxItemService;
 
+	private final ITradingBoxFilesService tradingBoxFilesService;
+
 	/**
 	 * 详情
 	 */
@@ -184,6 +188,30 @@ public class TradingBoxItemController extends BladeController {
 			tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
 			tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
 		}
+		//明细图片
+		List<TradingBoxFiles> tradingBoxItemFilesList = tradingBoxItem.getTradingBoxFilesList();
+		if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && tradingBoxItemFilesList.size() > 0) {
+			for (TradingBoxFiles tradingBoxFiles : tradingBoxItemFilesList) {
+				if (tradingBoxFiles.getId() == null) {
+					tradingBoxFiles.setCreateUser(AuthUtil.getUserId());
+					tradingBoxFiles.setCreateTime(new Date());
+					tradingBoxFiles.setTenantId(AuthUtil.getTenantId());
+					tradingBoxFiles.setPid(tradingBoxItem.getId());
+					tradingBoxFiles.setType("2");
+					tradingBoxFiles.setFileName(tradingBoxFiles.getLabel());
+					tradingBoxFiles.setUrl(tradingBoxFiles.getValue());
+				} else {
+					tradingBoxFiles.setUpdateUser(AuthUtil.getUserId());
+					tradingBoxFiles.setUpdateTime(new Date());
+					tradingBoxFiles.setPid(tradingBoxItem.getId());
+					tradingBoxFiles.setType("2");
+					tradingBoxFiles.setFileName(tradingBoxFiles.getLabel());
+					tradingBoxFiles.setUrl(tradingBoxFiles.getValue());
+				}
+			}
+			tradingBoxFilesService.saveOrUpdateBatch(tradingBoxItemFilesList);
+			tradingBoxItem.setTradingBoxFilesList(tradingBoxItemFilesList);
+		}
 		return R.status(tradingBoxItemService.saveOrUpdate(tradingBoxItem));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportItemController.java

@@ -111,7 +111,7 @@ public class TransportItemController extends BladeController {
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入transportItem")
-	@RepeatSubmit
+//	@RepeatSubmit
 	public R submit(@Valid @RequestBody TransportItem transportItem) {
 		if (transportItem.getId() == null){
 			transportItem.setCreateUser(AuthUtil.getUserId());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/ITradingBoxFeesService.java

@@ -38,4 +38,5 @@ public interface ITradingBoxFeesService extends IService<TradingBoxFees> {
 	 */
 	IPage<TradingBoxFeesVO> selectTradingBoxFeesPage(IPage<TradingBoxFeesVO> page, TradingBoxFeesVO tradingBoxFees);
 
+    void submitPay(Long id);
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/ITransportItemFeesService.java

@@ -38,4 +38,5 @@ public interface ITransportItemFeesService extends IService<TransportItemFees> {
 	 */
 	IPage<TransportItemFeesVO> selectTransportItemFeesPage(IPage<TransportItemFeesVO> page, TransportItemFeesVO transportItemFees);
 
+    void submitPay(Long id);
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxFeesServiceImpl.java

@@ -38,4 +38,9 @@ public class TradingBoxFeesServiceImpl extends ServiceImpl<TradingBoxFeesMapper,
 		return page.setRecords(baseMapper.selectTradingBoxFeesPage(page, tradingBoxFees));
 	}
 
+	@Override
+	public void submitPay(Long id) {
+		baseMapper.submitPay(id);
+	}
+
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -17,7 +17,6 @@
 package org.springblade.box.tube.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -28,8 +27,8 @@ import lombok.AllArgsConstructor;
 import org.springblade.box.tube.dto.TradingBoxItemRentExcelEnter;
 import org.springblade.box.tube.entity.*;
 import org.springblade.box.tube.mapper.*;
-import org.springblade.box.tube.ocean.entity.ShippingBill;
-import org.springblade.box.tube.ocean.entity.ShippingFees;
+import org.springblade.box.tube.service.ITradingBoxFeesService;
+import org.springblade.box.tube.service.ITradingBoxItemService;
 import org.springblade.box.tube.service.ITradingBoxService;
 import org.springblade.box.tube.service.ITransferService;
 import org.springblade.box.tube.vo.TradingBoxVO;
@@ -72,11 +71,11 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, TradingBox> implements ITradingBoxService {
 
-	private final TradingBoxFeesMapper tradingBoxFeesMapper;
+	private final ITradingBoxFeesService tradingBoxFeesService;
 
 	private final ITransferService transferService;
 
-	private final TradingBoxItemMapper tradingBoxItemMapper;
+	private final ITradingBoxItemService tradingBoxItemService;
 
 	private final TradingBoxFilesMapper tradingBoxFilesMapper;
 
@@ -106,9 +105,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 
 	private final IPortClient portClient;
 
-	private final RedisTemplate<String, Object> redisTemplate;
-	private IRedisClient redisClient;
-
 	private final TransportItemFeesMapper transportItemFeesMapper;
 
 	private final TransportMapper transportMapper;
@@ -126,48 +122,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		TradingBox details = baseMapper.selectById(tradingBox.getId());
 		if (ObjectUtils.isNotNull(details)) {
 			details.setTradingBoxItemsList(new ArrayList<>());
-			//获取明细信息
-			/*
-			LambdaQueryWrapper<TradingBoxItem> tradingBoxItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			tradingBoxItemLambdaQueryWrapper.eq(TradingBoxItem::getIsDeleted, 0)
-				.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
-				.eq(TradingBoxItem::getPid, details.getId())
-				.orderByDesc(TradingBoxItem::getCreateTime);
-			List<TradingBoxItem> tradingBoxItemList = tradingBoxItemMapper.selectList(tradingBoxItemLambdaQueryWrapper);
-			details.setTradingBoxItemsList(tradingBoxItemList);
-			//商品
-			List<FeesDesc> feesDescList = new ArrayList<>();
-			feesDescList = castToList(redisTemplate.opsForValue().get("feeName"), FeesDesc.class);
-			if (feesDescList.size() == 0) {
-				redisClient.basicData("feeName");
-				feesDescList = castToList(redisTemplate.opsForValue().get("feeName"), FeesDesc.class);
-			}
-			//获取费用信息
-			LambdaQueryWrapper<TradingBoxFees> tradingBoxFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIsDeleted, 0)
-				.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId())
-				.eq(TradingBoxFees::getPid, details.getId())
-				.orderByDesc(TradingBoxFees::getCreateTime);
-			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
-			for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
-				//品名
-				FeesDesc feesDesc = feesDescList.stream().filter(e -> e.getId().equals(tradingBoxFees.getItemId())).findFirst().orElse(null);
-				if (ObjectUtils.isNotNull(feesDesc)) {
-					tradingBoxFees.setItemName(feesDesc.getCname());
-				} else {
-					R<FeesDesc> r = feesDescClient.detail(tradingBoxFees.getItemId());
-					if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-						tradingBoxFees.setItemName(r.getData().getCname());
-					}
-				}
-				CorpsDesc corpsDesc = corpsDescClient.getCorpId(tradingBoxFees.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)) {
-					tradingBoxFees.setCorpName(corpsDesc.getCname());
-				}
-			}
-			details.setTradingBoxFeesList(tradingBoxFeesList);*/
 			details.setTradingBoxFeesList(new ArrayList<>());
-			//获取附件信息
 			LambdaQueryWrapper<TradingBoxFiles> tradingBoxFilesLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			tradingBoxFilesLambdaQueryWrapper.eq(TradingBoxFiles::getIsDeleted, 0)
 				.eq(TradingBoxFiles::getTenantId, AuthUtil.getTenantId())
@@ -222,7 +177,12 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			baseMapper.updateById(tradingBox);
 		}
 		//明细数据
-		List<TradingBoxItem> tradingBoxItemList = tradingBox.getTradingBoxItemsList();
+		LambdaQueryWrapper<TradingBoxItem> tradingBoxItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		tradingBoxItemLambdaQueryWrapper.eq(TradingBoxItem::getIsDeleted, 0)
+			.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
+			.eq(TradingBoxItem::getPid, tradingBox.getId())
+			.orderByDesc(TradingBoxItem::getCreateTime);
+		List<TradingBoxItem> tradingBoxItemList = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(tradingBoxItemList) && tradingBoxItemList.size() > 0) {
 			tradingBox.setTotalAmount(tradingBoxItemList.stream().map(TradingBoxItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			//箱号拼接字符串
@@ -248,10 +208,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				if ("BUY".equals(tradingBox.getType())) {
 					tradingBoxItem.setBoxSource("购买");
 					tradingBoxItem.setStatus("待使用");
-					/*if (archivesMapper.selectCount(new LambdaQueryWrapper<Archives>()
-						.eq(Archives::getCode, tradingBoxItem.getCode())) > 0) {
-						throw new RuntimeException("箱号："+tradingBoxItem.getCode()+"已存在，操作失败!");
-					}*/
 				} else {
 					if (tradingBoxItem.getBoxSource().equals("购买")) {
 						tradingBoxItem.setStatus("卖出");
@@ -259,50 +215,17 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 						tradingBoxItem.setStatus("退租");
 					}
 				}
-				if (tradingBoxItem.getId() == null) {
-					tradingBoxItem.setCreateUser(AuthUtil.getUserId());
-					tradingBoxItem.setCreateTime(new Date());
-					tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
-					tradingBoxItem.setTenantId(AuthUtil.getTenantId());
-					tradingBoxItem.setPid(tradingBox.getId());
-					tradingBoxItem.setStackingStatus("未堆存");
-					tradingBoxItemMapper.insert(tradingBoxItem);
-				} else {
-					tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
-					tradingBoxItem.setUpdateTime(new Date());
-					tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
-					tradingBoxItem.setPid(tradingBox.getId());
-					tradingBoxItemMapper.updateById(tradingBoxItem);
-				}
-				//明细图片
-				List<TradingBoxFiles> tradingBoxItemFilesList = tradingBoxItem.getTradingBoxFilesList();
-				if (ObjectUtils.isNotNull(tradingBoxItemFilesList) && tradingBoxItemFilesList.size() > 0) {
-					for (TradingBoxFiles tradingBoxFiles : tradingBoxItemFilesList) {
-						if (tradingBoxFiles.getId() == null) {
-							tradingBoxFiles.setCreateUser(AuthUtil.getUserId());
-							tradingBoxFiles.setCreateTime(new Date());
-							tradingBoxFiles.setTenantId(AuthUtil.getTenantId());
-							tradingBoxFiles.setPid(tradingBoxItem.getId());
-							tradingBoxFiles.setType("2");
-							tradingBoxFiles.setFileName(tradingBoxFiles.getLabel());
-							tradingBoxFiles.setUrl(tradingBoxFiles.getValue());
-							tradingBoxFilesMapper.insert(tradingBoxFiles);
-						} else {
-							tradingBoxFiles.setUpdateUser(AuthUtil.getUserId());
-							tradingBoxFiles.setUpdateTime(new Date());
-							tradingBoxFiles.setPid(tradingBoxItem.getId());
-							tradingBoxFiles.setType("2");
-							tradingBoxFiles.setFileName(tradingBoxFiles.getLabel());
-							tradingBoxFiles.setUrl(tradingBoxFiles.getValue());
-							tradingBoxFilesMapper.updateById(tradingBoxFiles);
-						}
-					}
-					tradingBoxItem.setTradingBoxFilesList(tradingBoxItemFilesList);
-				}
+				tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+				tradingBoxItem.setCreateTime(new Date());
+				tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+				tradingBoxItem.setTenantId(AuthUtil.getTenantId());
+				tradingBoxItem.setPid(tradingBox.getId());
+				tradingBoxItem.setStackingStatus("未堆存");
+				tradingBoxItemService.updateById(tradingBoxItem);
 				String updateChar = tradingBoxItem.getCode() + tradingBoxItem.getBoxType() + tradingBoxItem.getAddress() + tradingBoxItem.getNewDate() + tradingBoxItem.getStatus();
 				if (ObjectUtils.isNull(tradingBoxItem.getUpdateChar()) || !updateChar.equals(tradingBoxItem.getUpdateChar())) {
 					tradingBoxItem.setUpdateChar(updateChar);
-					tradingBoxItemMapper.updateById(tradingBoxItem);
+					tradingBoxItemService.updateById(tradingBoxItem);
 					if (ObjectUtils.isNotNull(tradingBoxItem.getCode())) {
 						//更新箱档案信息
 						Archives archivesR = archivesMapper.selectOne(new LambdaQueryWrapper<Archives>().eq(Archives::getIsDeleted, 0).eq(Archives::getTenantId, AuthUtil.getTenantId()).eq(Archives::getCode, tradingBoxItem.getCode()));
@@ -388,28 +311,26 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		}
 		baseMapper.updateById(tradingBox);
 		//费用明细
-		List<TradingBoxFees> tradingBoxFeesList = tradingBox.getTradingBoxFeesList();
+		LambdaQueryWrapper<TradingBoxFees> tradingBoxFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIsDeleted, 0)
+			.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId())
+			.eq(TradingBoxFees::getPid, tradingBox.getId())
+			.orderByDesc(TradingBoxFees::getCreateTime);
+		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(tradingBoxFeesList) && tradingBoxFeesList.size() > 0) {
 			for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
-				if (tradingBoxFees.getId() == null) {
-					if ("BUY".equals(tradingBox.getType())) {
-						tradingBoxFees.setBillType("买箱");
-					} else {
-						tradingBoxFees.setBillType("卖箱");
-					}
-					tradingBoxFees.setCreateUser(AuthUtil.getUserId());
-					tradingBoxFees.setCreateTime(new Date());
-					tradingBoxFees.setTenantId(AuthUtil.getTenantId());
-					tradingBoxFees.setPid(tradingBox.getId());
-					tradingBoxFeesMapper.insert(tradingBoxFees);
+				if ("BUY".equals(tradingBox.getType())) {
+					tradingBoxFees.setBillType("买箱");
 				} else {
-					tradingBoxFees.setUpdateUser(AuthUtil.getUserId());
-					tradingBoxFees.setUpdateTime(new Date());
-					tradingBoxFees.setPid(tradingBox.getId());
-					tradingBoxFeesMapper.updateById(tradingBoxFees);
+					tradingBoxFees.setBillType("卖箱");
 				}
+				tradingBoxFees.setCreateUser(AuthUtil.getUserId());
+				tradingBoxFees.setCreateTime(new Date());
+				tradingBoxFees.setTenantId(AuthUtil.getTenantId());
+				tradingBoxFees.setPid(tradingBox.getId());
 			}
 			tradingBox.setTradingBoxFeesList(tradingBoxFeesList);
+			tradingBoxFeesService.updateBatchById(tradingBoxFeesList);
 		}
 		//主表附件
 		List<TradingBoxFiles> tradingBoxFilesList = tradingBox.getTradingBoxFilesList();
@@ -513,7 +434,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 						.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
 						.eq(TradingBoxItem::getPid, tradingBox.getId())
 						.eq(TradingBoxItem::getCode, tradingBoxItem.getCode());
-					List<TradingBoxItem> tradingBoxItemList1 = tradingBoxItemMapper.selectList(tradingBoxItemLambdaQueryWrapper);
+					List<TradingBoxItem> tradingBoxItemList1 = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
 					if (ObjectUtils.isNotNull(tradingBoxItemList1) && tradingBoxItemList1.size() > 0) {
 						throw new RuntimeException("箱号：" + tradingBoxItem.getCode() + "已存在，保存失败");
 					}
@@ -539,7 +460,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
 					tradingBoxItem.setTenantId(AuthUtil.getTenantId());
 					tradingBoxItem.setPid(tradingBox.getId());
-					tradingBoxItemMapper.insert(tradingBoxItem);
+					tradingBoxItemService.save(tradingBoxItem);
 				} else {
 					if (tradingBox.getType().equals("ZR") && "录入".equals(tradingBoxItem.getStatus())) {
 						if (ObjectUtils.isNotNull(tradingBoxItem.getLeaseCommencementDate())) {
@@ -559,7 +480,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					tradingBoxItem.setUpdateTime(new Date());
 					tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
 					tradingBoxItem.setPid(tradingBox.getId());
-					tradingBoxItemMapper.updateById(tradingBoxItem);
+					tradingBoxItemService.updateById(tradingBoxItem);
 				}
 				//明细图片
 				List<TradingBoxFiles> tradingBoxItemFilesList = tradingBoxItem.getTradingBoxFilesList();
@@ -589,7 +510,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				String updateChar = tradingBoxItem.getCode() + tradingBoxItem.getBoxType() + tradingBoxItem.getAddress() + tradingBoxItem.getNewDate() + tradingBoxItem.getStatus();
 				if (ObjectUtils.isNull(tradingBoxItem.getUpdateChar()) || !updateChar.equals(tradingBoxItem.getUpdateChar())) {
 					tradingBoxItem.setUpdateChar(updateChar);
-					tradingBoxItemMapper.updateById(tradingBoxItem);
+					tradingBoxItemService.updateById(tradingBoxItem);
 					if (ObjectUtils.isNotNull(tradingBoxItem.getCode())) {
 						//更新箱档案信息
 						Archives archivesR = archivesMapper.selectOne(new LambdaQueryWrapper<Archives>().eq(Archives::getIsDeleted, 0).eq(Archives::getTenantId, AuthUtil.getTenantId()).eq(Archives::getCode, tradingBoxItem.getCode()));
@@ -671,8 +592,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 			}
 			tradingBox.setTradingBoxItemsList(tradingBoxItemList);
+			tradingBox.setBoxNumber(tradingBoxItemList.size());
 		}
-		tradingBox.setBoxNumber(tradingBoxItemList.size());
 		baseMapper.updateById(tradingBox);
 		//费用明细
 		List<TradingBoxFees> tradingBoxFeesList = tradingBox.getTradingBoxFeesList();
@@ -688,15 +609,14 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					tradingBoxFees.setCreateTime(new Date());
 					tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 					tradingBoxFees.setPid(tradingBox.getId());
-					tradingBoxFeesMapper.insert(tradingBoxFees);
 				} else {
 					tradingBoxFees.setUpdateUser(AuthUtil.getUserId());
 					tradingBoxFees.setUpdateTime(new Date());
 					tradingBoxFees.setPid(tradingBox.getId());
-					tradingBoxFeesMapper.updateById(tradingBoxFees);
 				}
 			}
 			tradingBox.setTradingBoxFeesList(tradingBoxFeesList);
+			tradingBoxFeesService.saveOrUpdateBatch(tradingBoxFeesList);
 		}
 		//主表附件
 		List<TradingBoxFiles> tradingBoxFilesList = tradingBox.getTradingBoxFilesList();
@@ -815,7 +735,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItemLambdaQueryWrapper.eq(TradingBoxItem::getIsDeleted, 0)
 				.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
 				.eq(TradingBoxItem::getPid, selectTradingBox.getId());
-			List<TradingBoxItem> tradingBoxItemList = tradingBoxItemMapper.selectList(tradingBoxItemLambdaQueryWrapper);
+			List<TradingBoxItem> tradingBoxItemList = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
 			String code = "";
 			if (CollectionUtils.isNotEmpty(tradingBoxItemList)) {
 				//数量
@@ -836,7 +756,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			receivableLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 			receivableLambdaQueryWrapper.eq(TradingBoxFees::getPid, selectTradingBox.getId());
 			receivableLambdaQueryWrapper.eq(TradingBoxFees::getFeesType, 2);
-			List<TradingBoxFees> receivableOrderFeesList = tradingBoxFeesMapper.selectList(receivableLambdaQueryWrapper);
+			List<TradingBoxFees> receivableOrderFeesList = tradingBoxFeesService.list(receivableLambdaQueryWrapper);
 			BigDecimal payAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
 				for (TradingBoxFees tradingBoxFees : receivableOrderFeesList) {
@@ -856,7 +776,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			payLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 			payLambdaQueryWrapper.eq(TradingBoxFees::getPid, selectTradingBox.getId());
 			payLambdaQueryWrapper.eq(TradingBoxFees::getFeesType, 1);
-			List<TradingBoxFees> payOrderFeesList = tradingBoxFeesMapper.selectList(payLambdaQueryWrapper);
+			List<TradingBoxFees> payOrderFeesList = tradingBoxFeesService.list(payLambdaQueryWrapper);
 			BigDecimal receivableAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(payOrderFeesList)) {
 				for (TradingBoxFees tradingBoxFees : payOrderFeesList) {
@@ -978,10 +898,10 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getPid, selectTradingBox.getId());
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
-		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
+		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.selectList(tradingBoxFeesLambdaQueryWrapper);
 		for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
 			tradingBoxFees.setSubmitPay(0);
-			tradingBoxFeesMapper.updateById(tradingBoxFees);
+			tradingBoxFeesService.updateById(tradingBoxFees);
 		}*/
 		iCheckClient.deteleByBillId(tradingBox.getId());
 		return selectTradingBox;
@@ -1062,7 +982,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					tradingBoxFees.setCreateTime(new Date());
 					tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 					tradingBoxFees.setSubmitPay(0);
-					tradingBoxFeesMapper.insert(tradingBoxFees);
+					tradingBoxFeesService.save(tradingBoxFees);
 
 					tradingBoxItem.setRentEndDate(calendar.getTime());
 				}
@@ -1211,7 +1131,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxFees.setCreateTime(new Date());
 				tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 				tradingBoxFees.setSubmitPay(0);
-				tradingBoxFeesMapper.insert(tradingBoxFees);
+				tradingBoxFeesService.save(tradingBoxFees);
 				tradingBoxFeesList.add(tradingBoxFees);
 
 				Items items = new Items();
@@ -1254,7 +1174,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxItem.setAddress(tradingBox.getAddress());
 				tradingBoxItem.setAddressId(tradingBox.getAddressId());
 			}
-			tradingBoxItemMapper.updateById(tradingBoxItem);
+			tradingBoxItemService.updateById(tradingBoxItem);
 			//记录箱轨迹信息
 			archivesTrajectory.setCorpId(tradingBox.getPurchaseCompanyId());
 			archivesTrajectory.setCorpName(tradingBox.getPurchaseCompanyName());
@@ -1276,7 +1196,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			//给角色为财务的人发送消息
 			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
 				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 					for (User datum : userList.getData()) {
 						//循环发送消息
@@ -1364,7 +1284,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFees.setCreateTime(new Date());
 			tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 			tradingBoxFees.setSubmitPay(0);
-			tradingBoxFeesMapper.insert(tradingBoxFees);
+			tradingBoxFeesService.save(tradingBoxFees);
 			tradingBoxFeesList.add(tradingBoxFees);
 			tradingBoxItem.setOverdueAmount(tradingBoxItem.getPrice().multiply(BigDecimal.valueOf(days)));
 			tradingBoxItem.setUpdateTime(new Date());
@@ -1373,7 +1293,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItem.setRentEndDate(tradingBox.getRentCalculationDate());
 			tradingBoxItem.setRentStartDate(tradingBox.getRentStartDate());
 			tradingBoxItem.setCount(tradingBoxItem.getCount() + 1);
-			tradingBoxItemMapper.updateById(tradingBoxItem);
+			tradingBoxItemService.updateById(tradingBoxItem);
 
 			/*Items items = new Items();
 			if (1 == tradingBoxFees.getFeesType()) {
@@ -1466,9 +1386,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getCode, tradingBoxItem.getCode());
 			tradingBoxFeesLambdaQueryWrapper.orderByDesc(TradingBoxFees::getCreateTime);
-			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
+			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 			if (tradingBoxFeesList.size() > 1) {
-				tradingBoxFeesMapper.deleteById(tradingBoxFeesList.get(0).getId());
+				tradingBoxFeesService.removeById(tradingBoxFeesList.get(0).getId());
 				//获取账单信息
 				Acc acc = new Acc();
 				acc.setSrcParentId(tradingBox.getId());
@@ -1505,7 +1425,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(0).getRentEndDate());
 				tradingBoxItem.setRentStartDate(tradingBoxFeesList.get(0).getRentStartDate());
 			}
-			tradingBoxItemMapper.updateById(tradingBoxItem);
+			tradingBoxItemService.updateById(tradingBoxItem);
 		}
 		tradingBox.setTradingBoxItemsList(tradingBoxItemList);
 		return tradingBox;
@@ -1648,7 +1568,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItemLambdaQueryWrapper.eq(TradingBoxItem::getIsDeleted, 0)
 				.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
 				.eq(TradingBoxItem::getPid, details.getId());
-			List<TradingBoxItem> tradingBoxItemList = tradingBoxItemMapper.selectList(tradingBoxItemLambdaQueryWrapper);
+			List<TradingBoxItem> tradingBoxItemList = tradingBoxItemService.list(tradingBoxItemLambdaQueryWrapper);
 			for (TradingBoxItem tradingBoxItem : tradingBoxItemList) {
 				//获取费用信息
 				LambdaQueryWrapper<TradingBoxFees> tradingBoxFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1657,7 +1577,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					.eq(TradingBoxFees::getCode, tradingBoxItem.getCode())
 					.eq(ObjectUtils.isNotNull(feesId), TradingBoxFees::getItemId, feesId)
 					.eq(TradingBoxFees::getPid, details.getId());
-				int count = tradingBoxFeesMapper.selectCount(tradingBoxFeesLambdaQueryWrapper);
+				int count = tradingBoxFeesService.count(tradingBoxFeesLambdaQueryWrapper);
 				tradingBoxItem.setCount(count);
 				tradingBoxItem.setId(null);
 				tradingBoxItem.setPid(null);
@@ -1687,7 +1607,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIsDeleted, 0)
 				.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId())
 				.eq(TradingBoxFees::getPid, details.getId());
-			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
+			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 			for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
 				R<FeesDesc> r = feesDescClient.detail(tradingBoxFees.getItemId());
 				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
@@ -1737,9 +1657,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getCode, tradingBoxItem.getCode());
 			tradingBoxFeesLambdaQueryWrapper.orderByDesc(TradingBoxFees::getRentEndDate);
-			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
+			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 			if (tradingBoxFeesList.size() > 0) {
-				tradingBoxFeesMapper.deleteById(tradingBoxFeesList.get(0).getId());
+				tradingBoxFeesService.removeById(tradingBoxFeesList.get(0).getId());
 				//获取账单信息
 				Acc acc = new Acc();
 				acc.setSrcParentId(tradingBox.getId());
@@ -1773,7 +1693,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(0).getRentEndDate());
 			tradingBoxItem.setRentStartDate(tradingBoxFeesList.get(0).getRentStartDate());
 			tradingBoxItem.setRentingOutDate(null);
-			tradingBoxItemMapper.updateById(tradingBoxItem);
+			tradingBoxItemService.updateById(tradingBoxItem);
 			if (ObjectUtils.isNotNull(tradingBoxItem.getCode())) {
 				//更新箱档案信息
 				Archives archivesR = archivesMapper.selectOne(new LambdaQueryWrapper<Archives>().eq(Archives::getIsDeleted, 0).eq(Archives::getTenantId, AuthUtil.getTenantId()).eq(Archives::getCode, tradingBoxItem.getCode()));
@@ -1879,7 +1799,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -1977,7 +1897,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//修改费用明细
 					tradingBoxFees.setSubmitPay(1);
 					tradingBoxFees.setExpenseGenerationTime(new Date());
-					tradingBoxFeesMapper.updateById(tradingBoxFees);
+					tradingBoxFeesService.updateById(tradingBoxFees);
 				}
 				if (CollectionUtils.isNotEmpty(itemsList)) {
 					//生成账单
@@ -1988,7 +1908,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					//给角色为财务的人发送消息
 					R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 					if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+						R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
 						if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 							for (User datum : userList.getData()) {
 								//循环发送消息
@@ -2079,7 +1999,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					}
 					tradingBoxFees.setSubmitPay(0);
 					tradingBoxFees.setExpenseGenerationTime(null);
-					tradingBoxFeesMapper.updateById(tradingBoxFees);
+					tradingBoxFeesService.updateById(tradingBoxFees);
 				}
 			} else {
 				throw new SecurityException("撤销失败，请选择费用明细");
@@ -2123,7 +2043,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getPid, pid);
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 0);
-		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
+		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(tradingBoxFeesList)) {
 			//账单明细
 			List<Items> itemsList = new ArrayList<>();
@@ -2175,7 +2095,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				//给角色为财务的人发送消息
 				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
 				if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()),null,null);
+					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
 					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 						for (User datum : userList.getData()) {
 							//循环发送消息
@@ -2201,7 +2121,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					}
 				}
 				//修改费用明细
-				tradingBoxFeesMapper.submitPay(tradingBox.getId());
+				tradingBoxFeesService.submitPay(tradingBox.getId());
 			}
 		}
 	}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportItemFeesServiceImpl.java

@@ -38,4 +38,9 @@ public class TransportItemFeesServiceImpl extends ServiceImpl<TransportItemFeesM
 		return page.setRecords(baseMapper.selectTransportItemFeesPage(page, transportItemFees));
 	}
 
+	@Override
+	public void submitPay(Long id) {
+		baseMapper.submitPay(id);
+	}
+
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -29,6 +29,8 @@ import org.springblade.box.tube.dto.TransportItemExcelEnter;
 import org.springblade.box.tube.entity.*;
 import org.springblade.box.tube.mapper.*;
 import org.springblade.box.tube.service.ITransferService;
+import org.springblade.box.tube.service.ITransportItemFeesService;
+import org.springblade.box.tube.service.ITransportItemService;
 import org.springblade.box.tube.service.ITransportService;
 import org.springblade.box.tube.vo.TransportVO;
 import org.springblade.check.dto.AuditProecessDTO;
@@ -70,10 +72,9 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport> implements ITransportService {
+	private final ITransportItemService transportItemService;
 
-	private final TransportItemMapper transportItemMapper;
-
-	private final TransportItemFeesMapper transportItemFeesMapper;
+	private final ITransportItemFeesService transportItemFeesService;
 
 	private final TransportFilesMapper transportFilesMapper;
 
@@ -118,33 +119,6 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		Transport detail = baseMapper.selectById(transport.getId());
 		if (ObjectUtils.isNotNull(detail)) {
 			detail.setTransportItemList(new ArrayList<>());
-			//获取明细信息
-			/*
-			LambdaQueryWrapper<TransportItem> transportItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			transportItemLambdaQueryWrapper.eq(TransportItem::getIsDeleted, 0)
-				.eq(TransportItem::getTenantId, AuthUtil.getTenantId())
-				.eq(TransportItem::getPid, detail.getId())
-				.orderByDesc(TransportItem::getCreateTime);
-			List<TransportItem> transportItemList = transportItemMapper.selectList(transportItemLambdaQueryWrapper);
-			detail.setTransportItemList(transportItemList);
-			//获取费用信息
-			LambdaQueryWrapper<TransportItemFees> transportItemFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getIsDeleted, 0)
-				.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId())
-				.eq(TransportItemFees::getPid, detail.getId())
-				.orderByDesc(TransportItemFees::getCreateTime);
-			List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
-			for (TransportItemFees transportItemFees : transportItemFeesList) {
-				R<FeesDesc> r = feesDescClient.detail(transportItemFees.getItemId());
-				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-					transportItemFees.setItemName(r.getData().getCname());
-				}
-				CorpsDesc corpsDesc = corpsDescClient.getCorpId(transportItemFees.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)) {
-					transportItemFees.setCorpName(corpsDesc.getCname());
-				}
-			}
-			detail.setTransportItemFeesList(transportItemFeesList);*/
 			detail.setTransportItemFeesList(new ArrayList<>());
 			//获取附件信息
 			LambdaQueryWrapper<TransportFiles> tradingBoxFilesLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -198,7 +172,12 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			baseMapper.updateById(transport);
 		}
 		//明细数据
-		List<TransportItem> transportItemList = transport.getTransportItemList();
+		LambdaQueryWrapper<TransportItem> transportItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		transportItemLambdaQueryWrapper.eq(TransportItem::getIsDeleted, 0)
+			.eq(TransportItem::getTenantId, AuthUtil.getTenantId())
+			.eq(TransportItem::getPid, transport.getId())
+			.orderByDesc(TransportItem::getCreateTime);
+		List<TransportItem> transportItemList = transportItemService.list(transportItemLambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(transportItemList) && transportItemList.size() > 0) {
 			//箱号拼接字符串
 			List<String> codes = transportItemList.stream().map(TransportItem::getCode).distinct().collect(Collectors.toList());
@@ -223,7 +202,6 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			}
 			for (TransportItem transportItem : transportItemList) {
 				//明细数据修改添加
-				if (transportItem.getId() == null) {
 					transportItem.setCreateUser(AuthUtil.getUserId());
 					transportItem.setCreateTime(new Date());
 					transportItem.setCreateUserName(AuthUtil.getUserName());
@@ -231,18 +209,9 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 					transportItem.setPid(transport.getId());
 					transportItem.setStatus("录入");
 					transportItem.setStockpilingStatus("1");
-					transportItemMapper.insert(transportItem);
-
 					List<String> codeList = new ArrayList<>();
 					codeList.add(transportItem.getCode());
 					transferService.stockpilingFee(codeList);
-				} else {
-					transportItem.setUpdateUser(AuthUtil.getUserId());
-					transportItem.setUpdateTime(new Date());
-					transportItem.setUpdateUserName(AuthUtil.getUserName());
-					transportItem.setPid(transport.getId());
-					transportItemMapper.updateById(transportItem);
-				}
 				//更新箱档案信息
 				if (ObjectUtils.isNotNull(transportItem.getCode())) {
 					Archives archives = new Archives();
@@ -259,13 +228,18 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			}
 			transport.setTransportItemList(transportItemList);
 			transport.setBoxNumber(transportItemList.size());
+			transportItemService.updateBatchById(transportItemList);
 		}
 		baseMapper.updateById(transport);
 		//费用明细
-		List<TransportItemFees> transportItemFeesList = transport.getTransportItemFeesList();
+		LambdaQueryWrapper<TransportItemFees> transportItemFeesLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getIsDeleted, 0)
+			.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId())
+			.eq(TransportItemFees::getPid, transport.getId())
+			.orderByDesc(TransportItemFees::getCreateTime);
+		List<TransportItemFees> transportItemFeesList = transportItemFeesService.list(transportItemFeesLambdaQueryWrapper);
 		if (ObjectUtils.isNotNull(transportItemFeesList) && transportItemFeesList.size() > 0) {
 			for (TransportItemFees transportItemFees : transportItemFeesList) {
-				if (transportItemFees.getId() == null) {
 					if ("CKZY".equals(transport.getBillType())) {
 						transportItemFees.setBillType("出口装运");
 					} else {
@@ -275,15 +249,10 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 					transportItemFees.setCreateTime(new Date());
 					transportItemFees.setTenantId(AuthUtil.getTenantId());
 					transportItemFees.setPid(transport.getId());
-					transportItemFeesMapper.insert(transportItemFees);
-				} else {
-					transportItemFees.setUpdateUser(AuthUtil.getUserId());
-					transportItemFees.setUpdateTime(new Date());
-					transportItemFees.setPid(transport.getId());
-					transportItemFeesMapper.updateById(transportItemFees);
-				}
+
 			}
 			transport.setTransportItemFeesList(transportItemFeesList);
+			transportItemFeesService.updateBatchById(transportItemFeesList);
 		}
 		//主表附件
 		List<TransportFiles> transportFilesList = transport.getTransportFilesList();
@@ -345,7 +314,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		//循环更新箱动态
 		for (Long id : list) {
 			//获取明细
-			TransportItem transportItem = transportItemMapper.selectById(id);
+			TransportItem transportItem = transportItemService.getById(id);
 			transportItem.setAddress(address);
 			transportItem.setAddressId(Long.parseLong(addressId));
 			transportItem.setNewDate(newDate);
@@ -377,10 +346,10 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 					R<FeesDesc> feesDescR = feesDescClient.getFeesByName("超期费");
 					if (feesDescR.isSuccess() && ObjectUtils.isNotNull(feesDescR.getData())) {
 						lambdaUpdateWrapper.eq(TransportItemFees::getItemId, feesDescR.getData().getId());
-						TransportItemFees selectTransportItemFees = transportItemFeesMapper.selectOne(lambdaUpdateWrapper);
+						TransportItemFees selectTransportItemFees = transportItemFeesService.getOne(lambdaUpdateWrapper);
 						if (ObjectUtils.isNotNull(selectTransportItemFees)) {
 							selectTransportItemFees.setAmount(amount);
-							transportItemFeesMapper.updateById(selectTransportItemFees);
+							transportItemFeesService.updateById(selectTransportItemFees);
 						} else {
 							TransportItemFees transportItemFees = new TransportItemFees();
 							transportItemFees.setCreateUser(AuthUtil.getUserId());
@@ -408,7 +377,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 							transportItemFees.setAutoGenerate("0");
 							transportItemFees.setUnit(transportItem.getBoxType());
 							transportItemFees.setExchangeRate(new BigDecimal("1"));
-							transportItemFeesMapper.insert(transportItemFees);
+							transportItemFeesService.save(transportItemFees);
 						}
 					}
 				}
@@ -416,7 +385,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				archives.setStatus("使用");
 				transportItem.setStatus(type);
 			}
-			transportItemMapper.updateById(transportItem);
+			transportItemService.updateById(transportItem);
 			//更新箱档案信息
 
 			archives.setCode(transportItem.getCode());
@@ -536,7 +505,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			transportItemLambdaQueryWrapper.eq(TransportItem::getIsDeleted, 0)
 				.eq(TransportItem::getTenantId, AuthUtil.getTenantId())
 				.eq(TransportItem::getPid, selectTransport.getId());
-			List<TransportItem> tradingBoxItemList = transportItemMapper.selectList(transportItemLambdaQueryWrapper);
+			List<TransportItem> tradingBoxItemList = transportItemService.list(transportItemLambdaQueryWrapper);
 			String code = "";
 			if (CollectionUtils.isNotEmpty(tradingBoxItemList)) {
 				//数量
@@ -558,7 +527,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			receivableLambdaQueryWrapper.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId());
 			receivableLambdaQueryWrapper.eq(TransportItemFees::getPid, selectTransport.getId());
 			receivableLambdaQueryWrapper.eq(TransportItemFees::getFeesType, 2);
-			List<TransportItemFees> receivableOrderFeesList = transportItemFeesMapper.selectList(receivableLambdaQueryWrapper);
+			List<TransportItemFees> receivableOrderFeesList = transportItemFeesService.list(receivableLambdaQueryWrapper);
 			BigDecimal payAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
 				for (TransportItemFees transportItemFees : receivableOrderFeesList) {
@@ -581,7 +550,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			payLambdaQueryWrapper.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId());
 			payLambdaQueryWrapper.eq(TransportItemFees::getPid, selectTransport.getId());
 			payLambdaQueryWrapper.eq(TransportItemFees::getFeesType, 1);
-			List<TransportItemFees> payOrderFeesList = transportItemFeesMapper.selectList(payLambdaQueryWrapper);
+			List<TransportItemFees> payOrderFeesList = transportItemFeesService.list(payLambdaQueryWrapper);
 			BigDecimal receivableAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(payOrderFeesList)) {
 				for (TransportItemFees transportItemFees : payOrderFeesList) {
@@ -705,10 +674,10 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getPid, selectTransport.getId());
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId());
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getSubmitPay, 1);
-		List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
+		List<TransportItemFees> transportItemFeesList = transportItemFeesService.selectList(transportItemFeesLambdaQueryWrapper);
 		for (TransportItemFees transportItemFees : transportItemFeesList) {
 			transportItemFees.setSubmitPay(0);
-			transportItemFeesMapper.updateById(transportItemFees);
+			transportItemFeesService.updateById(transportItemFees);
 		}*/
 		iCheckClient.deteleByBillId(selectTransport.getId());
 		return selectTransport;
@@ -814,7 +783,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			transportItemLambdaQueryWrapper.eq(TransportItem::getIsDeleted, 0)
 				.eq(TransportItem::getTenantId, AuthUtil.getTenantId())
 				.eq(TransportItem::getPid, detail.getId());
-			List<TransportItem> transportItemList = transportItemMapper.selectList(transportItemLambdaQueryWrapper);
+			List<TransportItem> transportItemList = transportItemService.list(transportItemLambdaQueryWrapper);
 			for (TransportItem transportItem : transportItemList) {
 				transportItem.setId(null);
 				transportItem.setPid(null);
@@ -833,7 +802,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getIsDeleted, 0)
 				.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId())
 				.eq(TransportItemFees::getPid, detail.getId());
-			List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
+			List<TransportItemFees> transportItemFeesList = transportItemFeesService.list(transportItemFeesLambdaQueryWrapper);
 			for (TransportItemFees transportItemFees : transportItemFeesList) {
 				R<FeesDesc> r = feesDescClient.detail(transportItemFees.getItemId());
 				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
@@ -937,7 +906,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				applyDTO.setItemsList(itemsList);
 				//修改费用明细
 				tradingBoxFees.setSubmitPay(1);
-				transportItemFeesMapper.updateById(tradingBoxFees);
+				transportItemFeesService.updateById(tradingBoxFees);
 			}
 			if (CollectionUtils.isNotEmpty(itemsList)) {
 				//生成账单
@@ -1004,7 +973,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 					}
 				}
 				transportItemFees.setSubmitPay(0);
-				transportItemFeesMapper.updateById(transportItemFees);
+				transportItemFeesService.updateById(transportItemFees);
 			}
 		} else {
 			throw new SecurityException("撤销失败，请选择费用明细");
@@ -1043,7 +1012,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getPid, pid);
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId());
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getSubmitPay, 0);
-		List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
+		List<TransportItemFees> transportItemFeesList = transportItemFeesService.list(transportItemFeesLambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(transportItemFeesList)) {
 			List<Items> itemsList = new ArrayList<>();
 			for (TransportItemFees transportItemFees : transportItemFeesList) {
@@ -1125,7 +1094,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 					}
 				}
 				//修改费用明细
-				transportItemFeesMapper.submitPay(transport.getId());
+				transportItemFeesService.submitPay(transport.getId());
 			}
 		}
 	}