From 55ca50ad1b5c8deaefa09a2ccd70cabe4d51f5f2 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Thu, 7 Mar 2024 09:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=BF=80?= =?UTF-8?q?=E6=B4=BB=E7=A0=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=BF=80=E6=B4=BB=E7=A0=81=E6=97=B6=E9=97=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbShopPayTypeController.java | 7 +++++++ .../controller/shop/TbShopInfoController.java | 4 +--- .../cn/ysk/cashier/dto/product/TbProductDto.java | 2 +- .../cn/ysk/cashier/pojo/product/TbProduct.java | 2 +- .../repository/product/TbProductRepository.java | 4 +++- .../impl/productimpl/TbProductServiceImpl.java | 15 ++++++++++++--- .../impl/shopimpl/TbShopInfoServiceImpl.java | 1 + .../main/java/cn/ysk/cashier/vo/TbProductVo.java | 2 +- 8 files changed, 27 insertions(+), 10 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java index 3b975ed6..1c176945 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopPayTypeController.java @@ -63,6 +63,13 @@ public class TbShopPayTypeController { return new ResponseEntity<>(tbShopPayTypeService.create(resources),HttpStatus.CREATED); } + @GetMapping("/{id}") + @Log("新增/merchant/system/paytype") + @ApiOperation("新增/merchant/system/paytype") + public ResponseEntity TbShopPayTypeInfo(@PathVariable Integer id){ + return new ResponseEntity<>(tbShopPayTypeService.findById(id),HttpStatus.CREATED); + } + @PutMapping @Log("修改/merchant/system/paytype") @ApiOperation("修改/merchant/system/paytype") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java index 2b8d819b..cf89da73 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopInfoController.java @@ -56,14 +56,13 @@ public class TbShopInfoController { @Log("查询/shop/list") @ApiOperation("查询/shop/list") @PreAuthorize("@el.check('tbShopInfo:list')") - public ResponseEntity queryTbShopInfo(TbShopInfoQueryCriteria criteria, Pageable pageable){ + public ResponseEntity queryTbShopInfo(TbShopInfoQueryCriteria criteria){ return new ResponseEntity<>(tbShopInfoService.queryAll(criteria),HttpStatus.OK); } @GetMapping("/{shopId}") @Log("查询/shop/list") @ApiOperation("查询/shop/list") - @PreAuthorize("@el.check('tbShopInfo:info')") public Object queryInfo(@PathVariable("shopId") Integer shopId){ return tbShopInfoService.findById(shopId); } @@ -79,7 +78,6 @@ public class TbShopInfoController { @PutMapping @Log("修改/shop/list") @ApiOperation("修改/shop/list") - @PreAuthorize("@el.check('tbShopInfo:edit')") public ResponseEntity updateTbShopInfo(@Validated @RequestBody TbShopInfo resources){ tbShopInfoService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java index 9a5deaa6..67d5804e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/product/TbProductDto.java @@ -56,7 +56,7 @@ public class TbProductDto implements Serializable { private BigDecimal lowPrice; /** 单位Id */ - private String unitId; + private Integer unitId; /** 商品封面图 */ private String coverImg; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java index cdbe7561..fb4c4fe8 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java @@ -73,7 +73,7 @@ public class TbProduct implements Serializable { @Column(name = "`unit_id`") @ApiModelProperty(value = "单位Id") - private String unitId; + private Integer unitId; @Column(name = "`cover_img`") @ApiModelProperty(value = "商品封面图") diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java index 7fb464c7..530a53be 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductRepository.java @@ -18,6 +18,7 @@ package cn.ysk.cashier.repository.product; import cn.ysk.cashier.pojo.product.TbProduct; 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 java.util.List; @@ -34,5 +35,6 @@ public interface TbProductRepository extends JpaRepository, List findByIds(List productIds); @Query(value = "update tb_product set status = -1 where id in :productIds",nativeQuery = true) - Integer updateByStatus(List productIds); + @Modifying + void updateByStatus(List productIds); } \ No newline at end of file diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 7cb480a6..db62464b 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -85,7 +85,7 @@ public class TbProductServiceImpl implements TbProductService { //记录单位id if (product.getUnitId() != null){ if (!"".equals(product.getUnitId())){ - unitId.add(Integer.valueOf(product.getUnitId().trim())); + unitId.add(product.getUnitId()); } } //记录规格id @@ -241,7 +241,7 @@ public class TbProductServiceImpl implements TbProductService { ListUtil.JSONArrayChangeString(resources.getGroupSnap()); } if (resources.getUnitId() != null){ - product.setUnitId(String.valueOf(resources.getUnitId())); + product.setUnitId(resources.getUnitId()); } //套餐内容 if (!resources.getGroupSnap().isEmpty()){ @@ -290,7 +290,7 @@ public class TbProductServiceImpl implements TbProductService { product.setStatus(1); product.setUpdatedAt(Instant.now().toEpochMilli()); product.setCategoryId(resources.getCategoryId().toString()); - + product.setImages(resources.getImages().toString()); if (!resources.getGroupSnap().isEmpty()){ ListUtil.JSONArrayChangeString(resources.getGroupSnap()); } @@ -311,6 +311,15 @@ public class TbProductServiceImpl implements TbProductService { tbProductSkuRepository.saveAll(skuList); } + //保存到sku_result + if ("sku".equals(resources.getTypeEnum())){ + TbProductSkuResult productSkuResult = new TbProductSkuResult(); + productSkuResult.setCreatedAt(Instant.now().toEpochMilli()); + productSkuResult.setUpdatedAt(Instant.now().toEpochMilli()); + productSkuResult.setTagSnap(resources.getSkuSnap()); + productSkuResult.setId(save.getId()); + tbProductSkuResultRepository.save(productSkuResult); + } } @Override diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java index 1577d50c..47c9c946 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java @@ -132,6 +132,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService { BeanUtils.copyProperties(resources,tbShopInfo); tbShopInfo.setCreatedAt(Instant.now().toEpochMilli()); tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli()); + tbShopInfo.setOnSale(1); //激活码 TbMerchantRegister tbMerchantRegister = new TbMerchantRegister(); if (resources.getRegisterCode() != null){ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java index a75a2a64..b8e2ef72 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductVo.java @@ -39,7 +39,7 @@ public class TbProductVo { private BigDecimal lowPrice; - private String unitId; + private Integer unitId; private String coverImg;