出货单功能实现

yn-bftl-byx / thirdparty

Browse code 出货单功能实现 master
1 parent 2d19b0c commit 60233a559e8d04f3becba653c8e6ee8b095fd83d steven authored on 18 Dec

Patch

Showing 12 changed files

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/repository/InventoryManagementRepository.java 0 → 100644
package com.yn.bftl.thirdparty.common.repository; import com.yn.bftl.common.modules.inventory.entity.InventoryManagement; import com.yn.bftl.common.modules.inventory.entity.Warehouse; 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 org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; /** * InventoryManagementRepository * * @author wangwenliang * @create 2021年4月25日15:39:25 **/ @Repository public interface InventoryManagementRepository extends JpaRepository<InventoryManagement, Long>, JpaSpecificationExecutor<InventoryManagement> { @Modifying @Transactional @Query("update InventoryManagement i set i.availableInventory = i.availableInventory - 1 where i.availableInventory > 0 and i.defaultWarehouse = :warehouse") int subStock(@Param("warehouse") Warehouse warehouse); }

Ignore Space Show notes View

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

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

import com.yn.bftl.common.modules.inventory.entity.InventoryManagement;
import com.yn.bftl.common.modules.inventory.entity.Warehouse;
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 org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;

/**
 * InventoryManagementRepository
 *
 * @author wangwenliang
 * @create 2021年4月25日15:39:25
 **/
@Repository
public interface InventoryManagementRepository extends JpaRepository<InventoryManagement, Long>, JpaSpecificationExecutor<InventoryManagement> {

@Modifying
    @Transactional
    @Query("update InventoryManagement i set i.availableInventory = i.availableInventory - 1 where i.availableInventory > 0 and i.defaultWarehouse = :warehouse")
    int subStock(@Param("warehouse") Warehouse warehouse);

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/repository/WarehouseRepository.java 0 → 100644
package com.yn.bftl.thirdparty.common.repository; import com.yn.bftl.common.modules.company.entity.Company; import com.yn.bftl.common.modules.inventory.entity.Warehouse; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.List; /** * WarehouseRepository * * @author wangwenliang * @create 2021年4月25日15:39:25 / @Repository public interface WarehouseRepository extends JpaRepository<Warehouse, Long> { / * 获取企业的默认仓库 * @param companyId * @return / Warehouse findByCompanyIdAndIsDefaultIsTrue(Long companyId); /* * 获取企业的默认仓库 * @param code * @return / Warehouse findByCode(String code); List<Warehouse> findAllByCompany(Company company); /* * 仓库-列表 * * @param erpCode:ERP编码 * @param erpAccountSetId:ERP账套ID * @return List<Warehouse> * @description 根据ERP编码和企业ID查询 * @author huabiao * @create 2022/5/18 14:31 / List<Warehouse> findAllByErpCodeAndErpAccountSetId(String erpCode, Long erpAccountSetId); /* * 仓库-列表 * * @param erpCode:仓库ERP编码 * @param code:ERP账套编码 * @param orgCode:组织编码 * @return List<Warehouse> * @description 仓库ERP编码+ERP账套编码+组织编码唯一 * @author huabiao * @create 2022/5/18 14:31 / List<Warehouse> findAllByErpCodeAndErpAccountSetCodeAndErpAccountSetOrgCode(String erpCode, String code, String orgCode); /* * 仓库-根据ERP编码查询 * * @param erpCode ERP编码 * @return 仓库列表 * @author huabiao * @create 2023/2/22 16:38 */ List<Warehouse> findAllByErpCode(String erpCode); }

Ignore Space Show notes View

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

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

import com.yn.bftl.common.modules.company.entity.Company;
import com.yn.bftl.common.modules.inventory.entity.Warehouse;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.List;

/**
 * WarehouseRepository
 *
 * @author wangwenliang
 * @create 2021年4月25日15:39:25
 **/
