Skip to content

J
jiedao-api-boot-master
Commit 214a1d4e authored by lanbaoming's avatar lanbaoming
Browse files
Options

2024-05-21-3提交

parent 639637fc
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 14 deletions
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/customer/CustomerServiceImpl.java
View file @ 214a1d4e
......@@ -2553,6 +2553,7 @@ public class CustomerServiceImpl extends AbstractService<CustomerMapper, Custome
.set(CustomerDO::getResourceType, 2)); //1为开发客户 2为公司客户
}
//赋值新老客户经理
Long oldCustomerService = customer.getCustomerService();
Long newCustomerService = loginUserId;
......
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CalculateCustomerType.java
View file @ 214a1d4e
......@@ -56,6 +56,9 @@ public class CalculateCustomerType {
} else {
//新客户经理和老客户经理不是同一客户经理
//客户业绩类型=新客户
//不是同一客户经理，不管有无成交记录都要改为新客户 lanbm 2024-05-21 添加业务逻辑备注
//一客户经理的客户掉入公海池，
//本人去捞要等48小时，其他客户经理一掉入就可以去捞 lanbm 2024-05-21 添加业务逻辑备注
sMsg+=",新老不一致";
customerService.updateCustomerNewOrOld(event.getCustomerId(), true);
}
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @ 214a1d4e
......@@ -460,8 +460,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
String unit = null;
//查询原有的纪录
List<OrderWarehouseInDO> orderWarehouseInListOld = orderWarehouseInMapper
.selectList(new LambdaQueryWrapperX<OrderWarehouseInDO>().eq(OrderWarehouseInDO::getOrderId, orderId)
List<OrderWarehouseInDO> orderWarehouseInListOld =
orderWarehouseInMapper
.selectList(new LambdaQueryWrapperX<OrderWarehouseInDO>()
.eq(OrderWarehouseInDO::getOrderId, orderId)
.eq(OrderWarehouseInDO::getOrderItemId, orderItemId));
List<OrderWarehouseInItemDto> orderWarehouseInItemDoList = createReqVO.getOrderWarehouseInItemDoList();
......@@ -493,9 +495,15 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
if (CollectionUtil.isNotEmpty(orderWarehouseInItemDoList)) {
orderWarehouseInItemDoList.stream().forEach(orderWarehouseInItemDto -> {
orderWarehouseInItemDoList.stream().
forEach(orderWarehouseInItemDto -> {
OrderWarehouseInDO orderWarehouseInDo = convertOrderWarehouseInItemDo(orderDO, orderItemIdFInal, zhongpaoBest, zhongEdge, paoEdge, orderWarehouseInItemDto, createReqVO.getInTime());
OrderWarehouseInDO orderWarehouseInDo =
convertOrderWarehouseInItemDo(orderDO,
orderItemIdFInal, zhongpaoBest,
zhongEdge, paoEdge,
orderWarehouseInItemDto,
createReqVO.getInTime());
if (orderWarehouseInItemDto.getId() == null) {
// 执行入仓
......@@ -515,12 +523,16 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderLocationService.saveBatch(orderLocationDOList);
}
} else {
OrderWarehouseInDO orderWarehouseInDOOld = orderWarehouseInMapper.selectById(orderWarehouseInItemDto.getId());
OrderWarehouseInDO orderWarehouseInDOOld =
orderWarehouseInMapper.selectById(
orderWarehouseInItemDto.getId());
// 判断这条数据有没有更新，没有修改则不需要更新
List<ApplyInfoVO> applyInfoVOListTmp = new ArrayList<>();
compareOrderWarehouseInField("", Arrays.asList(orderWarehouseInDOOld), Arrays.asList(orderWarehouseInItemDto), applyInfoVOListTmp);
compareOrderWarehouseInField("",
Arrays.asList(orderWarehouseInDOOld),
Arrays.asList(orderWarehouseInItemDto),
applyInfoVOListTmp);
// 2023-04-20 入仓修改若修改已有入仓记录，有改动（储位或其他信息修改）修改入仓记录的最新操作时间，不修改入仓时间，不修改未发生变化的入仓记录的入仓时间和最新操作时间。
if (CollectionUtil.isNotEmpty(applyInfoVOListTmp)) {
orderWarehouseInMapper.updateById(orderWarehouseInDo);
......@@ -531,8 +543,11 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
if (isDeleteNotInWarehouseIn && !isAddNewOrderItem) {
//找到需要删除的纪录
List<Long> deleteIds = orderWarehouseInListOld.stream().filter(orderWarehouseInOld -> orderWarehouseInItemDoList.stream().noneMatch(t -> orderWarehouseInOld.getId().equals(t.getId())))
List<Long> deleteIds =
orderWarehouseInListOld.stream().
filter(orderWarehouseInOld -> orderWarehouseInItemDoList.stream().noneMatch(t -> orderWarehouseInOld.getId().equals(t.getId())))
.map(OrderWarehouseInDO::getId).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(deleteIds)) {
orderWarehouseInMapper.deleteBatchIds(deleteIds);
......@@ -545,7 +560,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
} else {
if (isDeleteNotInWarehouseIn && !isAddNewOrderItem) {
//删除入仓纪录
List<Long> deleteIds = orderWarehouseInListOld.stream().map(OrderWarehouseInDO::getId).collect(Collectors.toList());
List<Long> deleteIds =
orderWarehouseInListOld.stream().
map(OrderWarehouseInDO::getId).
collect(Collectors.toList());
orderWarehouseInMapper.deleteBatchIds(deleteIds);
for (Long orderWarehouseInId : deleteIds) {
......@@ -2516,13 +2534,16 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
@Transactional(rollbackFor = {Exception.class})
public String updateOrUpdateApply(@Valid OrderWarehouseInUpdateApplyReqVO updateReqVO) {
//lanbm 2024-05-21 处理删除记录失效的问题
Long orderId = updateReqVO.getOrderId();
Long orderItemId = updateReqVO.getOrderItemId();
Long prodId = updateReqVO.getProdId();
Long brand = updateReqVO.getBrand();
// 设置是否备案和收费模式
GetFeeTypeProductBrandEmpowerRespVO feeTypeByOrder = getGetFeeTypeProductBrandEmpowerRespVO(orderId, prodId, brand);
GetFeeTypeProductBrandEmpowerRespVO feeTypeByOrder =
getGetFeeTypeProductBrandEmpowerRespVO(orderId, prodId, brand);
if (feeTypeByOrder != null) {
// //当订单项的brandType为null时才设置。（说明是新品入仓）
// if (StringUtils.isNotEmpty(feeTypeByOrder.getRecordMode())) {
......@@ -2533,7 +2554,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
}
}
List<OrderWarehouseInItemDto> orderWarehouseInUpdateItemDoList = updateReqVO.getOrderWarehouseInUpdateItemDoList();
//如仓记录项
List<OrderWarehouseInItemDto> orderWarehouseInUpdateItemDoList =
updateReqVO.getOrderWarehouseInUpdateItemDoList();
ProductDO productDO = productService.getProduct(prodId);
if (productDO == null) {
......@@ -2576,7 +2599,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
throw ServiceExceptionUtil.exception(ErrorCodeConstants.SPLIT_ORDER_CAN_NOT_UPDATE);
}
validateWarehouseInItem(orderDO, brand, orderWarehouseInUpdateItemDoList, prodTitleZh, prodTitleEn);
validateWarehouseInItem(orderDO, brand,
orderWarehouseInUpdateItemDoList, prodTitleZh, prodTitleEn);
if (CollectionUtil.isEmpty(updateReqVO.getPictureUrls())) {
throw exception(ErrorCodeConstants.ORDER_WAREHOUSE_IN_PICTURE_NOT_NULL);
......@@ -2602,7 +2626,18 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderWarehouseInCreateReqVO.setOrderWarehouseInItemDoList(orderWarehouseInUpdateItemDoList);
}
this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO, orderId, orderItemId, orderDO, updateReqVO.getPictureUrls(), false, true);
/* lanbm 2024-05-21 修改此处,isDeleteNotInWarehouseIn 改为true
this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO,
orderId, orderItemId, orderDO,
updateReqVO.getPictureUrls(),
false,
true);*/
this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO,
orderId, orderItemId, orderDO,
updateReqVO.getPictureUrls(),
true,
true);
// 更新订单入仓信息
OrderWarehouseInVO orderWarehouseInVO = new OrderWarehouseInVO();
......@@ -2610,7 +2645,8 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderService.orderInWarehouse(orderWarehouseInVO);
// 更新订单状态 - 入库中
orderService.updateStatus(orderId, orderDO.getOrderNo(), OrderStatusEnum.WAREHOUSING.getValue(), null, OrderWarehouseInStatusEnum.warehousing.getValue(), null, null, null, false);
orderService.updateStatus(orderId, orderDO.getOrderNo(),
OrderStatusEnum.WAREHOUSING.getValue(), null, OrderWarehouseInStatusEnum.warehousing.getValue(), null, null, null, false);
List<ApplyInfoVO> applyInfoList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment