修复bug

yn-bftl-byx / thirdparty

Browse code 修复bug master
1 parent fa0fe79 commit 9b7df3dbcb3dd547104bdb83f27542bea1aa31a0 steven authored on 19 Dec

Patch

Showing 2 changed files

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/repository/ShippingRepository.java
package com.yn.bftl.thirdparty.common.repository; import com.yn.bftl.common.modules.company.entity.ErpAccountSet; import com.yn.bftl.common.modules.order.entity.Shipping; import com.yn.bftl.common.modules.order.enums.ShippingType; import com.yn.bftl.common.modules.order.enums.SyncState; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; /** * 发货表Repository * * @author chendehuihuo * @date 2021/11/22 / @Repository public interface ShippingRepository extends JpaRepository<Shipping, Long> { / * 修改发货单分账标记 * * @param signTime / @Transactional @Modifying @Query(nativeQuery = true, value = "update order_shipping m set m.separate_flag = 1 where m.is_separate_accounts = 0 and m.separate_flag = 0 and m.shipping_type = 'NORMAL' and m.receive_status = 'RECEIVED' and m.sign_time < ?1 " + " and orders in (select id from order_order o where o.seller_company = ?2)") void updateSeparateFlagBySignTime(LocalDateTime signTime, Long sellerCompanyId); @Transactional @Modifying @Query(nativeQuery = true, value = "update order_shipping m set m.is_separate_accounts = 1 where m.id = ?1") void updateIsSeparateAccountsById(Long id); List<Shipping> findAllByShippingTypeAndIsSeparateAccountsAndSeparateFlagAndOrdersSellerCompanyId(ShippingType shippingType, Boolean isSeparateAccounts, Boolean separateFlag, Long companyId); Shipping findFirstByShippingSnAndErpAccountSetAndDeleteState(String shippingSn, ErpAccountSet erpAccountSet, SyncState syncState); } package com.yn.bftl.thirdparty.common.repository; import com.yn.bftl.common.modules.company.entity.ErpAccountSet; import com.yn.bftl.common.modules.order.entity.Shipping; import com.yn.bftl.common.modules.order.enums.ShippingType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; /* * 发货表Repository * * @author chendehuihuo * @date 2021/11/22 / @Repository public interface ShippingRepository extends JpaRepository<Shipping, Long> { / * 修改发货单分账标记 * * @param signTime */ @Transactional @Modifying @Query(nativeQuery = true, value = "update order_shipping m set m.separate_flag = 1 where m.is_separate_accounts = 0 and m.separate_flag = 0 and m.shipping_type = 'NORMAL' and m.receive_status = 'RECEIVED' and m.sign_time < ?1 " + " and orders in (select id from order_order o where o.seller_company = ?2)") void updateSeparateFlagBySignTime(LocalDateTime signTime, Long sellerCompanyId); @Transactional @Modifying @Query(nativeQuery = true, value = "update order_shipping m set m.is_separate_accounts = 1 where m.id = ?1") void updateIsSeparateAccountsById(Long id); List<Shipping> findAllByShippingTypeAndIsSeparateAccountsAndSeparateFlagAndOrdersSellerCompanyId(ShippingType shippingType, Boolean isSeparateAccounts, Boolean separateFlag, Long companyId); Shipping findFirstByShippingSnAndErpAccountSet(String shippingSn, ErpAccountSet erpAccountSet); }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/common/repository/ShippingRepository.java

package com.yn.bftl.thirdparty.common.repository;

import com.yn.bftl.common.modules.company.entity.ErpAccountSet;
import com.yn.bftl.common.modules.order.entity.Shipping;
import com.yn.bftl.common.modules.order.enums.ShippingType;
import com.yn.bftl.common.modules.order.enums.SyncState;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.List;

/**
 * 发货表Repository
 *
 * @author chendehuihuo
 * @date 2021/11/22
 **/
