github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

修改客户订单-- 修改后的产品在原来中不存在

pull/451/head
starrysky 2019-08-17 14:21:24 +08:00
parent f809070e53
commit 0abc318c3a
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/repository/CustomerOrderProductRepository.java
View File

@ -3,6 +3,8 @@ package me.zhengjie.modules.wms.order.repository;
import me.zhengjie.modules.wms.order.domain.CustomerOrderProduct;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import java.util.List;
@ -12,5 +14,10 @@ import java.util.List;
*/
public interface CustomerOrderProductRepository extends JpaRepository<CustomerOrderProduct, Long>, JpaSpecificationExecutor {
List<CustomerOrderProduct> findByCustomerOrderIdAndStatusTrue(Long customerId);
List<CustomerOrderProduct> findByCustomerOrderIdAndStatusTrue(Long customerOrderId);
@Modifying
@Query(value = "delete s_customer_order_product where product_code = ?1 and customer_order = ?2", nativeQuery = true)
void deleteByProductCodeAndCustomerOrderId(String productCode, Long customerOrderId);
}

3
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/dto/CustomerOrderProductDTO.java
View File

@ -1,12 +1,15 @@
package me.zhengjie.modules.wms.order.service.dto;
import lombok.Data;
import java.sql.Timestamp;
/**
* @author 黄星星
* @date 2019-08-17
*/
@Data
public class CustomerOrderProductDTO {
private Long id;

37
eladmin-system/src/main/java/me/zhengjie/modules/wms/order/service/impl/CustomerOrderServiceImpl.java
View File

@ -23,7 +23,11 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import me.zhengjie.utils.PageUtil;
@ -110,13 +114,34 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
CustomerOrder customerOrder = new CustomerOrder();
BeanUtils.copyProperties(updateCustomerOrderRequest, customerOrder);
// 修改客户订单概要信息
customerOrderRepository.save(customerOrder);
// 修改产品信息之前，查询该订单中原来的产品信息，key为产品code
List<CustomerOrderProduct> customerOrderProductListBeforeUpdate = customerOrderProductRepository.findByCustomerOrderIdAndStatusTrue(customerOrder.getId());
Map<String, CustomerOrderProduct> customerOrderProductMapBefore = customerOrderProductListBeforeUpdate.stream().collect(Collectors.toMap(CustomerOrderProduct::getProductCode, Function.identity()));
List<CustomerOrderProductDTO> customerOrderProductRequestList = updateCustomerOrderRequest.getCustomerOrderProductList();
if(CollectionUtils.isEmpty(customerOrderProductRequestList)){
throw new BadRequestException("订单产品不能为空!");
}
Map<String, CustomerOrderProductDTO> customerOrderProductMapAfter = customerOrderProductRequestList.stream().collect(Collectors.toMap(CustomerOrderProductDTO::getProductCode, Function.identity()));
//需要将订单中原来订单对应的产品删除了的数据
List<String> deleteTargetList = new ArrayList<>();
//比较量个map中，key不一样的数据
for(Map.Entry<String, CustomerOrderProduct> entry:customerOrderProductMapBefore.entrySet()){
String productCode = entry.getKey();
//修改后的map记录对应的key在原来中是否存在
CustomerOrderProductDTO customerOrderProductDTOTemp = customerOrderProductMapAfter.get(productCode);
if(null == customerOrderProductDTOTemp){
deleteTargetList.add(entry.getKey());
}
}
List<CustomerOrderProduct> customerOrderProductList = new ArrayList<>();
for(CustomerOrderProductDTO customerOrderProductDTO : customerOrderProductRequestList){
CustomerOrderProduct customerOrderProduct = new CustomerOrderProduct();
@ -125,6 +150,18 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
customerOrderProduct.setStatus(true);
}
customerOrderProductRepository.saveAll(customerOrderProductList);
/**
* 场景描述:
* 1.刚开始新增了 a b c三种产品
* 2.修改的时候删除了 a c两种产品
* 3.所以需要查修改前数据库中有的产品，再比较修改传过来的产品数据，如果修改后的在原来里面没有，需要将原来里面对应的删除
*/
if(!CollectionUtils.isEmpty(deleteTargetList)){
for(String prductCode : deleteTargetList){
customerOrderProductRepository.deleteByProductCodeAndCustomerOrderId(prductCode, customerOrder.getId());
}
}
}
@Override