From edd799643ef2f8b5a3d7c844c8435ee9eb02b6c0 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Sat, 9 Aug 2025 16:51:35 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=85=A8=E7=BD=91=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => manage}/AllProductController.java | 2 +- .../{ => manage}/AllProductDetailController.java | 6 +++--- .../hzs/sale/all/service/IAllProductService.java | 11 +++++++++++ .../all/service/impl/AllProductServiceImpl.java | 14 ++++++++++++++ .../resources/mapper/sale/all/AllProductMapper.xml | 8 +++++--- .../com/hzs/common/domain/sale/all/AllProduct.java | 6 ++++-- 6 files changed, 38 insertions(+), 9 deletions(-) rename bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/{ => manage}/AllProductController.java (99%) rename bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/{ => manage}/AllProductDetailController.java (98%) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductController.java similarity index 99% rename from bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductController.java index a4b36258..4429e6b2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductController.java @@ -1,4 +1,4 @@ -package com.hzs.sale.all.controller; +package com.hzs.sale.all.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductDetailController.java similarity index 98% rename from bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java rename to bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductDetailController.java index b103207b..4a377662 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/AllProductDetailController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/controller/manage/AllProductDetailController.java @@ -1,4 +1,4 @@ -package com.hzs.sale.all.controller; +package com.hzs.sale.all.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; @@ -51,10 +51,10 @@ public class AllProductDetailController extends BaseController { queryWrapper.like(AllProductDetail::getOrderCode, param.getOrderCode()); } if (StringUtils.isNotEmpty(param.getStartDate())) { - queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YAMMER))); + queryWrapper.ge(AllProductDetail::getCreationTime, DateUtils.getStartTime(DateUtils.parseDateOne(param.getStartDate(), DateUtils.YYYY_MM_DD))); } if (StringUtils.isNotEmpty(param.getEndDate())) { - queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YAMMER))); + queryWrapper.le(AllProductDetail::getCreationTime, DateUtils.getEndTime(DateUtils.parseDateOne(param.getEndDate(), DateUtils.YYYY_MM_DD))); } queryWrapper.orderByDesc(AllProductDetail::getCreationTime); List productList = iAllProductDetailService.list(queryWrapper); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java index 046cb407..26964d8a 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/IAllProductService.java @@ -2,6 +2,9 @@ package com.hzs.sale.all.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.sale.all.AllProduct; +import com.hzs.common.domain.sale.all.AllProductDetail; + +import java.util.List; /** * 全系统产品 服务类 @@ -17,8 +20,16 @@ public interface IAllProductService extends IService { /** * 删除产品 + * * @param pkId */ void deleteProduct(Integer pkId, Long userId); + /** + * 同步数据 + * + * @param productDetailList + */ + void syncData(List productDetailList); + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java index f1507f95..f24d8c00 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/all/service/impl/AllProductServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.List; /** * 全系统产品 服务实现类 @@ -56,4 +57,17 @@ public class AllProductServiceImpl extends ServiceImpl productDetailList) { + iAllProductDetailService.saveBatch(productDetailList); + + for (AllProductDetail allProductDetail : productDetailList) { + baseMapper.changeInventory(AllProduct.builder() + .pkId(allProductDetail.getPkAllProduct()) + .inventory(allProductDetail.getChangeNum()) + .build()); + } + + } } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/all/AllProductMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/all/AllProductMapper.xml index b88db65a..aa89285c 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/all/AllProductMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/all/AllProductMapper.xml @@ -5,9 +5,11 @@ update ALL_PRODUCT ap - set ap.inventory = ap.inventory + #{param.inventory}, - ap.pk_modified = #{param.pkModified}, - ap.modified_time = sysdate + set ap.inventory = ap.inventory + #{param.inventory}, + + ap.pk_modified = #{param.pkModified}, + + ap.modified_time = sysdate where ap.pk_id = #{param.pkId} diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/all/AllProduct.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/all/AllProduct.java index 00aab496..6b53d17f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/all/AllProduct.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/all/AllProduct.java @@ -5,13 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.hzs.common.core.web.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import lombok.experimental.Accessors; /** * 全系统产品 */ +@Builder +@AllArgsConstructor +@NoArgsConstructor @Data @EqualsAndHashCode(callSuper = true) @Accessors(chain = true)