@Repository
public interface ShippingRepository extends JpaRepository<Shipping, Long> {

/**
     * 修改发货单分账标记
     *
     * @param signTime
     */
    @Transactional
    @Modifying
    @Query(nativeQuery = true, value = "update order_shipping m set m.separate_flag = 1 where m.is_separate_accounts = 0 and m.separate_flag = 0 and m.shipping_type = 'NORMAL' and m.receive_status = 'RECEIVED' and m.sign_time < ?1 " +
            " and orders in (select id from order_order o where o.seller_company = ?2)")
    void updateSeparateFlagBySignTime(LocalDateTime signTime, Long sellerCompanyId);

@Transactional
    @Modifying
    @Query(nativeQuery = true, value = "update order_shipping m set m.is_separate_accounts = 1 where m.id = ?1")
    void updateIsSeparateAccountsById(Long id);

List<Shipping> findAllByShippingTypeAndIsSeparateAccountsAndSeparateFlagAndOrdersSellerCompanyId(ShippingType shippingType, Boolean isSeparateAccounts, Boolean separateFlag, Long companyId);

Shipping findFirstByShippingSnAndErpAccountSetAndDeleteState(String shippingSn, ErpAccountSet erpAccountSet, SyncState syncState);

}

package com.yn.bftl.thirdparty.common.repository;

import com.yn.bftl.common.modules.company.entity.ErpAccountSet;
import com.yn.bftl.common.modules.order.entity.Shipping;
import com.yn.bftl.common.modules.order.enums.ShippingType;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.List;

/**
 * 发货表Repository
 *
 * @author chendehuihuo
 * @date 2021/11/22
 **/
