diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java deleted file mode 100644 index 60cea5ec..00000000 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/deliver/ISaDeliverServiceApi.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.sale.deliver; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.SaDeliverExt; - -import java.util.List; - -/** - * @Description: 发货单相关dubbo接口 - * @Author: jiang chao - * @Time: 2023/12/19 14:27 - * @Classname: ISaDeliverServiceApi - * @PackageName: com.hzs.sale.deliver - */ -public interface ISaDeliverServiceApi { - - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 -- 非必传 - * @return - */ - R> queryDeliverList(List idList, Integer pkCountry); - -} diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java index 5135f745..ea1e5a87 100644 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java +++ b/bd-api/bd-api-sale/src/main/java/com/hzs/sale/pub/ISaleApprovalServiceApi.java @@ -5,11 +5,7 @@ import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; /** - * @Description: 统一的销售服务回调审批成功入口 - * @Author: sui q - * @Time: 2022/10/25 13:45 - * @Classname: ISaleApprovalServiceApi - * @PackageName: com.hzs.sale.pub + * 统一的销售服务回调审批成功入口 */ public interface ISaleApprovalServiceApi { @@ -17,9 +13,6 @@ public interface ISaleApprovalServiceApi { * 提供销售模块统一的审核回调方法 * * @param approvalBusinessResultDTO - * @return: void - * @Author: sui q - * @Date: 2022/10/22 14:48 */ R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO); diff --git a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java b/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java deleted file mode 100644 index 028bdea4..00000000 --- a/bd-api/bd-api-scm/src/main/java/com/hzs/scm/pub/dto/DeliverDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.scm.pub.dto; - -import com.hzs.system.sys.dto.LoginUser; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description: 发货推送MQ数据 - * @Author: jiang chao - * @Time: 2023/12/19 14:16 - * @Classname: DeliverDTO - * @PackageName: com.hzs.scm.pub.dto - */ -@NoArgsConstructor -@AllArgsConstructor -@Builder -@Data -public class DeliverDTO implements Serializable { - - /** - * 发货单ID列表 - */ - private List deliverIdList; - - /** - * 登录用户 - */ - private LoginUser loginUser; - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java index 9dd4e646..a70bea67 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/mapper/SaDeliverMapper.java @@ -2,7 +2,6 @@ package com.hzs.sale.deliver.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.sale.deliver.SaDeliver; -import com.hzs.common.domain.sale.ext.SaDeliverExt; import com.hzs.sale.deliver.param.DeliverParam; import com.hzs.sale.deliver.vo.DeliverPrintNewVO; import com.hzs.sale.deliver.vo.DeliverPrintVO; @@ -13,21 +12,9 @@ import java.util.List; /** * 销售订单-发货单 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface SaDeliverMapper extends BaseMapper { - /** - * 出货单打印校验 - * - * @param idList 发货单ID列表 - * @param pkCountry 国家ID - * @return - */ - List deliverPrintCheck(@Param("idList") List idList, @Param("pkCountry") Integer pkCountry); - /** * 出货单打印列表 * @@ -117,15 +104,6 @@ public interface SaDeliverMapper extends BaseMapper { */ List queryListById(@Param("idList") List idList, @Param("pkCountry") Integer pkCountry); - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryDeliverAndItemsList(@Param("idList") List idList, @Param("pkCountry") Integer pkCountry); - /** * 获取指定日期最大批次 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java deleted file mode 100644 index 6c8759ef..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/provider/SaDeliverServiceProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.sale.deliver.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.SaDeliverExt; -import com.hzs.sale.deliver.ISaDeliverServiceApi; -import com.hzs.sale.deliver.service.ISaDeliverService; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * @Description: 发货单相关dubbo服务 - * @Author: jiang chao - * @Time: 2023/12/19 14:28 - * @Classname: SaDeliverServiceProvider - * @PackageName: com.hzs.sale.deliver.provider - */ -@Slf4j -@DubboService -public class SaDeliverServiceProvider implements ISaDeliverServiceApi { - - @Autowired - private ISaDeliverService iSaDeliverService; - - @Override - public R> queryDeliverList(List idList, Integer pkCountry) { - try { - return R.ok(iSaDeliverService.queryDeliverAndItemsList(idList, pkCountry)); - } catch (Exception e) { - log.error("查询发货单及明细数据异常:{}", e.getMessage(), e); - return R.fail(e.getMessage()); - } - } - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java index 79d46be9..3362d14d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/ISaDeliverService.java @@ -18,9 +18,6 @@ import java.util.List; /** * 销售订单-发货单 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ISaDeliverService extends IService { @@ -44,15 +41,6 @@ public interface ISaDeliverService extends IService { */ List queryDeliverHandledList(DeliverHandledParam param, Integer pkCountry); - /** - * 出货单打印校验 - * - * @param idList 发货单ID列表 - * @param pkCountry 国家ID - * @return - */ - List deliverPrintCheck(List idList, Integer pkCountry); - /** * 发货单打印 * @@ -159,15 +147,6 @@ public interface ISaDeliverService extends IService { */ List queryListById(List idList, Integer pkCountry); - /** - * 查询发货单+明细列表 - * - * @param idList 发货单ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryDeliverAndItemsList(List idList, Integer pkCountry); - /** * 获取批量最大数量 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java index 534b92f0..1290e149 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/service/impl/SaDeliverServiceImpl.java @@ -11,7 +11,6 @@ import com.hzs.common.core.utils.StringUtils; import com.hzs.common.domain.sale.deliver.SaDeliver; import com.hzs.common.domain.sale.deliver.SaDeliverBarCode; import com.hzs.common.domain.sale.deliver.SaDeliverItems; -import com.hzs.common.domain.sale.ext.SaDeliverExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.common.util.TransactionUtils; @@ -32,7 +31,6 @@ import com.hzs.system.base.IBarCodeServiceApi; import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,9 +41,6 @@ import java.util.stream.Collectors; /** * 销售订单-发货单 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Slf4j @Service @@ -235,11 +230,6 @@ public class SaDeliverServiceImpl extends ServiceImpl deliverPrintCheck(List idList, Integer pkCountry) { - return baseMapper.deliverPrintCheck(idList, pkCountry); - } - @Transactional(rollbackFor = Exception.class) @Override public List deliverPrint(List idList, Integer pkCountry, Long userId) { @@ -516,11 +506,6 @@ public class SaDeliverServiceImpl extends ServiceImpl queryDeliverAndItemsList(List idList, Integer pkCountry) { - return baseMapper.queryDeliverAndItemsList(idList, pkCountry); - } - @Override public int getBatchMaxNumber(Integer dayBatch) { return baseMapper.getBatchMaxNumber(dayBatch); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java index 5a0a601e..89569f6a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/pub/provider/SaleApprovalBusinessProvider.java @@ -9,23 +9,12 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; -/** - * @Description: - * @Author: sui q - * @Time: 2022/10/25 13:47 - * @Classname: SaleApprovalBusiness - * @PackageName: com.hzs.sale.pub.provider - */ @Slf4j @DubboService public class SaleApprovalBusinessProvider implements ISaleApprovalServiceApi { - private ISaleApprovalBusiness saleApprovalBusiness; - @Autowired - public void setSaleApprovalBusiness(ISaleApprovalBusiness saleApprovalBusiness) { - this.saleApprovalBusiness = saleApprovalBusiness; - } + private ISaleApprovalBusiness saleApprovalBusiness; @Override public R approvalCallback(ApprovalBusinessResultDTO approvalBusinessResultDTO) { diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml index 1f05181d..e545609d 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml @@ -65,29 +65,6 @@ - - - - - -