bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 6273

This commit is contained in:
sxu 2025-06-11 11:15:54 +08:00
parent a466bab26d
commit 50a9a56452
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/ImportRecipeDishesDTO.java
View File

@ -12,9 +12,9 @@ public class ImportRecipeDishesDTO {
@ApiModelProperty("销售数量") @ApiModelProperty("销售数量")
private Integer saleNum; private Integer saleNum;
@ApiModelProperty("剩余数量") @ApiModelProperty("剩余数量")
private Integer surplusNum; private Integer remanentNum;
@ApiModelProperty("个人限购数量") @ApiModelProperty("个人限购数量")
private Integer restrictNum; private Integer limitNum;
@ApiModelProperty("菜品价格(优惠价)") @ApiModelProperty("菜品价格(优惠价)")
private Integer salePrice; private Integer salePrice;
@ -38,12 +38,12 @@ public class ImportRecipeDishesDTO {
return this.saleNum; return this.saleNum;
} }
public Integer getSurplusNum() { public Integer getRemanentNum() {
return this.surplusNum; return remanentNum;
} }
public Integer getRestrictNum() { public Integer getLimitNum() {
return this.restrictNum; return limitNum;
} }
public Integer getSalePrice() { public Integer getSalePrice() {
@ -75,13 +75,13 @@ public class ImportRecipeDishesDTO {
return this; return this;
} }
public ImportRecipeDishesDTO setSurplusNum(final Integer surplusNum) { public ImportRecipeDishesDTO setRemanentNum(final Integer remanentNum) {
this.surplusNum = surplusNum; this.remanentNum = remanentNum;
return this; return this;
} }
public ImportRecipeDishesDTO setRestrictNum(final Integer restrictNum) { public ImportRecipeDishesDTO setLimitNum(final Integer limitNum) {
this.restrictNum = restrictNum; this.limitNum = limitNum;
return this; return this;
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/utils/CookRecipeImportListener.java
View File

@ -80,7 +80,7 @@ public class CookRecipeImportListener extends AnalysisEventListener<Map<Integer,
this.dishesNames.add(dishesName); this.dishesNames.add(dishesName);
BigDecimal price = (new BigDecimal((String)integerStringMap.get(i + 1))).multiply(this.decimal); BigDecimal price = (new BigDecimal((String)integerStringMap.get(i + 1))).multiply(this.decimal);
BigDecimal salePrice = (new BigDecimal((String)integerStringMap.get(i + 2))).multiply(this.decimal); BigDecimal salePrice = (new BigDecimal((String)integerStringMap.get(i + 2))).multiply(this.decimal);
importRecipeDishesDto.setSurplusNum(9999).setIndex(i).setDishesName(dishesName).setSaleNum(0).setSupplyNum(9999).setRestrictNum(9999).setPrice(price.intValue()).setSalePrice(salePrice.intValue()); importRecipeDishesDto.setRemanentNum(9999).setIndex(i).setDishesName(dishesName).setSaleNum(0).setSupplyNum(9999).setLimitNum(9999).setPrice(price.intValue()).setSalePrice(salePrice.intValue());
if (this.datas.containsKey(this.dateMap.get(i))) { if (this.datas.containsKey(this.dateMap.get(i))) {
((List)this.datas.get(this.dateMap.get(i))).add(importRecipeDishesDto); ((List)this.datas.get(this.dateMap.get(i))).add(importRecipeDishesDto);
} else { } else {