@Repository
public interface WarehouseRepository extends JpaRepository<Warehouse, Long> {

/**
     * 获取企业的默认仓库
     * @param companyId
     * @return
     */
    Warehouse findByCompanyIdAndIsDefaultIsTrue(Long companyId);

/**
     * 获取企业的默认仓库
     * @param code
     * @return
     */
    Warehouse findByCode(String code);

List<Warehouse> findAllByCompany(Company company);

/**
     * 仓库-列表
     *
     * @param erpCode:ERP编码
     * @param erpAccountSetId:ERP账套ID
     * @return List<Warehouse>
     * @description 根据ERP编码和企业ID查询
     * @author huabiao
     * @create 2022/5/18  14:31
     */
    List<Warehouse> findAllByErpCodeAndErpAccountSetId(String erpCode, Long erpAccountSetId);

/**
     * 仓库-列表
     *
     * @param erpCode:仓库ERP编码
     * @param code:ERP账套编码
     * @param orgCode:组织编码
     * @return List<Warehouse>
     * @description 仓库ERP编码+ERP账套编码+组织编码唯一
     * @author huabiao
     * @create 2022/5/18  14:31
     */
    List<Warehouse> findAllByErpCodeAndErpAccountSetCodeAndErpAccountSetOrgCode(String erpCode, String code, String orgCode);
    
