From 3bff7c906a25fb36156a27cebaea1d114d221bad Mon Sep 17 00:00:00 2001 From: seesaw Date: Tue, 29 Oct 2024 18:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=94=AE=E5=8D=96=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=BB=91=E5=AE=9A=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataobject/storesalegoods/StoreSaleGoodsDO.java | 3 +++ .../member/dal/mysql/storegoods/StoreGoodsMapper.java | 2 +- .../storesalegoods/StoreSaleGoodsServiceImpl.java | 5 +++++ .../api/cashregisterinfo/CashregisterinfoApi.java | 2 +- .../api/cashregisterinfo/CashregisterinfoApiImpl.java | 10 ++++++++++ 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storesalegoods/StoreSaleGoodsDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storesalegoods/StoreSaleGoodsDO.java index dfb38b33..6bcf02b7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storesalegoods/StoreSaleGoodsDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storesalegoods/StoreSaleGoodsDO.java @@ -40,4 +40,7 @@ public class StoreSaleGoodsDO extends BaseDO { */ private String equipmentCode; + + private Long carteenId; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storegoods/StoreGoodsMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storegoods/StoreGoodsMapper.java index f8ae8758..dd423940 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storegoods/StoreGoodsMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/storegoods/StoreGoodsMapper.java @@ -26,7 +26,7 @@ public interface StoreGoodsMapper extends BaseMapperX { .eqIfPresent(StoreGoodsDO::getEquipmentCode, reqVO.getEquipmentCode()) .betweenIfPresent(StoreGoodsDO::getCreateTime, reqVO.getCreateTime()) .inIfPresent(StoreGoodsDO::getGoodsId, reqVO.getIds()) - .orderByDesc(StoreGoodsDO::getCategoryId)); + .orderByDesc(StoreGoodsDO::getGoodsId)); } } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storesalegoods/StoreSaleGoodsServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storesalegoods/StoreSaleGoodsServiceImpl.java index c3840563..36617aba 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storesalegoods/StoreSaleGoodsServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storesalegoods/StoreSaleGoodsServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.iocoder.yudao.module.member.controller.app.store.dto.StoreGoodsDto; import cn.iocoder.yudao.module.member.controller.app.store.dto.StoreSaleGoodsDto; +import cn.iocoder.yudao.module.system.api.cashregisterinfo.CashregisterinfoApi; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; @@ -36,6 +37,8 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { @Resource private StoreSaleGoodsMapper storeSaleGoodsMapper; + @Resource + private CashregisterinfoApi cashregisterinfoApi; @Override public Long createStoreSaleGoods(StoreSaleGoodsSaveReqVO createReqVO) { @@ -88,10 +91,12 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { //清空 storeSaleGoodsMapper.delete(new LambdaQueryWrapper().eq(StoreSaleGoodsDO::getEquipmentCode, dto.getEquipmentCode())); ArrayList list = new ArrayList<>(); + Long storeId = cashregisterinfoApi.getStoreId(dto.getEquipmentCode()); for (StoreGoodsDto storeGoodsDto : dto.getEquipmentGoodsCustoms()) { StoreSaleGoodsDO storeSaleGoodsDO = new StoreSaleGoodsDO(); BeanUtil.copyProperties(storeGoodsDto, storeSaleGoodsDO); storeSaleGoodsDO.setEquipmentCode(dto.getEquipmentCode()); + storeSaleGoodsDO.setCarteenId(storeId); list.add(storeSaleGoodsDO); } return storeSaleGoodsMapper.insertBatch(list); diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApi.java index 6eab18e3..3f8f6c1c 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApi.java @@ -4,6 +4,6 @@ public interface CashregisterinfoApi { String getStoreName(String equipmentCode); - + Long getStoreId(String equipmentCode); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApiImpl.java index 7360c62f..391f8817 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/cashregisterinfo/CashregisterinfoApiImpl.java @@ -29,4 +29,14 @@ public class CashregisterinfoApiImpl implements CashregisterinfoApi{ } return ""; } + + @Override + public Long getStoreId(String equipmentCode) { + List cashRegisterInfoDOS = cashRegisterInfoMapper.selectList(Wrappers.lambdaQuery().eq(CashRegisterInfoDO::getEquipmentCode, equipmentCode)); + if(CollectionUtil.isNotEmpty(cashRegisterInfoDOS)){ + CashRegisterInfoDO cashRegisterInfoDO = cashRegisterInfoDOS.get(0); + return cashRegisterInfoDO.getCarteenId(); + } + return null; + } }