From 0a0f44c29770bd7b9fc492be90427a2bf63d26cc Mon Sep 17 00:00:00 2001 From: seesaw Date: Wed, 30 Oct 2024 15:43:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/storeorder/vo/StoreOrderPageVO.java | 6 ++++ .../admin/storeorder/vo/StoreOrderRespVO.java | 2 ++ .../storeorder/AppStoreOrderController.java | 5 +-- .../dataobject/storeorder/StoreOrderDO.java | 5 +++ .../storeorder/StoreOrderServiceImpl.java | 3 -- .../StoreSaleGoodsServiceImpl.java | 35 ++++++++++--------- .../mapper/storeorder/StoreOrderMapper.xml | 10 ++++-- 7 files changed, 42 insertions(+), 24 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java index 1ca00e31..fc61e865 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderPageVO.java @@ -38,4 +38,10 @@ public class StoreOrderPageVO extends PageParam { @Schema(description = "时间段", example = "1722") private String timePeriod; + private String startDate; + + private String endDate; + + @Schema(description = "门店", example = "1722") + 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/controller/admin/storeorder/vo/StoreOrderRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderRespVO.java index 99fc1034..469ece24 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/storeorder/vo/StoreOrderRespVO.java @@ -57,4 +57,6 @@ public class StoreOrderRespVO { @Schema(description = "订单详情") private List detailDOS; + 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/controller/app/storeorder/AppStoreOrderController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java index 610b51dd..6f52847a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/storeorder/AppStoreOrderController.java @@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.storeorder.StoreOrderDO; import cn.iocoder.yudao.module.member.dal.dataobject.storeorderdetail.StoreOrderDetailDO; import cn.iocoder.yudao.module.member.service.storeorder.StoreOrderService; import cn.iocoder.yudao.module.member.service.storeorderdetail.StoreOrderDetailService; +import cn.iocoder.yudao.module.system.api.carteen.CarteenApi; import cn.iocoder.yudao.module.system.api.cashregisterinfo.CashregisterinfoApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -43,7 +44,7 @@ public class AppStoreOrderController { @Resource private StoreOrderDetailService orderDetailService; @Resource - private CashregisterinfoApi cashregisterinfoApi; + private CarteenApi carteenApi; @GetMapping("/page") @Operation(summary = "获得商品订单分页") @@ -54,7 +55,7 @@ public class AppStoreOrderController { for (StoreOrderRespVO vo: bean.getList()) { List listByOrderNo = orderDetailService.getListByOrderNo(vo.getOrderId()); vo.setDetailDOS(listByOrderNo); - vo.setStoresName(cashregisterinfoApi.getStoreName(vo.getEquipmentCode())); + vo.setStoresName(carteenApi.getCarteenById(vo.getCarteenId()).getStoresName()); } return success(bean); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java index 5531a9bd..6a1b53aa 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/storeorder/StoreOrderDO.java @@ -59,4 +59,9 @@ public class StoreOrderDO extends BaseDO { */ private Double reductionPrice; + /** + * 门店ID + */ + 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/service/storeorder/StoreOrderServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java index f9d5c051..30d987a1 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/storeorder/StoreOrderServiceImpl.java @@ -227,9 +227,6 @@ public class StoreOrderServiceImpl implements StoreOrderService { Page page = Page.of(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage pageNew = storeOrderMapper.getStoreOrderPageNew(page, pageReqVO); List records = pageNew.getRecords(); -// for (StoreOrderPageVO record : records) { -// record.setTimePeriod(TimePeriodEnum.getTimeName(record.getCreateTime())); -// } return new PageResult<>(records, pageNew.getTotal()); } 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 002a94de..6557900e 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 @@ -9,7 +9,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +46,7 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { @Override public Integer createStoreSaleGoods(StoreSaleGoodsSaveBatchVO createReqVO) { - List addList = new ArrayList<>(); + List addList = new ArrayList<>(); List carteenIds = createReqVO.getCarteenIds(); List goodsIds = createReqVO.getGoodsIds(); @@ -53,7 +55,7 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { .eq(StoreSaleGoodsDO::getCarteenId, carteenId)); List saleGoods = storeSaleGoodsDOS.stream().map(StoreSaleGoodsDO::getGoodsId).collect(Collectors.toList()); for (Integer goodsId : goodsIds) { - if(saleGoods.contains(goodsId)){ + if (saleGoods.contains(goodsId)) { continue; } // 插入 @@ -103,22 +105,23 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { @Override public Boolean bindGoods(StoreSaleGoodsDto dto) { - - if(CollectionUtil.isEmpty(dto.getEquipmentGoodsCustoms())){ - throw exception(STORE_SALE_GOODS_NOT_NULL); - } Long storeId = cashregisterinfoApi.getStoreId(dto.getEquipmentCode()); //清空 storeSaleGoodsMapper.delete(new LambdaQueryWrapper().eq(StoreSaleGoodsDO::getCarteenId, storeId)); - ArrayList list = new ArrayList<>(); - for (StoreGoodsDto storeGoodsDto : dto.getEquipmentGoodsCustoms()) { - StoreSaleGoodsDO storeSaleGoodsDO = new StoreSaleGoodsDO(); - BeanUtil.copyProperties(storeGoodsDto, storeSaleGoodsDO); - storeSaleGoodsDO.setEquipmentCode(dto.getEquipmentCode()); - storeSaleGoodsDO.setCarteenId(storeId); - list.add(storeSaleGoodsDO); + Boolean b = true; + if (CollectionUtil.isNotEmpty(dto.getEquipmentGoodsCustoms())) { + ArrayList list = new ArrayList<>(); + for (StoreGoodsDto storeGoodsDto : dto.getEquipmentGoodsCustoms()) { + StoreSaleGoodsDO storeSaleGoodsDO = new StoreSaleGoodsDO(); + BeanUtil.copyProperties(storeGoodsDto, storeSaleGoodsDO); + storeSaleGoodsDO.setEquipmentCode(dto.getEquipmentCode()); + storeSaleGoodsDO.setCarteenId(storeId); + list.add(storeSaleGoodsDO); + } + b = storeSaleGoodsMapper.insertBatch(list); } - return storeSaleGoodsMapper.insertBatch(list); + + return b; } @Override @@ -127,9 +130,9 @@ public class StoreSaleGoodsServiceImpl implements StoreSaleGoodsService { Long storeId = cashregisterinfoApi.getStoreId(equipmentCode); List storeSaleGoodsDOS = storeSaleGoodsMapper.selectList(new LambdaQueryWrapper().eq(StoreSaleGoodsDO::getCarteenId, storeId)); - if (CollectionUtil.isEmpty(storeSaleGoodsDOS)){ + if (CollectionUtil.isEmpty(storeSaleGoodsDOS)) { return Collections.emptyList(); - }else { + } else { return storeSaleGoodsDOS.stream().map(StoreSaleGoodsDO::getGoodsId).collect(Collectors.toList()); } } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml index b2543b30..867f19e7 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml +++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/storeorder/StoreOrderMapper.xml @@ -11,11 +11,9 @@