    /**
     * 仓库-根据ERP编码查询
     *
     * @param erpCode ERP编码
     * @return 仓库列表
     * @author huabiao
     * @create 2023/2/22  16:38
     */
    List<Warehouse> findAllByErpCode(String erpCode);

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/common/util/IPUtils.java 0 → 100644
package com.yn.bftl.thirdparty.common.util; import com.yn.bftl.thirdparty.common.exception.YnceErrorException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; import java.net.UnknownHostException; /** * IP工具类 * / @Slf4j public class IPUtils { public static void checkWhileIp(String whiteIp) { if (StringUtils.isEmpty(whiteIp)) { throw new YnceErrorException("参数不能为空"); } ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); String ip = IPUtils.getClientIpAddress(requestAttributes.getRequest()); if (StringUtils.isEmpty(ip)) { throw new YnceErrorException("非法IP"); } if (!whiteIp.equals(ip)) { throw new YnceErrorException("非法访问"); } } /* * 获取IP地址 */ public static String getClientIpAddress(HttpServletRequest request) { String ip = null; try { ip = request.getHeader("x-forwarded-for"); if (StringUtils.isEmpty(ip) \|\| "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("Proxy-Client-IP"); } if (StringUtils.isEmpty(ip) \|\| ip.length() == 0 \|\| "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("WL-Proxy-Client-IP"); } if (StringUtils.isEmpty(ip) \|\| "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("HTTP_CLIENT_IP"); } if (StringUtils.isEmpty(ip) \|\| "unknown".equalsIgnoreCase(ip)) { ip = request.getHeader("HTTP_X_FORWARDED_FOR"); } if (StringUtils.isEmpty(ip) \|\| "unknown".equalsIgnoreCase(ip)) { ip = request.getRemoteAddr(); } } catch (Exception e) { log.error("IPUtils ERROR ", e); } return ip; } public static String getServerIpAddress() { try { InetAddress localhost = InetAddress.getLocalHost(); return localhost.getHostAddress(); } catch (UnknownHostException e) { log.error(e.getMessage()); return null; } } public static void main(String[] args) { try { InetAddress localhost = InetAddress.getLocalHost(); String ip = localhost.getHostAddress(); System.out.println("服务端IP地址：" + ip); } catch (UnknownHostException e) { e.printStackTrace(); } } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/common/util/IPUtils.java 0 → 100644

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

import com.yn.bftl.thirdparty.common.exception.YnceErrorException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.UnknownHostException;

/**
 * IP工具类
 *
 */
@Slf4j
public class IPUtils {

public static void checkWhileIp(String whiteIp) {
        if (StringUtils.isEmpty(whiteIp)) {
            throw new YnceErrorException("参数不能为空");
        }
        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
        String ip = IPUtils.getClientIpAddress(requestAttributes.getRequest());
        if (StringUtils.isEmpty(ip)) {
            throw new YnceErrorException("非法IP");
        }
        if (!whiteIp.equals(ip)) {
            throw new YnceErrorException("非法访问");
        }
    }

/**
	 * 获取IP地址
	 */
	public static String getClientIpAddress(HttpServletRequest request) {
    	String ip = null;
        try {
            ip = request.getHeader("x-forwarded-for");
            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
                ip = request.getHeader("Proxy-Client-IP");
            }
            if (StringUtils.isEmpty(ip) || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
                ip = request.getHeader("WL-Proxy-Client-IP");
            }
            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
                ip = request.getHeader("HTTP_CLIENT_IP");
            }
            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
                ip = request.getHeader("HTTP_X_FORWARDED_FOR");
            }
            if (StringUtils.isEmpty(ip) || "unknown".equalsIgnoreCase(ip)) {
                ip = request.getRemoteAddr();
            }
        } catch (Exception e) {
        	log.error("IPUtils ERROR ", e);
        }

return ip;
    }

public static String getServerIpAddress() {
        try {
            InetAddress localhost = InetAddress.getLocalHost();
            return localhost.getHostAddress();
        } catch (UnknownHostException e) {
            log.error(e.getMessage());
            return null;
        }
    }

public static void main(String[] args) {
        try {
            InetAddress localhost = InetAddress.getLocalHost();
            String ip = localhost.getHostAddress();
            System.out.println("服务端IP地址：" + ip);
        } catch (UnknownHostException e) {
            e.printStackTrace();
        }
    }

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/config/U8Properties.java 0 → 100644
package com.yn.bftl.thirdparty.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @Data @ConfigurationProperties(prefix = "debang") @Component public class U8Properties { private String whiteIp; }

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/business/dto/U8ShippingDTO.java 0 → 100644
package com.yn.bftl.thirdparty.modules.business.dto; import com.fasterxml.jackson.annotation.JsonFormat; import com.yn.bftl.common.modules.order.enums.ShippingWay; import lombok.Data; import lombok.EqualsAndHashCode; import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.validation.constraints.NotBlank; import java.time.LocalDateTime; import java.util.List; @Data @EqualsAndHashCode(callSuper = false) public class U8ShippingDTO { /** * 发货单号 / @NotBlank private String shippingSn; /* * 订单号 / @NotBlank private String sn; /* * ERP单号 / @NotBlank private String erpNumber; /* * ERP账套号 / @NotBlank private String erpCode; /* * 发货时间 / @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime shippingTime; // /* // * 签收时间 // / // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") // private LocalDateTime signTime; /* * 发货方式 / @NotBlank @Enumerated(EnumType.STRING) private ShippingWay shippingWay; // /* // * 订单总额 // / // @NotBlank // private BigDecimal amount = BigDecimal.ZERO; // /* // * 收货状态 // / // @NotBlank // @Enumerated(EnumType.STRING) // private ReceiveStatus receiveStatus; /* * 物流公司 / @NotBlank private String deliveryCorp; // /* // * 物流公司编码 // / // @NotBlank // private String deliveryCorpCode; // /* // * 货运公司 // / // private String freightCompany; /* * 收货人名称 / @NotBlank private String consigneeName; /* * 收货人电话 / @NotBlank private String consigneePhone; /* * 收货人地址 / @NotBlank private String consigneeAddr; // /* // * 收货人地区 // / // private String consigneeArea; /* * 发货单项明细列表 */ private List<U8ShippingDetailDTO> detailList; }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/business/dto/U8ShippingDTO.java 0 → 100644

package com.yn.bftl.thirdparty.modules.business.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.yn.bftl.common.modules.order.enums.ShippingWay;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.List;

@Data
@EqualsAndHashCode(callSuper = false)
public class U8ShippingDTO {

/**
     * 发货单号
     */
    @NotBlank
    private String shippingSn;

/**
     * 订单号
     */
    @NotBlank
    private String sn;

/**
     * ERP单号
     */
    @NotBlank
    private String erpNumber;

/**
     * ERP账套号
     */
    @NotBlank
    private String erpCode;

/**
     * 发货时间
     */
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime shippingTime;

//    /**
//     * 签收时间
//     */
//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
//    private LocalDateTime signTime;

/**
     * 发货方式
     */
    @NotBlank
    @Enumerated(EnumType.STRING)
    private ShippingWay shippingWay;

//    /**
//     * 订单总额
//     */
//    @NotBlank
//    private BigDecimal amount = BigDecimal.ZERO;

//    /**
//     * 收货状态
//     */
//    @NotBlank
//    @Enumerated(EnumType.STRING)
//    private ReceiveStatus receiveStatus;

/**
     * 物流公司
     */
    @NotBlank
    private String deliveryCorp;

//    /**
//     * 物流公司编码
//     */
//    @NotBlank
//    private String deliveryCorpCode;

//    /**
//     * 货运公司
//     */
//    private String freightCompany;

/**
     * 收货人名称
     */
    @NotBlank
    private String consigneeName;

/**
     * 收货人电话
     */
    @NotBlank
    private String consigneePhone;

/**
     * 收货人地址
     */
    @NotBlank
    private String consigneeAddr;

//    /**
//     * 收货人地区
//     */
//    private String consigneeArea;

/**
     * 发货单项明细列表
     */
    private List<U8ShippingDetailDTO> detailList;

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/business/dto/U8ShippingDetailDTO.java 0 → 100644
package com.yn.bftl.thirdparty.modules.business.dto; import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; @Data public class U8ShippingDetailDTO { /** * 订单项ID / @NotBlank private String orderItemId; /* * ERP行ID / @NotBlank private String erpLineId; /* * 出库的仓库编码 / @NotBlank private String code; /* * 单价 / @NotBlank private BigDecimal price = BigDecimal.ZERO; /* * 销售数量 / @NotBlank private Integer quantity = 0; /* * 金额 / @NotBlank private BigDecimal amount = BigDecimal.ZERO; /* * 商品名称 / @NotBlank private String goodsName; /* * 计量单位 / @NotBlank private String unit; /* * 发货数量 / @NotBlank private Integer shippingQuantity = 0; /* * 商品编码 / @NotBlank private String goodsCode; /* * 备注 */ private String remark; }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/business/dto/U8ShippingDetailDTO.java 0 → 100644

package com.yn.bftl.thirdparty.modules.business.dto;

import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;

@Data
public class U8ShippingDetailDTO {

/**
     * 订单项ID
     */
    @NotBlank
    private String orderItemId;

/**
     * ERP行ID
     */
    @NotBlank
    private String erpLineId;

/**
     * 出库的仓库编码
     */
    @NotBlank
    private String code;

/**
     * 单价
     */
    @NotBlank
    private BigDecimal price = BigDecimal.ZERO;

/**
     * 销售数量
     */
    @NotBlank
    private Integer quantity = 0;

/**
     * 金额
     */
    @NotBlank
    private BigDecimal amount = BigDecimal.ZERO;

/**
     * 商品名称
     */
    @NotBlank
    private String goodsName;

/**
     * 计量单位
     */
    @NotBlank
    private String unit;

/**
     * 发货数量
     */
    @NotBlank
    private Integer shippingQuantity = 0;

/**
     * 商品编码
     */
    @NotBlank
    private String goodsCode;

/**
     * 备注
     */
    private String remark;

}

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/U8ResponseVO.java 0 → 100644
package com.yn.bftl.thirdparty.modules.u8; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "U8ResponseVO", description = "U8接口响应VO") public class U8ResponseVO { private String code; private String data; private String errorMessage; public U8ResponseVO success() { this.code = "200"; return this; } public U8ResponseVO error(String errorMessage) { this.errorMessage = errorMessage; this.code = "500"; return this; } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/u8/U8ResponseVO.java 0 → 100644

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/controller/U8ShippingController.java 0 → 100644
package com.yn.bftl.thirdparty.modules.u8.controller; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @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) { IPUtils.checkWhileIp(u8Properties.getWhiteIp()); if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) { throw new YnceErrorException("订单项数据不能为空"); } u8ShippingService.saveU8SynData(shippingSynDataDTO); } }

