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

Merge branch 'ww' into test 

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/TbProskuConDtoV2.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbProskuConServiceImpl.java
This commit is contained in:
wangw 2024-09-24 17:08:14 +08:00
parent 064e683a68 0de9071813
commit b4c795e7d5
5 changed files with 18 additions and 9 deletions
Show Stats 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)) {

15
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
View File

@ -255,15 +255,22 @@ public class TbProductServiceImpl implements TbProductService {
BigDecimal maxPrice = tbProductSkus.stream().map(TbProductSku::getSalePrice).max(BigDecimal::compareTo).get();
productNewVo.setLowPrice("￥" +productNewVo.getLowPrice() + "~￥" + maxPrice);
}
if(product.getTypeEnum().equals("sku")){
//规格填充
productNewVo.setSkuList(convert(tbProductSkus));
}
ViewConSku viewConSku = new ViewConSku();
viewConSku.setShopId(Integer.valueOf(product.getShopId()));
viewConSku.setProductId(product.getId());
Example<ViewConSku> query = Example.of(viewConSku);
List<ViewConSku> skuCons = viewConSkuRepository.findAll(query);
if(product.getTypeEnum().equals("sku")){
//规格填充
productNewVo.setSkuList(convert(tbProductSkus));
//耗材弹窗选项
if (!CollectionUtils.isEmpty(skuCons)) {
Integer productSkuId = skuCons.get(0).getProductSkuId();
if (productSkuId != 0) {//添加至商品
productNewVo.setIsSaveSku(1);
}
}
}
productNewVo.setConInfos(CollectionUtils.isEmpty(skuCons)?Arrays.asList():skuCons);
products.add(productNewVo);
}

2
eladmin-system/src/main/java/cn/ysk/cashier/vo/TbProductNewVo.java
View File

@ -44,6 +44,8 @@ public class TbProductNewVo {
//退款是否退回库存
private Integer isRefundStock = 1;
private Integer isSaveSku = 0;
//库存警戒线
private Integer warnLine = 0;