@Repository
public interface ShippingRepository extends JpaRepository<Shipping, Long> {

@Transactional
    @Modifying
    @Query(nativeQuery = true, value = "update order_shipping m set m.is_separate_accounts = 1 where m.id = ?1")
    void updateIsSeparateAccountsById(Long id);

List<Shipping> findAllByShippingTypeAndIsSeparateAccountsAndSeparateFlagAndOrdersSellerCompanyId(ShippingType shippingType, Boolean isSeparateAccounts, Boolean separateFlag, Long companyId);

Shipping findFirstByShippingSnAndErpAccountSet(String shippingSn, ErpAccountSet erpAccountSet);

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/service/impl/U8ShippingServiceImpl.java
package com.yn.bftl.thirdparty.modules.u8.service.impl; import com.yn.bftl.common.modules.company.entity.ErpAccountSet; import com.yn.bftl.common.modules.inventory.entity.Warehouse; import com.yn.bftl.common.modules.order.entity.Order; import com.yn.bftl.common.modules.order.entity.OrderItem; import com.yn.bftl.common.modules.order.entity.Shipping; import com.yn.bftl.common.modules.order.entity.ShippingItem; import com.yn.bftl.common.modules.order.enums.ShippingStatus; import com.yn.bftl.common.modules.order.enums.SyncState; import com.yn.bftl.thirdparty.common.exception.YnceErrorException; import com.yn.bftl.thirdparty.common.repository.; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDetailDTO; import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @Service @Slf4j public class U8ShippingServiceImpl implements U8ShippingService { @Autowired private OrderRepository orderRepository; @Autowired private OrderItemRepository orderItemRepository; @Autowired private WarehouseRepository warehouseRepository; @Autowired private ShippingRepository shippingRepository; @Autowired private ErpAccountSetRepository erpAccountSetRepository; @Transactional public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) { Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn()); if (order == null) { log.error("订单号不存在"); throw new YnceErrorException("订单号不存在"); } ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(shippingSynDataDTO.getErpCode()); if (erpAccountSet == null) { log.error("账套号不存在"); throw new YnceErrorException("账套号不存在"); } Shipping oldShipping = shippingRepository.findFirstByShippingSnAndErpAccountSetAndDeleteState(shippingSynDataDTO.getSn(), erpAccountSet, SyncState.UNSYNCED); if (oldShipping != null) { log.error("该发货单已同步"); throw new YnceErrorException("该发货单已同步"); } Shipping shipping = new Shipping(); BeanUtils.copyProperties(shippingSynDataDTO, shipping); shipping.setOrders(order); shipping.setErpAccountSet(erpAccountSet); List<ShippingItem> shippingItemList = new ArrayList<>(); for (U8ShippingDetailDTO u8ShippingDetailDTO: shippingSynDataDTO.getDetailList()) { OrderItem orderItem = orderItemRepository.findById(Long.parseLong(u8ShippingDetailDTO.getOrderItemId())).orElse(null); if (orderItem == null) { log.error("订单项不存在"); throw new YnceErrorException("订单项不存在"); } ShippingItem shippingItem = new ShippingItem(); BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem); Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode()); if (warehouse == null) { log.error("仓库不存在"); throw new YnceErrorException("仓库不存在"); } shippingItem.setOutWarehouse(warehouse); shippingItem.setShipping(shipping); shippingItemList.add(shippingItem); } shipping.setShippingItem(shippingItemList); shipping.setUpdateState(SyncState.SYNCED); shipping.setDeleteState(SyncState.UNSYNCED); shippingRepository.save(shipping); // 更新订单状态 order.setShippingStatus(ShippingStatus.SHIPPED); orderRepository.saveAndFlush(order); log.error("====================u8同步成功"); } public void unShipping(String shippingSn, String erpCode) { ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(erpCode); if (erpAccountSet == null) { log.error("账套号不存在"); throw new YnceErrorException("账套号不存在"); } Shipping shipping = shippingRepository.findFirstByShippingSnAndErpAccountSetAndDeleteState(shippingSn, erpAccountSet, SyncState.UNSYNCED); if (shipping == null) { log.error("发货单不存在"); throw new YnceErrorException("发货单不存在"); } shipping.setDeleteState(SyncState.SYNCED); shipping.setUpdateState(SyncState.UNSYNCED); shippingRepository.saveAndFlush(shipping); } } package com.yn.bftl.thirdparty.modules.u8.service.impl; import com.yn.bftl.common.modules.company.entity.ErpAccountSet; import com.yn.bftl.common.modules.inventory.entity.Warehouse; import com.yn.bftl.common.modules.order.entity.Order; import com.yn.bftl.common.modules.order.entity.OrderItem; import com.yn.bftl.common.modules.order.entity.Shipping; import com.yn.bftl.common.modules.order.entity.ShippingItem; import com.yn.bftl.common.modules.order.enums.ShippingStatus; import com.yn.bftl.common.modules.order.enums.SyncState; import com.yn.bftl.thirdparty.common.exception.YnceErrorException; import com.yn.bftl.thirdparty.common.repository.; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDetailDTO; import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @Service @Slf4j public class U8ShippingServiceImpl implements U8ShippingService { @Autowired private OrderRepository orderRepository; @Autowired private OrderItemRepository orderItemRepository; @Autowired private WarehouseRepository warehouseRepository; @Autowired private ShippingRepository shippingRepository; @Autowired private ErpAccountSetRepository erpAccountSetRepository; @Transactional public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) { Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn()); if (order == null) { log.error("订单号不存在"); throw new YnceErrorException("订单号不存在"); } ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(shippingSynDataDTO.getErpCode()); if (erpAccountSet == null) { log.error("账套号不存在"); throw new YnceErrorException("账套号不存在"); } Shipping shipping = new Shipping(); BeanUtils.copyProperties(shippingSynDataDTO, shipping); shipping.setOrders(order); shipping.setErpAccountSet(erpAccountSet); List<ShippingItem> shippingItemList = new ArrayList<>(); for (U8ShippingDetailDTO u8ShippingDetailDTO: shippingSynDataDTO.getDetailList()) { OrderItem orderItem = orderItemRepository.findById(Long.parseLong(u8ShippingDetailDTO.getOrderItemId())).orElse(null); if (orderItem == null) { log.error("订单项不存在"); throw new YnceErrorException("订单项不存在"); } ShippingItem shippingItem = new ShippingItem(); BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem); Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode()); if (warehouse == null) { log.error("仓库不存在"); throw new YnceErrorException("仓库不存在"); } shippingItem.setOutWarehouse(warehouse); shippingItem.setShipping(shipping); shippingItemList.add(shippingItem); } shipping.setShippingItem(shippingItemList); shipping.setUpdateState(SyncState.SYNCED); shipping.setDeleteState(SyncState.UNSYNCED); shippingRepository.save(shipping); // 更新订单状态 order.setShippingStatus(ShippingStatus.SHIPPED); orderRepository.saveAndFlush(order); log.error("====================u8同步成功"); } public void unShipping(String shippingSn, String erpCode) { ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(erpCode); if (erpAccountSet == null) { log.error("账套号不存在"); throw new YnceErrorException("账套号不存在"); } Shipping shipping = shippingRepository.findFirstByShippingSnAndErpAccountSet(shippingSn, erpAccountSet); if (shipping == null) { log.error("发货单不存在"); throw new YnceErrorException("发货单不存在"); } shipping.setDeleteState(SyncState.SYNCED); shipping.setUpdateState(SyncState.UNSYNCED); shippingRepository.saveAndFlush(shipping); } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/u8/service/impl/U8ShippingServiceImpl.java