Ignore Space Show notes View

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

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

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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

@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) {
        IPUtils.checkWhileIp(u8Properties.getWhiteIp());
        if (CollectionUtils.isEmpty(shippingSynDataDTO.getDetailList())) {
            throw new YnceErrorException("订单项数据不能为空");
        }

u8ShippingService.saveU8SynData(shippingSynDataDTO);
    }

}

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

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/u8/service/impl/U8ShippingServiceImpl.java 0 → 100644
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.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) { 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) { throw new YnceErrorException("订单项不存在"); } ShippingItem shippingItem = new ShippingItem(); BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem); Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode()); if (warehouse == null) { throw new YnceErrorException("仓库不存在"); } shippingItem.setOutWarehouse(warehouse); shippingItem.setShipping(shipping); shippingItemList.add(shippingItem); } shipping.setShippingItem(shippingItemList); shippingRepository.save(shipping); // 更新订单状态 order.setShippingStatus(ShippingStatus.SHIPPED); orderRepository.saveAndFlush(order); } }

Ignore Space Show notes View

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

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.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) {
            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) {
                throw new YnceErrorException("订单项不存在");
            }
            ShippingItem shippingItem = new ShippingItem();
            BeanUtils.copyProperties(u8ShippingDetailDTO, shippingItem);
            Warehouse warehouse = warehouseRepository.findByCode(u8ShippingDetailDTO.getCode());
            if (warehouse == null) {
                throw new YnceErrorException("仓库不存在");
            }
            shippingItem.setOutWarehouse(warehouse);
            shippingItem.setShipping(shipping);
            shippingItemList.add(shippingItem);
        }
        shipping.setShippingItem(shippingItemList);
        shippingRepository.save(shipping);
        // 更新订单状态
        order.setShippingStatus(ShippingStatus.SHIPPED);
        orderRepository.saveAndFlush(order);
    }
}

