商品模块代码提交

This commit is contained in:
Tankaikai
2025-02-16 09:48:20 +08:00
parent 26a4592bcd
commit 1eb4113233
4 changed files with 69 additions and 43 deletions

22
.gitignore vendored
View File

@@ -33,4 +33,26 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/jars/ /jars/
/cash-service/system-service/src/main/resources/rebel.xml
/cash-api/system-server/src/main/resources/rebel.xml
/cash-service/product-service/src/main/resources/rebel.xml
/cash-api/product-server/src/main/resources/rebel.xml
/cash-service/pay-service/src/main/resources/rebel.xml
/cash-service/order-service/src/main/resources/rebel.xml
/cash-api/order-server/src/main/resources/rebel.xml
/cash-sdk/czg-pay/src/main/resources/rebel.xml
/cash-service/code-generator/src/main/resources/rebel.xml
/cash-service/src/main/resources/rebel.xml
/cash-sdk/src/main/resources/rebel.xml
/cash-dependencies/src/main/resources/rebel.xml
/cash-common/cash-common-tools/src/main/resources/rebel.xml
/cash-common/cash-common-service/src/main/resources/rebel.xml
/cash-common/cash-common-sa-token/src/main/resources/rebel.xml
/cash-common/cash-common-redis/src/main/resources/rebel.xml
/cash-common/cash-common-api-config/src/main/resources/rebel.xml
/cash-common/src/main/resources/rebel.xml
/cash-api/src/main/resources/rebel.xml
/src/main/resources/rebel.xml
/cash-service/account-service/src/main/resources/rebel.xml
/cash-api/account-server/src/main/resources/rebel.xml
/logs/ /logs/

View File