package com.yn.bftl.thirdparty.modules.u8.service.impl;

import com.yn.bftl.common.modules.company.entity.ErpAccountSet;
import com.yn.bftl.common.modules.inventory.entity.Warehouse;
import com.yn.bftl.common.modules.order.entity.Order;
import com.yn.bftl.common.modules.order.entity.OrderItem;
import com.yn.bftl.common.modules.order.entity.Shipping;
import com.yn.bftl.common.modules.order.entity.ShippingItem;
import com.yn.bftl.common.modules.order.enums.ShippingStatus;
import com.yn.bftl.common.modules.order.enums.SyncState;
import com.yn.bftl.thirdparty.common.exception.YnceErrorException;
import com.yn.bftl.thirdparty.common.repository.*;
import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO;
import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDetailDTO;
import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;

@Service
@Slf4j
public class U8ShippingServiceImpl implements U8ShippingService {

@Autowired
    private OrderRepository orderRepository;

@Autowired
    private OrderItemRepository orderItemRepository;

@Autowired
    private WarehouseRepository warehouseRepository;

@Autowired
    private ShippingRepository shippingRepository;

@Autowired
    private ErpAccountSetRepository erpAccountSetRepository;

@Transactional
    public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) {
        Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn());
        if (order == null) {
            log.error("订单号不存在");
            throw new YnceErrorException("订单号不存在");
        }
        ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(shippingSynDataDTO.getErpCode());
        if (erpAccountSet == null) {
            log.error("账套号不存在");
            throw new YnceErrorException("账套号不存在");
        }
        Shipping oldShipping = shippingRepository.findFirstByShippingSnAndErpAccountSetAndDeleteState(shippingSynDataDTO.getSn(), erpAccountSet, SyncState.UNSYNCED);
        if (oldShipping != null) {
            log.error("该发货单已同步");
            throw new YnceErrorException("该发货单已同步");
        }
        Shipping shipping = new Shipping();
        BeanUtils.copyProperties(shippingSynDataDTO, shipping);
        shipping.setOrders(order);
        shipping.setErpAccountSet(erpAccountSet);
        List<ShippingItem> shippingItemList = new ArrayList<>();
        for (U8ShippingDetailDTO u8ShippingDetailDTO: shippingSynDataDTO.getDetailList()) {
            OrderItem orderItem = orderItemRepository.findById(Long.parseLong(u8ShippingDetailDTO.getOrderItemId())).orElse(null);
            if (orderItem == null) {
                log.error("订单项不存在");
                throw new YnceErrorException("订单项不存在");
            }
            ShippingItem shippingItem = new ShippingItem();
            BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem);
            Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode());
            if (warehouse == null) {
                log.error("仓库不存在");
                throw new YnceErrorException("仓库不存在");
            }
            shippingItem.setOutWarehouse(warehouse);
            shippingItem.setShipping(shipping);
            shippingItemList.add(shippingItem);
        }
        shipping.setShippingItem(shippingItemList);
        shipping.setUpdateState(SyncState.SYNCED);
        shipping.setDeleteState(SyncState.UNSYNCED);
        shippingRepository.save(shipping);
        // 更新订单状态
        order.setShippingStatus(ShippingStatus.SHIPPED);
        orderRepository.saveAndFlush(order);
        log.error("====================u8同步成功");
    }

