czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品列表 耗材弹窗 添加至商品/添加至规格

Browse Source
This commit is contained in:
wangw
2024-09-24 17:05:54 +08:00
parent 415e6ff469
commit 0de9071813
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbProskuConController.java
View File

@@ -7,6 +7,7 @@ import cn.ysk.cashier.cons.service.dto.ProskuInfo;
import cn.ysk.cashier.cons.service.dto.TbProskuConDtoV2;
import cn.ysk.cashier.cons.service.dto.TbProskuConQueryCriteria;
import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.utils.JSONUtil;
import org.springframework.data.domain.Pageable;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
@@ -60,7 +61,7 @@ public class TbProskuConController {
@PostMapping("V2")
@Log("新增商品耗材绑定关系")
@ApiOperation("新增商品耗材绑定关系")
public ResponseEntity<Object> upV2(@Validated @RequestBody TbProskuConDtoV2 resources) throws Exception {
public ResponseEntity<Object> upV2(@RequestBody TbProskuConDtoV2 resources) throws Exception {
try {
tbProskuConService.upV2(resources);
return new ResponseEntity<>(HttpStatus.CREATED);

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java
View File

@@ -2,13 +2,11 @@ package cn.ysk.cashier.cons.service.dto;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class TbProskuConDtoV2 {
@NotNull
private Integer productId;
List<TbProskuConDto> cons;
private List<TbProskuConDto> cons;
}

3
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
View File

@@ -200,7 +200,8 @@ public class TbProskuConServiceImpl implements TbProskuConService {
}
}
TbProskuCon tbConsInfo1 = new TbProskuCon();
BeanUtil.copyProperties(tbConsInfo1,resource, CopyOptions.create().setIgnoreNullValue(true));
BeanUtil.copyProperties(resource,tbConsInfo1, CopyOptions.create().setIgnoreNullValue(true));
tbConsInfo1.setSurplusStock(resource.getLasterInStock());
newCons.add(tbConsInfo1);
}
if (!CollectionUtils.isEmpty(newCons)) {