@@ -5,12 +5,12 @@ import com.czg.product.dto.ShopProdUnitDTO;
import com.czg.product.service.ShopProdUnitService; import com.czg.product.service.ShopProdUnitService;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.czg.validator.ValidatorUtil;
import com.czg.validator.group.DefaultGroup; import com.czg.validator.group.DefaultGroup;
import com.czg.validator.group.InsertGroup; import com.czg.validator.group.InsertGroup;
import com.czg.validator.group.UpdateGroup; import com.czg.validator.group.UpdateGroup;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@@ -31,80 +31,76 @@ public class ShopProdUnitController {
@GetMapping("page") @GetMapping("page")
@OperationLog("商品单位-分页") @OperationLog("商品单位-分页")
//@SaAdminCheckPermission("prod:unit:page") //@SaAdminCheckPermission("shopProdUnit:page")
public CzgResult<Page<ShopProdUnitDTO>> page(ShopProdUnitDTO param) { public CzgResult<Page<ShopProdUnitDTO>> getShopProdUnitPage(ShopProdUnitDTO param) {
Page<ShopProdUnitDTO> data = shopProdUnitService.page(param); Page<ShopProdUnitDTO> data = shopProdUnitService.getShopProdUnitPage(param);
return CzgResult.success(data); return CzgResult.success(data);
} }
@GetMapping("list") @GetMapping("list")
@OperationLog("商品单位-列表") @OperationLog("商品单位-列表")
//@SaAdminCheckPermission("prod:unit:list") //@SaAdminCheckPermission("shopProdUnit:list")
public CzgResult<List<ShopProdUnitDTO>> list(ShopProdUnitDTO param) { public CzgResult<List<ShopProdUnitDTO>> getShopProdUnitList(ShopProdUnitDTO param) {
List<ShopProdUnitDTO> data = shopProdUnitService.list(param); List<ShopProdUnitDTO> data = shopProdUnitService.getShopProdUnitList(param);
return CzgResult.success(data); return CzgResult.success(data);
} }
@GetMapping("{id}") @GetMapping("{id}")
@OperationLog("商品单位-详情") @OperationLog("商品单位-详情")
//@SaAdminCheckPermission("prod:unit:info") //@SaAdminCheckPermission("shopProdUnit:info")
public CzgResult<ShopProdUnitDTO> get(@PathVariable("id") Long id) { public CzgResult<ShopProdUnitDTO> getShopProdUnitById(@PathVariable("id") Long id) {
AssertUtil.isNull(id, "{}不能为空", "id"); AssertUtil.isNull(id, "{}不能为空", "id");
ShopProdUnitDTO data = shopProdUnitService.get(id); ShopProdUnitDTO data = shopProdUnitService.getShopProdUnitById(id);
return CzgResult.success(data); return CzgResult.success(data);
} }
@PostMapping @PostMapping
@OperationLog("商品单位-新增") @OperationLog("商品单位-新增")
//@SaAdminCheckPermission("prod:unit:save") //@SaAdminCheckPermission("shopProdUnit:add")
public CzgResult<Void> save(@RequestBody ShopProdUnitDTO dto) { public CzgResult<Void> addShopProdUnit(@RequestBody @Validated({InsertGroup.class, DefaultGroup.class}) ShopProdUnitDTO dto) {
//效验数据
ValidatorUtil.validateEntity(dto, InsertGroup.class, DefaultGroup.class);
shopProdUnitService.save(dto); shopProdUnitService.addShopProdUnit(dto);
return CzgResult.success(); return CzgResult.success();
} }
@PutMapping @PutMapping
@OperationLog("商品单位-修改") @OperationLog("商品单位-修改")
//@SaAdminCheckPermission("prod:unit:update") //@SaAdminCheckPermission("shopProdUnit:update")
public CzgResult<Void> update(@RequestBody ShopProdUnitDTO dto) { public CzgResult<Void> updateShopProdUnit(@RequestBody @Validated({UpdateGroup.class, DefaultGroup.class}) ShopProdUnitDTO dto) {
//效验数据
ValidatorUtil.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
shopProdUnitService.update(dto); shopProdUnitService.updateShopProdUnit(dto);
return CzgResult.success(); return CzgResult.success();
} }
@DeleteMapping("{id}") @DeleteMapping("{id}")
@OperationLog("商品单位-删除") @OperationLog("商品单位-删除")
//@SaAdminCheckPermission("prod:unit:delete") //@SaAdminCheckPermission("shopProdUnit:delete")
public CzgResult<Void> delete(@PathVariable("id") Long id) { public CzgResult<Void> deleteShopProdUnit(@PathVariable("id") Long id) {
//效验数据 //效验数据
AssertUtil.isNull(id, "{}不能为空", "id"); AssertUtil.isNull(id, "{}不能为空", "id");
shopProdUnitService.removeById(id); shopProdUnitService.deleteShopProdUnit(id);
return CzgResult.success(); return CzgResult.success();
} }
@PostMapping("disable/{id}") @PostMapping("disable/{id}")
@OperationLog("商品单位-禁用") @OperationLog("商品单位-禁用")
//@SaAdminCheckPermission("prod:unit:able") //@SaAdminCheckPermission("shopProdUnit:able")
public CzgResult<Void> disable(@PathVariable("id") Long id) { public CzgResult<Void> disableShopProdUnit(@PathVariable("id") Long id) {
//效验数据 //效验数据
AssertUtil.isNull(id, "{}不能为空", "id"); AssertUtil.isNull(id, "{}不能为空", "id");
shopProdUnitService.disable(id); shopProdUnitService.disableShopProdUnit(id);
return CzgResult.success(); return CzgResult.success();
} }
@PostMapping("enable/{id}") @PostMapping("enable/{id}")
@OperationLog("商品单位-启用") @OperationLog("商品单位-启用")
//@SaAdminCheckPermission("prod:unit:able") //@SaAdminCheckPermission("shopProdUnit:able")
public CzgResult<Void> enable(@PathVariable("id") Long id) { public CzgResult<Void> enableShopProdUnit(@PathVariable("id") Long id) {
//效验数据 //效验数据
AssertUtil.isNull(id, "{}不能为空", "id"); AssertUtil.isNull(id, "{}不能为空", "id");
shopProdUnitService.enable(id); shopProdUnitService.enableShopProdUnit(id);
return CzgResult.success(); return CzgResult.success();
} }

View File

@@ -15,18 +15,20 @@ import java.util.List;
*/ */
public interface ShopProdUnitService extends IService<ShopProdUnit> { public interface ShopProdUnitService extends IService<ShopProdUnit> {
Page<ShopProdUnitDTO> page(ShopProdUnitDTO param); Page<ShopProdUnitDTO> getShopProdUnitPage(ShopProdUnitDTO param);
List<ShopProdUnitDTO> list(ShopProdUnitDTO param); List<ShopProdUnitDTO> getShopProdUnitList(ShopProdUnitDTO param);
ShopProdUnitDTO get(Long id); ShopProdUnitDTO getShopProdUnitById(Long id);
boolean save(ShopProdUnitDTO dto); boolean addShopProdUnit(ShopProdUnitDTO dto);
boolean update(ShopProdUnitDTO dto); boolean updateShopProdUnit(ShopProdUnitDTO dto);
boolean disable(Long id); boolean deleteShopProdUnit(Long id);
boolean enable(Long id); boolean disableShopProdUnit(Long id);
boolean enableShopProdUnit(Long id);
} }

View File

@@ -42,26 +42,26 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
} }
@Override @Override
public Page<ShopProdUnitDTO> page(ShopProdUnitDTO param) { public Page<ShopProdUnitDTO> getShopProdUnitPage(ShopProdUnitDTO param) {
QueryWrapper queryWrapper = buildQueryWrapper(param); QueryWrapper queryWrapper = buildQueryWrapper(param);
return super.pageAs(PageUtil.buildPage(), queryWrapper, ShopProdUnitDTO.class); return super.pageAs(PageUtil.buildPage(), queryWrapper, ShopProdUnitDTO.class);
} }
@Override @Override
public List<ShopProdUnitDTO> list(ShopProdUnitDTO param) { public List<ShopProdUnitDTO> getShopProdUnitList(ShopProdUnitDTO param) {
QueryWrapper queryWrapper = buildQueryWrapper(param); QueryWrapper queryWrapper = buildQueryWrapper(param);
queryWrapper.eq(ShopProdUnit::getStatus, StatusEnum.ENABLED.value()); queryWrapper.eq(ShopProdUnit::getStatus, StatusEnum.ENABLED.value());
return super.listAs(queryWrapper, ShopProdUnitDTO.class); return super.listAs(queryWrapper, ShopProdUnitDTO.class);
} }
@Override @Override
public ShopProdUnitDTO get(Long id) { public ShopProdUnitDTO getShopProdUnitById(Long id) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
return super.getOneAs(query().eq(ShopProdUnit::getId, id).eq(ShopProdUnit::getShopId, shopId), ShopProdUnitDTO.class); return super.getOneAs(query().eq(ShopProdUnit::getId, id).eq(ShopProdUnit::getShopId, shopId), ShopProdUnitDTO.class);
} }
@Override @Override
public boolean save(ShopProdUnitDTO dto) { public boolean addShopProdUnit(ShopProdUnitDTO dto) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
boolean exists = super.exists(query().eq(ShopProdUnit::getName, dto.getName()).eq(ShopProdUnit::getShopId, shopId)); boolean exists = super.exists(query().eq(ShopProdUnit::getName, dto.getName()).eq(ShopProdUnit::getShopId, shopId));
if (exists) { if (exists) {
@@ -78,7 +78,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
} }
@Override @Override
public boolean update(ShopProdUnitDTO dto) { public boolean updateShopProdUnit(ShopProdUnitDTO dto) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
boolean exists = super.exists(query().eq(ShopProdUnit::getName, dto.getName()).eq(ShopProdUnit::getShopId, shopId).ne(ShopProdUnit::getId, dto.getId())); boolean exists = super.exists(query().eq(ShopProdUnit::getName, dto.getName()).eq(ShopProdUnit::getShopId, shopId).ne(ShopProdUnit::getId, dto.getId()));
if (exists) { if (exists) {
@@ -89,7 +89,13 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
} }
@Override @Override
public boolean disable(Long id) { public boolean deleteShopProdUnit(Long id) {
Long shopId = StpKit.USER.getLoginIdAsLong();
return super.remove(query().eq(ShopProdUnit::getId, id).eq(ShopProdUnit::getShopId, shopId));
}
@Override
public boolean disableShopProdUnit(Long id) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
return UpdateChain.of(ShopProdUnit.class) return UpdateChain.of(ShopProdUnit.class)
.set(ShopProdUnit::getStatus, StatusEnum.DISABLE.value()) .set(ShopProdUnit::getStatus, StatusEnum.DISABLE.value())
@@ -99,7 +105,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
} }
@Override @Override
public boolean enable(Long id) { public boolean enableShopProdUnit(Long id) {
Long shopId = StpKit.USER.getLoginIdAsLong(); Long shopId = StpKit.USER.getLoginIdAsLong();
return UpdateChain.of(ShopProdUnit.class) return UpdateChain.of(ShopProdUnit.class)
.set(ShopProdUnit::getStatus, StatusEnum.ENABLED.value()) .set(ShopProdUnit::getStatus, StatusEnum.ENABLED.value())