|
|
@@ -1295,7 +1295,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
List<Items> itemsList = new ArrayList<>();
|
|
|
Items LandOrderItems = new Items();
|
|
|
LandOrderItems.setSrcOrderno(order.getBillNo());
|
|
|
- LandOrderItems.setCorpId(order.getCorpId());
|
|
|
LandOrderItems.setSrcParentId(pid);
|
|
|
LandOrderItems.setCurrency("CNY");
|
|
|
LandOrderItems.setSrcType(9);
|
|
|
@@ -1315,8 +1314,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
LandOrderItems.setChargeMember(corpsDesc.getCname());
|
|
|
}
|
|
|
LandOrderItems.setDepartureHarbor(order.getStation());
|
|
|
- LandOrderItems.setShipName(order.getDispatcher() + "");
|
|
|
-
|
|
|
+ if (ObjectUtils.isNotNull(order.getDispatcher())){
|
|
|
+ LandOrderItems.setShipName(order.getDispatcher() + "");
|
|
|
+ }
|
|
|
LambdaQueryWrapper<OrderAddress> orderAddressLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
orderAddressLambdaQueryWrapper.eq(OrderAddress::getIsDeleted, 0);
|
|
|
orderAddressLambdaQueryWrapper.eq(OrderAddress::getOrderId, pid);
|
|
|
@@ -1325,15 +1325,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
List<String> arr = orderAddressList.stream().map(OrderAddress::getAddress).distinct().collect(Collectors.toList());
|
|
|
LandOrderItems.setObjectiveHarbor(String.join(",", arr));
|
|
|
|
|
|
-
|
|
|
if ("集装箱".equals(order.getShippingMode())) {
|
|
|
- LandOrderItems.setSrcBoxBillType("ZDLU-JZX");
|
|
|
- LandOrderItems.setItemType("ZDLU-JZX");
|
|
|
- LandOrderItems.setPrice(order.getFreight());
|
|
|
- //账单数据
|
|
|
- LandOrderItems.setAmount(order.getFreight());
|
|
|
- LandOrderItems.setQuantity(new BigDecimal("1"));
|
|
|
- LandOrderItems.setSrcFeesType("收费");
|
|
|
LambdaQueryWrapper<OrderItem> orderItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
orderItemLambdaQueryWrapper.eq(OrderItem::getIsDeleted, 0);
|
|
|
orderItemLambdaQueryWrapper.eq(OrderItem::getOrderId, pid);
|
|
|
@@ -1341,13 +1333,33 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
orderItemLambdaQueryWrapper.eq(OrderItem::getKind, 2);
|
|
|
List<OrderItem> orderItemList = orderItemMapper.selectList(orderItemLambdaQueryWrapper);
|
|
|
if (ObjectUtils.isNotNull(orderItemList) && orderItemList.size() > 0) {
|
|
|
- LandOrderItems.setFleetId(orderItemList.get(0).getFleetId());
|
|
|
+ for (OrderItem orderItem : orderItemList) {
|
|
|
+ for (int i = 0; i < 2; i++) {
|
|
|
+ Items LandItems = new Items();
|
|
|
+ BeanUtil.copyProperties(LandOrderItems, LandItems);
|
|
|
+ LandItems.setSrcBoxBillType("ZDLU-JZX");
|
|
|
+ LandItems.setItemType("ZDLU-JZX");
|
|
|
+ LandItems.setQuantity(new BigDecimal("1"));
|
|
|
+ LandItems.setFleetId(orderItem.getFleetId());
|
|
|
+ LandItems.setPlateNo(orderItem.getPlateNo());
|
|
|
+ LandItems.setCtnType(order.getShippingMode());
|
|
|
+ if (i == 0 && ObjectUtils.isNotNull(orderItem.getLandAmountD())) {
|
|
|
+ LandItems.setCorpId(order.getCorpId());
|
|
|
+ LandItems.setSrcFeesType("收费");
|
|
|
+ LandItems.setPrice(orderItem.getLandAmountD());
|
|
|
+ LandItems.setAmount(orderItem.getLandAmountD());
|
|
|
+ itemsList.add(LandItems);
|
|
|
+ }
|
|
|
+ if (i == 1 && ObjectUtils.isNotNull(orderItem.getLandAmountC())) {
|
|
|
+ LandItems.setCorpId(orderItem.getFleetId());
|
|
|
+ LandItems.setSrcFeesType("付费");
|
|
|
+ LandItems.setPrice(orderItem.getLandAmountC());
|
|
|
+ LandItems.setAmount(orderItem.getLandAmountC());
|
|
|
+ itemsList.add(LandItems);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- List<String> PlateNo = orderItemList.stream().map(OrderItem::getPlateNo).distinct().collect(Collectors.toList());
|
|
|
- LandOrderItems.setPlateNo(String.join(",", PlateNo));
|
|
|
- List<String> CtnType = orderItemList.stream().map(OrderItem::getCtnType).distinct().collect(Collectors.toList());
|
|
|
- LandOrderItems.setCtnType(String.join(",", CtnType));
|
|
|
- itemsList.add(LandOrderItems);
|
|
|
} else {
|
|
|
for (int i = 0; i < 2; i++) {
|
|
|
Items LandItems = new Items();
|
|
|
@@ -1357,15 +1369,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
LandItems.setQuantity(new BigDecimal("1"));
|
|
|
LandItems.setFleetId(order.getFleetId());
|
|
|
LandItems.setPlateNo(order.getPlateNo());
|
|
|
- LandItems.setCtnType("散货");
|
|
|
+ LandItems.setCtnType(order.getShippingMode());
|
|
|
|
|
|
if (i == 0 && ObjectUtils.isNotNull(order.getFreightCollect())) {
|
|
|
+ LandItems.setCorpId(order.getCorpId());
|
|
|
LandItems.setSrcFeesType("收费");
|
|
|
LandItems.setPrice(order.getFreightCollect());
|
|
|
LandItems.setAmount(order.getFreightCollect());
|
|
|
itemsList.add(LandItems);
|
|
|
}
|
|
|
if (i == 1 && ObjectUtils.isNotNull(order.getFreightPay())) {
|
|
|
+ LandItems.setCorpId(order.getFleetId());
|
|
|
LandItems.setSrcFeesType("付费");
|
|
|
LandItems.setPrice(order.getFreightPay());
|
|
|
LandItems.setAmount(order.getFreightPay());
|
|
|
@@ -1435,48 +1449,48 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
|
|
|
}
|
|
|
items.setSrcFeesId(transportItemFees.getId());
|
|
|
itemsList.add(items);
|
|
|
- applyDTO.setItemsList(itemsList);
|
|
|
//修改费用明细
|
|
|
transportItemFees.setSubmitPay(1);
|
|
|
orderFeeMapper.updateById(transportItemFees);
|
|
|
}
|
|
|
- if (CollectionUtils.isNotEmpty(itemsList)) {
|
|
|
- //生成账单
|
|
|
- R paymentApply = financeClient.paymentApplyLandOrder(applyDTO);
|
|
|
- if (!paymentApply.isSuccess()) {
|
|
|
- throw new RuntimeException(paymentApply.getMsg());
|
|
|
- }
|
|
|
- //给角色为财务的人发送消息
|
|
|
- R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
|
|
|
- if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
|
|
|
- R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
|
|
|
- if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
|
|
|
- for (User datum : userList.getData()) {
|
|
|
- //循环发送消息
|
|
|
- Message sendMessage = new Message();
|
|
|
- sendMessage.setParameter(String.valueOf(pid));
|
|
|
- sendMessage.setUserName(AuthUtil.getUserName());
|
|
|
- sendMessage.setUserId(AuthUtil.getUserId());
|
|
|
- sendMessage.setToUserId(datum.getId());
|
|
|
- sendMessage.setToUserName(datum.getName());
|
|
|
- sendMessage.setMessageType(1);
|
|
|
- sendMessage.setTenantId(AuthUtil.getTenantId());
|
|
|
- sendMessage.setCreateUser(AuthUtil.getUserId());
|
|
|
- sendMessage.setCreateTime(new Date());
|
|
|
+ }
|
|
|
+ if (CollectionUtils.isNotEmpty(itemsList)) {
|
|
|
+ applyDTO.setItemsList(itemsList);
|
|
|
+ //生成账单
|
|
|
+ R paymentApply = financeClient.paymentApplyLandOrder(applyDTO);
|
|
|
+ if (!paymentApply.isSuccess()) {
|
|
|
+ throw new RuntimeException(paymentApply.getMsg());
|
|
|
+ }
|
|
|
+ //给角色为财务的人发送消息
|
|
|
+ R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
|
|
|
+ if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
|
|
|
+ R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
|
|
|
+ if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
|
|
|
+ for (User datum : userList.getData()) {
|
|
|
+ //循环发送消息
|
|
|
+ Message sendMessage = new Message();
|
|
|
+ sendMessage.setParameter(String.valueOf(pid));
|
|
|
+ sendMessage.setUserName(AuthUtil.getUserName());
|
|
|
+ sendMessage.setUserId(AuthUtil.getUserId());
|
|
|
+ sendMessage.setToUserId(datum.getId());
|
|
|
+ sendMessage.setToUserName(datum.getName());
|
|
|
+ sendMessage.setMessageType(1);
|
|
|
+ sendMessage.setTenantId(AuthUtil.getTenantId());
|
|
|
+ sendMessage.setCreateUser(AuthUtil.getUserId());
|
|
|
+ sendMessage.setCreateTime(new Date());
|
|
|
/*sendMessage.setUrl(order.getUrl());
|
|
|
sendMessage.setPageLabel(order.getPageLabel());
|
|
|
sendMessage.setPageStatus(order.getPageStatus());*/
|
|
|
- sendMessage.setMessageBody("您订单" + order.getOrderNo() + "审核通过,请查看");
|
|
|
- R save = messageClient.save(sendMessage);
|
|
|
- if (!save.isSuccess()) {
|
|
|
- throw new SecurityException("发送消息失败");
|
|
|
- }
|
|
|
+ sendMessage.setMessageBody("您订单" + order.getOrderNo() + "审核通过,请查看");
|
|
|
+ R save = messageClient.save(sendMessage);
|
|
|
+ if (!save.isSuccess()) {
|
|
|
+ throw new SecurityException("发送消息失败");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- return null;
|
|
|
+ return landOrder;
|
|
|
}
|
|
|
|
|
|
private List<OrderItem> getOrderItemList(Long id) {
|