修复bug

yn-bftl-byx / thirdparty

Browse code 修复bug master
1 parent 7882300 commit fa0fe79f8e1aac7304e0492053bdb047478c37f5 steven authored on 19 Dec

Patch

Showing 5 changed files

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/repository/ErpAccountSetRepository.java 0 → 100644
package com.yn.bftl.thirdparty.common.repository; import com.yn.bftl.common.modules.company.entity.ErpAccountSet; import com.yn.bftl.common.modules.relation.entity.CreditList; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; import java.util.List; /** * ERP账套Repository * * @author huabiao * @create 2022/4/18 14:36 / @Repository public interface ErpAccountSetRepository extends JpaRepository<ErpAccountSet, Long>, JpaSpecificationExecutor<CreditList> { / * ERP账套-查询 * * @param companyId:企业ID * @return ErpAccountSet * @description 根据企业ID查询默认账套 * @author huabiao * @create 2022/4/18 14:40 / ErpAccountSet findByCompanyIdAndIsDefaultTrue(Long companyId); /* * ERP账套-根据企业获取第一条 * * @param companyId * @return / ErpAccountSet findFirstByCompanyId(Long companyId); /* * ERP账套-查询 * * @param code:账套编码 * @param orgCode:组织编码 * @return List<ErpAccountSet> * @description 根据账套编码和组织编码查询ERP账套 * @author huabiao * @create 2022/5/11 10:09 / List<ErpAccountSet> findAllByCodeAndOrgCode(String code, String orgCode); ErpAccountSet findFirstByCode(String code); /* * ERP账套-根据供货组织编码查询 * * @param supplyOrgCode 供货组织编码 * @return ERP账套 * @author huabiao * @create 2023/5/31 14:44 */ ErpAccountSet findFirstBySupplyOrgCode(String supplyOrgCode); List<ErpAccountSet> findAllByCompanyId(Long companyId); }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/common/repository/ErpAccountSetRepository.java 0 → 100644

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

import com.yn.bftl.common.modules.company.entity.ErpAccountSet;
import com.yn.bftl.common.modules.relation.entity.CreditList;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Repository;

import java.util.List;

/**
 * ERP账套Repository
 *
 * @author huabiao
 * @create 2022/4/18  14:36
 **/