Ignore Space Show notes View src/main/resources/application-dev.yml
server: port: 8002 spring: config: activate: on-profile: dev servlet: multipart: enabled: true max-file-size: 50MB max-request-size: 50MB datasource: driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://rm-wz9v86640axofea90.mysql.rds.aliyuncs.com:3306/app_huabiao_yn_bftl_develop_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: app_huabiao # password: Asdf123!@# url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: baiyexing password: baiyexing@@1234 hikari: maximum-pool-size: 50 minimum-idle: 2 idle-timeout: 30000 max-lifetime: 360000 # 设置最大生命周期为6分钟 connection-timeout: 20000 # 默认30s，连接超时会报异常 # connection-test-query: SELECT 1 # 连接有效性检查查询 jpa: hibernate: ddlAuto: none showSql: false properties: hibernate: session_factory: interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor redis: database: 14 host: 182.44.68.187 port: 16379 pool: max-active: 8 max-wait: 1 max-idle: 8 min-idle: 0 timeout: 20000 password: baiyexing@123456 # rabbitmq: # host: localhost # port: 5672 # username: bftl # password: YnceRabbitmq0319 # virtual-host: /bftl # data: # mongodb: # repositories: # type: none # elasticsearch: # repositories: # enabled: false file: basePath: /root/files urlPath: http://hypass.file.yn-ce.com:8088/bftl/ qiniu: accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0 bucketName: bftl domain: files: http://files.bftl.yn-ce.com video: http://video.bftl.yn-ce.com image: xxxx proxy: host: 10.27.182.59 port: 18889 u8: whiteIp: 182.44.69.33 server: port: 8002 spring: config: activate: on-profile: dev servlet: multipart: enabled: true max-file-size: 50MB max-request-size: 50MB datasource: driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://rm-wz9v86640axofea90.mysql.rds.aliyuncs.com:3306/app_huabiao_yn_bftl_develop_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: app_huabiao # password: Asdf123!@# url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: baiyexing password: baiyexing@@1234 hikari: maximum-pool-size: 50 minimum-idle: 2 idle-timeout: 30000 max-lifetime: 360000 # 设置最大生命周期为6分钟 connection-timeout: 20000 # 默认30s，连接超时会报异常 # connection-test-query: SELECT 1 # 连接有效性检查查询 jpa: hibernate: ddlAuto: none showSql: false properties: hibernate: session_factory: interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor redis: database: 14 host: 182.44.68.187 port: 16379 pool: max-active: 8 max-wait: 1 max-idle: 8 min-idle: 0 timeout: 20000 password: baiyexing@123456 # rabbitmq: # host: localhost # port: 5672 # username: bftl # password: YnceRabbitmq0319 # virtual-host: /bftl # data: # mongodb: # repositories: # type: none # elasticsearch: # repositories: # enabled: false file: basePath: /root/files urlPath: http://hypass.file.yn-ce.com:8088/bftl/ qiniu: accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0 bucketName: bftl domain: files: http://files.bftl.yn-ce.com video: http://video.bftl.yn-ce.com image: xxxx proxy: host: 10.27.182.59 port: 18889

