czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张松
2025-02-20 10:02:44 +08:00
parent f1456ba34f 28d07a139d
commit f389516732
14 changed files with 410 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
View File

@@ -4,6 +4,7 @@ import com.czg.log.annotation.OperationLog;
import com.czg.product.dto.ProdSkuDTO;
import com.czg.product.dto.ProductDTO;
import com.czg.product.param.ProductIsSaleParam;
import com.czg.product.param.ProductIsSoldOutParam;
import com.czg.product.service.ProductService;
import com.czg.resp.CzgResult;
import com.czg.utils.AssertUtil;
@@ -97,4 +98,15 @@ public class ProductController {
return CzgResult.success();
}
/**
* 商品-标记售罄
*/
@PostMapping("/markIsSoldOut")
@OperationLog("商品-标记售罄")
//@SaAdminCheckPermission("product:markIsSoldOut")
public CzgResult<Void> markIsSoldOutProduct(@RequestBody @Validated({DefaultGroup.class}) ProductIsSoldOutParam param) {
productService.markProductIsSoldOut(param);
return CzgResult.success();
}
}

33
cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
View File

@@ -2,13 +2,16 @@ package com.czg.controller.user;
import com.czg.log.annotation.OperationLog;
import com.czg.product.param.MiniHomeProductParam;
import com.czg.product.param.ShopProductSkuParam;
import com.czg.product.service.UProductService;
import com.czg.product.vo.MiniAppHomeProductVo;
import com.czg.product.vo.ShopGroupProductVo;
import com.czg.product.vo.ShopProductVo;
import com.czg.product.vo.*;
import com.czg.resp.CzgResult;
import com.czg.utils.AssertUtil;
import com.czg.validator.ValidatorUtil;
import com.czg.validator.group.DefaultGroup;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -58,4 +61,28 @@ public class UProductController {
return CzgResult.success(list);
}
/**
* 小程序点餐-商品详情
*
* @param id 商品id
*/
@GetMapping("/miniApp/info/{id}")
@OperationLog("小程序点餐-商品详情")
public CzgResult<ShopProductInfoVo> getProductInfo(@PathVariable("id") Long id) {
AssertUtil.isNull(id, "商品id不能为空");
ShopProductInfoVo data = uProductService.getProductInfo(id);
return CzgResult.success(data);
}
/**
* 小程序点餐-商品SKU详情
*/
@GetMapping("/miniApp/sku/info")
@OperationLog("小程序点餐-商品SKU详情")
public CzgResult<ShopProductSkuInfoVo> getProductSkuInfo(ShopProductSkuParam param) {
ValidatorUtil.validateEntity(param, DefaultGroup.class);
ShopProductSkuInfoVo data = uProductService.getProductSkuInfo(param);
return CzgResult.success(data);
}
}