public void unShipping(String shippingSn, String erpCode) {
        ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(erpCode);
        if (erpAccountSet == null) {
            log.error("账套号不存在");
            throw new YnceErrorException("账套号不存在");
        }
        Shipping shipping = shippingRepository.findFirstByShippingSnAndErpAccountSetAndDeleteState(shippingSn, erpAccountSet, SyncState.UNSYNCED);
        if (shipping == null) {
            log.error("发货单不存在");
            throw new YnceErrorException("发货单不存在");
        }

shipping.setDeleteState(SyncState.SYNCED);
        shipping.setUpdateState(SyncState.UNSYNCED);
        shippingRepository.saveAndFlush(shipping);
    }
}

package com.yn.bftl.thirdparty.modules.u8.service.impl;

import java.util.ArrayList;
import java.util.List;

@Service
@Slf4j
public class U8ShippingServiceImpl implements U8ShippingService {

@Autowired
    private OrderRepository orderRepository;

@Autowired
    private OrderItemRepository orderItemRepository;

@Autowired
    private WarehouseRepository warehouseRepository;

@Autowired
    private ShippingRepository shippingRepository;

@Autowired
    private ErpAccountSetRepository erpAccountSetRepository;

@Transactional
    public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) {
        Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn());
        if (order == null) {
            log.error("订单号不存在");
            throw new YnceErrorException("订单号不存在");
        }
        ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(shippingSynDataDTO.getErpCode());
        if (erpAccountSet == null) {
            log.error("账套号不存在");
            throw new YnceErrorException("账套号不存在");
        }
        Shipping shipping = new Shipping();
        BeanUtils.copyProperties(shippingSynDataDTO, shipping);
        shipping.setOrders(order);
        shipping.setErpAccountSet(erpAccountSet);
        List<ShippingItem> shippingItemList = new ArrayList<>();
        for (U8ShippingDetailDTO u8ShippingDetailDTO: shippingSynDataDTO.getDetailList()) {
            OrderItem orderItem = orderItemRepository.findById(Long.parseLong(u8ShippingDetailDTO.getOrderItemId())).orElse(null);
            if (orderItem == null) {
                log.error("订单项不存在");
                throw new YnceErrorException("订单项不存在");
            }
            ShippingItem shippingItem = new ShippingItem();
            BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem);
            Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode());
            if (warehouse == null) {
                log.error("仓库不存在");
                throw new YnceErrorException("仓库不存在");
            }
            shippingItem.setOutWarehouse(warehouse);
            shippingItem.setShipping(shipping);
            shippingItemList.add(shippingItem);
        }
        shipping.setShippingItem(shippingItemList);
        shipping.setUpdateState(SyncState.SYNCED);
        shipping.setDeleteState(SyncState.UNSYNCED);
        shippingRepository.save(shipping);
        // 更新订单状态
        order.setShippingStatus(ShippingStatus.SHIPPED);
        orderRepository.saveAndFlush(order);
        log.error("====================u8同步成功");
    }

public void unShipping(String shippingSn, String erpCode) {
        ErpAccountSet erpAccountSet = erpAccountSetRepository.findFirstByCode(erpCode);
        if (erpAccountSet == null) {
            log.error("账套号不存在");
            throw new YnceErrorException("账套号不存在");
        }
        Shipping shipping = shippingRepository.findFirstByShippingSnAndErpAccountSet(shippingSn, erpAccountSet);
        if (shipping == null) {
            log.error("发货单不存在");
            throw new YnceErrorException("发货单不存在");
        }

shipping.setDeleteState(SyncState.SYNCED);
        shipping.setUpdateState(SyncState.UNSYNCED);
        shippingRepository.saveAndFlush(shipping);
    }
}

Show line notes below