Ignore Space Show notes View

src/main/resources/application-dev.yml

server:
  port: 8002
spring:
  config:
    activate:
      on-profile: dev
  servlet:
    multipart:
      enabled: true
      max-file-size: 50MB
      max-request-size: 50MB
  datasource:
    driverClassName: com.mysql.cj.jdbc.Driver
#    url: jdbc:mysql://rm-wz9v86640axofea90.mysql.rds.aliyuncs.com:3306/app_huabiao_yn_bftl_develop_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    username: app_huabiao
#    password: Asdf123!@#
    url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: baiyexing
    password: baiyexing@@1234
    hikari:
      maximum-pool-size: 50
      minimum-idle: 2
      idle-timeout: 30000
      max-lifetime: 360000 # 设置最大生命周期为6分钟
      connection-timeout: 20000 # 默认30s，连接超时会报异常
#      connection-test-query: SELECT 1 # 连接有效性检查查询
  jpa:
    hibernate:
      ddlAuto: none
    showSql: false
    properties:
      hibernate:
        session_factory:
          interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor
  redis:
    database: 14
    host: 182.44.68.187
    port: 16379
    pool:
      max-active: 8
      max-wait: 1
      max-idle: 8
      min-idle: 0
    timeout: 20000
    password: baiyexing@123456
#  rabbitmq:
#    host: localhost
#    port: 5672
#    username: bftl
#    password: YnceRabbitmq0319
#    virtual-host: /bftl
#  data:
#    mongodb:
#      repositories:
#        type: none
#    elasticsearch:
#      repositories:
#        enabled: false
file:
  basePath: /root/files
  urlPath: http://hypass.file.yn-ce.com:8088/bftl/
qiniu:
  accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg
  secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0
  bucketName: bftl
  domain:
    files: http://files.bftl.yn-ce.com
    video: http://video.bftl.yn-ce.com
    image: xxxx
proxy:
  host: 10.27.182.59
  port: 18889

u8:
  whiteIp: 182.44.69.33