@Repository
public interface ErpAccountSetRepository extends JpaRepository<ErpAccountSet, Long>, JpaSpecificationExecutor<CreditList> {

/**
     * ERP账套-查询
     *
     * @param companyId:企业ID
     * @return ErpAccountSet
     * @description 根据企业ID查询默认账套
     * @author huabiao
     * @create 2022/4/18  14:40
     */
    ErpAccountSet findByCompanyIdAndIsDefaultTrue(Long companyId);

/**
     * ERP账套-根据企业获取第一条
     *
     * @param companyId
     * @return
     */
    ErpAccountSet findFirstByCompanyId(Long companyId);

/**
     * ERP账套-查询
     *
     * @param code:账套编码
     * @param orgCode:组织编码
     * @return List<ErpAccountSet>
     * @description 根据账套编码和组织编码查询ERP账套
     * @author huabiao
     * @create 2022/5/11  10:09
     */
    List<ErpAccountSet> findAllByCodeAndOrgCode(String code, String orgCode);

ErpAccountSet findFirstByCode(String code);

/**
     * ERP账套-根据供货组织编码查询
     *
     * @param supplyOrgCode 供货组织编码
     * @return ERP账套
     * @author huabiao
     * @create 2023/5/31  14:44
     */
    ErpAccountSet findFirstBySupplyOrgCode(String supplyOrgCode);

List<ErpAccountSet> findAllByCompanyId(Long companyId);
}

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 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); } package com.yn.bftl.thirdparty.common.repository; 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 findFirstByShippingSn(String shippingSn); }

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 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);

}

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

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 findFirstByShippingSn(String shippingSn);

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/controller/U8ShippingController.java
package com.yn.bftl.thirdparty.modules.u8.controller; import com.alibaba.fastjson.JSON; import com.yn.bftl.thirdparty.common.exception.YnceErrorException; import com.yn.bftl.thirdparty.common.util.IPUtils; import com.yn.bftl.thirdparty.config.U8Properties; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.; import javax.validation.Valid; import javax.validation.constraints.NotBlank; @Slf4j @RestController @RequestMapping("/u8") public class U8ShippingController { @Autowired private U8Properties u8Properties; @Autowired private U8ShippingService u8ShippingService; @RequestMapping(value = "/shipping", method = RequestMethod.POST) public void shipping(@RequestBody U8ShippingDTO shippingSynDataDTO) { log.info("=======================================u8请求参数" + JSON.toJSONString(shippingSynDataDTO)); IPUtils.checkWhileIp(u8Properties.getWhiteIp()); if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) { log.error("订单项数据不能为空"); throw new YnceErrorException("订单项数据不能为空"); } u8ShippingService.saveU8SynData(shippingSynDataDTO); } @RequestMapping(value = "/shipping", method = RequestMethod.DELETE) public void unShipping(String shippingSn, String erpCode) { log.info("=======================================u8请求参数:" + shippingSn); if (StringUtils.isEmpty(shippingSn)) { throw new YnceErrorException("参数不正确"); } IPUtils.checkWhileIp(u8Properties.getWhiteIp()); // if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) { // log.error("订单项数据不能为空"); // throw new YnceErrorException("订单项数据不能为空"); // } u8ShippingService.unShipping(shippingSn, erpCode); } } package com.yn.bftl.thirdparty.modules.u8.controller; import com.alibaba.fastjson.JSON; import com.yn.bftl.thirdparty.common.exception.YnceErrorException; import com.yn.bftl.thirdparty.common.util.IPUtils; import com.yn.bftl.thirdparty.config.U8Properties; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.; import javax.validation.Valid; import javax.validation.constraints.NotBlank; @Slf4j @RestController @RequestMapping("/u8") public class U8ShippingController { @Autowired private U8Properties u8Properties; @Autowired private U8ShippingService u8ShippingService; @RequestMapping(value = "/shipping", method = RequestMethod.POST) public void shipping(@RequestBody U8ShippingDTO shippingSynDataDTO) { log.info("=======================================u8请求参数" + JSON.toJSONString(shippingSynDataDTO)); IPUtils.checkWhileIp(u8Properties.getWhiteIp()); if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) { log.error("订单项数据不能为空"); throw new YnceErrorException("订单项数据不能为空"); } u8ShippingService.saveU8SynData(shippingSynDataDTO); } @RequestMapping(value = "/shipping", method = RequestMethod.DELETE) public void unShipping(@RequestParam String shippingSn) { log.info("=======================================u8请求参数:" + shippingSn); if (StringUtils.isEmpty(shippingSn)) { throw new YnceErrorException("参数不正确"); } IPUtils.checkWhileIp(u8Properties.getWhiteIp()); // if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) { // log.error("订单项数据不能为空"); // throw new YnceErrorException("订单项数据不能为空"); // } u8ShippingService.unShipping(shippingSn); } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/u8/controller/U8ShippingController.java

package com.yn.bftl.thirdparty.modules.u8.controller;

import com.alibaba.fastjson.JSON;
import com.yn.bftl.thirdparty.common.exception.YnceErrorException;
import com.yn.bftl.thirdparty.common.util.IPUtils;
import com.yn.bftl.thirdparty.config.U8Properties;
import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO;
import com.yn.bftl.thirdparty.modules.u8.service.U8ShippingService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import javax.validation.constraints.NotBlank;

@Slf4j
@RestController
@RequestMapping("/u8")
public class U8ShippingController {

@Autowired
    private U8Properties u8Properties;

@Autowired
    private U8ShippingService u8ShippingService;

@RequestMapping(value = "/shipping", method = RequestMethod.POST)
    public void shipping(@RequestBody U8ShippingDTO shippingSynDataDTO) {
        log.info("=======================================u8请求参数" + JSON.toJSONString(shippingSynDataDTO));
        IPUtils.checkWhileIp(u8Properties.getWhiteIp());
        if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) {
            log.error("订单项数据不能为空");
            throw new YnceErrorException("订单项数据不能为空");
        }

u8ShippingService.saveU8SynData(shippingSynDataDTO);
    }

@RequestMapping(value = "/shipping", method = RequestMethod.DELETE)
    public void unShipping(String shippingSn, String erpCode) {
        log.info("=======================================u8请求参数:" + shippingSn);
        if (StringUtils.isEmpty(shippingSn)) {
            throw new YnceErrorException("参数不正确");
        }
        IPUtils.checkWhileIp(u8Properties.getWhiteIp());
//        if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) {
//            log.error("订单项数据不能为空");
//            throw new YnceErrorException("订单项数据不能为空");
//        }

u8ShippingService.unShipping(shippingSn, erpCode);
    }

}

