Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -5614,7 +5614,23 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				WarehouseWayBillDetail warehouseWayBillDetail = new WarehouseWayBillDetail();
 				warehouseWayBillDetail.setWaybillNo(waybillEntity.getWaybillNo());
 				warehouseWayBillDetail.setWaybillId(waybillEntity.getId());
-				warehouseWayBillDetail.setProductId(waybillDetailDTO.getGoodsId());
+
+				Long goodsId = waybillDetailDTO.getGoodsId();
+
+				if (Objects.isNull(goodsId)) {
+					//如果品名id没有就先通过goodsName查寻，没有就新增
+					BasicdataCategoryEntity basicdataCategoryEntity = basicdataCategoryClient.findByName(goodsName);
+					if (Objects.isNull(basicdataCategoryEntity)) {
+						basicdataCategoryEntity = new BasicdataCategoryEntity();
+						basicdataCategoryEntity.setName(goodsName);
+						basicdataCategoryEntity.setType("1");
+						goodsId = basicdataCategoryClient.addReturnId(basicdataCategoryEntity);
+					} else {
+						goodsId = basicdataCategoryEntity.getId();
+					}
+				}
+
+				warehouseWayBillDetail.setProductId(goodsId);
 				warehouseWayBillDetail.setProductName(waybillDetailDTO.getGoodsName());
 				warehouseWayBillDetail.setChargeType(waybillDetailDTO.getChargeType());
 				warehouseWayBillDetail.setNum(waybillDetailDTO.getNum());
@@ -5622,6 +5638,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				warehouseWayBillDetail.setWeight(waybillDetailDTO.getWeight());
 				warehouseWayBillDetail.setPrice(waybillDetailDTO.getPrice());
 				warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight());
+				warehouseWayBillDetail.setDeliveryPrice(waybillDetailDTO.getDeliveryPrice());
+				warehouseWayBillDetail.setSubtotalDeliveryFee(waybillDetailDTO.getSubtotalDeliveryFee());
 				warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice());
 				warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice());
 				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType());

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java

@@ -435,6 +435,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 						updateEntity.setBillladingStatus(billladingEntity.getBillladingStatus());
 						updateEntity.setEndTime(billladingEntity.getEndTime());
 						stringBuffer.append(",提货中变更为提货完成");
+						billladingWaybillService.updateBillladingFeeByBillladingId(billladingEntity);
+
 					} else {
 						log.warn("##################updateBillladingStatus: 提货单不能更新为已完成 billladingStatus={}", billladingStatus);
 						throw new CustomerException(405, "提货单不能更新为已完成");