Ignore Space Show notes View src/main/resources/application-local.yml
server: port: 8002 spring: config: activate: on-profile: local servlet: multipart: enabled: true max-file-size: 50MB max-request-size: 50MB datasource: driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://rm-wz9v86640axofea909o.mysql.rds.aliyuncs.com:3306/app_jing_yn_bftl_byx_master_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: app_jing # password: Asdf123!@# # url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: baiyexing # password: baiyexing@@1234 url: jdbc:mysql://localhost:3306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 hikari: maximum-pool-size: 100 minimum-idle: 1 idle-timeout: 30000 max-lifetime: 3600000 # 设置最大生命周期为60分钟 connection-test-query: SELECT 1 # 连接有效性检查查询 jpa: hibernate: ddlAuto: none showSql: false properties: hibernate: session_factory: interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor redis: database: 14 # host: 120.76.99.226 host: localhost port: 6379 pool: max-active: 8 max-wait: 1 max-idle: 8 min-idle: 0 timeout: 20000 password: # rabbitmq: # host: 120.76.99.226 # port: 5672 # username: bftl # password: YnceRabbitmq0319 # virtual-host: /bftl # data: # mongodb: # repositories: # type: none # elasticsearch: # repositories: # enabled: false file: basePath: /root/files urlPath: http://hypass.file.yn-ce.com:8088/bftl/ qiniu: accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0 bucketName: bftl domain: files: http://files.bftl.yn-ce.com video: http://video.bftl.yn-ce.com image: xxxx proxy: host: 10.27.182.59 port: 18889 u8: whiteIp: 182.44.69.33 server: port: 8002 spring: config: activate: on-profile: local servlet: multipart: enabled: true max-file-size: 50MB max-request-size: 50MB datasource: driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://rm-wz9v86640axofea909o.mysql.rds.aliyuncs.com:3306/app_jing_yn_bftl_byx_master_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: app_jing # password: Asdf123!@# # url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai # username: baiyexing # password: baiyexing@@1234 url: jdbc:mysql://localhost:3306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 jpa: hibernate: ddlAuto: none showSql: false properties: hibernate: session_factory: interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor redis: database: 14 # host: 120.76.99.226 host: localhost port: 6379 pool: max-active: 8 max-wait: 1 max-idle: 8 min-idle: 0 timeout: 20000 password: # rabbitmq: # host: 120.76.99.226 # port: 5672 # username: bftl # password: YnceRabbitmq0319 # virtual-host: /bftl # data: # mongodb: # repositories: # type: none # elasticsearch: # repositories: # enabled: false file: basePath: /root/files urlPath: http://hypass.file.yn-ce.com:8088/bftl/ qiniu: accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0 bucketName: bftl domain: files: http://files.bftl.yn-ce.com video: http://video.bftl.yn-ce.com image: xxxx proxy: host: 10.27.182.59 port: 18889

Ignore Space Show notes View

src/main/resources/application-local.yml

server:
  port: 8002
spring:
  config:
    activate:
      on-profile: local
  servlet:
    multipart:
      enabled: true
      max-file-size: 50MB
      max-request-size: 50MB
  datasource:
    driverClassName: com.mysql.cj.jdbc.Driver
#    url: jdbc:mysql://rm-wz9v86640axofea909o.mysql.rds.aliyuncs.com:3306/app_jing_yn_bftl_byx_master_dev?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    username: app_jing
#    password: Asdf123!@#
#    url: jdbc:mysql://182.44.68.187:13306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
#    username: baiyexing
#    password: baiyexing@@1234
    url: jdbc:mysql://localhost:3306/baiyexing?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    hikari:
      maximum-pool-size: 100
      minimum-idle: 1
      idle-timeout: 30000
      max-lifetime: 3600000 # 设置最大生命周期为60分钟
      connection-test-query: SELECT 1 # 连接有效性检查查询

jpa:
    hibernate:
      ddlAuto: none
    showSql: false
    properties:
      hibernate:
        session_factory:
          interceptor: com.yn.bftl.thirdparty.interceptor.AuditInterceptor
  redis:
    database: 14
#    host: 120.76.99.226
    host: localhost
    port: 6379
    pool:
      max-active: 8
      max-wait: 1
      max-idle: 8
      min-idle: 0
    timeout: 20000
    password:
#  rabbitmq:
#    host: 120.76.99.226
#    port: 5672
#    username: bftl
#    password: YnceRabbitmq0319
#    virtual-host: /bftl
#  data:
#    mongodb:
#      repositories:
#        type: none
#    elasticsearch:
#      repositories:
#        enabled: false
file:
  basePath: /root/files
  urlPath: http://hypass.file.yn-ce.com:8088/bftl/
qiniu:
  accessKey: Vo_jAis-RYsjC7n9pGTtTh2Oa6wtkyq52aiLaiyg
  secretKey: jyYMQfpcA4naN-Pxsxr-UgBHubtr_nK-Y4HQzun0
  bucketName: bftl
  domain:
    files: http://files.bftl.yn-ce.com
    video: http://video.bftl.yn-ce.com
    image: xxxx
proxy:
  host: 10.27.182.59
  port: 18889
u8:
  whiteIp: 182.44.69.33

Show line notes below