package com.yn.bftl.thirdparty.modules.u8.controller;

import javax.validation.Valid;
import javax.validation.constraints.NotBlank;

@Slf4j
@RestController
@RequestMapping("/u8")
public class U8ShippingController {

@Autowired
    private U8Properties u8Properties;

@Autowired
    private U8ShippingService u8ShippingService;

u8ShippingService.saveU8SynData(shippingSynDataDTO);
    }

@RequestMapping(value = "/shipping", method = RequestMethod.DELETE)
    public void unShipping(@RequestParam String shippingSn) {
        log.info("=======================================u8请求参数:" + shippingSn);
        if (StringUtils.isEmpty(shippingSn)) {
            throw new YnceErrorException("参数不正确");
        }
        IPUtils.checkWhileIp(u8Properties.getWhiteIp());
//        if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) {
//            log.error("订单项数据不能为空");
//            throw new YnceErrorException("订单项数据不能为空");
//        }

u8ShippingService.unShipping(shippingSn);
    }

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/service/U8ShippingService.java
package com.yn.bftl.thirdparty.modules.u8.service; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; public interface U8ShippingService { void saveU8SynData(U8ShippingDTO shippingSynDataDTO); void unShipping(String shippingSn, String erpCode); } package com.yn.bftl.thirdparty.modules.u8.service; import com.yn.bftl.thirdparty.modules.business.dto.U8ShippingDTO; public interface U8ShippingService { void saveU8SynData(U8ShippingDTO shippingSynDataDTO); void unShipping(String shippingSn); }

Ignore Space Show notes View

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

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 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); } } package com.yn.bftl.thirdparty.modules.u8.service.impl; 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; @Transactional public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) { Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn()); if (order == null) { log.error("订单号不存在"); throw new YnceErrorException("订单号不存在"); } Shipping shipping = new Shipping(); BeanUtils.copyProperties(shippingSynDataDTO, shipping); shipping.setOrders(order); 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) { Shipping shipping = shippingRepository.findFirstByShippingSn(shippingSn); if (shipping == null) { log.error("发货单不存在"); throw new YnceErrorException("发货单不存在"); } shipping.setDeleteState(SyncState.SYNCED); 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 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);
    }
}

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

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;

@Transactional
    public void saveU8SynData(U8ShippingDTO shippingSynDataDTO) {
        Order order = orderRepository.findFirstBySn(shippingSynDataDTO.getSn());
        if (order == null) {
            log.error("订单号不存在");
            throw new YnceErrorException("订单号不存在");
        }
        Shipping shipping = new Shipping();
        BeanUtils.copyProperties(shippingSynDataDTO, shipping);
        shipping.setOrders(order);
        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) {
        Shipping shipping = shippingRepository.findFirstByShippingSn(shippingSn);
        if (shipping == null) {
            log.error("发货单不存在");
            throw new YnceErrorException("发货单不存在");
        }
        shipping.setDeleteState(SyncState.SYNCED);
        shippingRepository.saveAndFlush(shipping);
    }
}

Show line notes below