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

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
#	src/main/resources/mapper/TbProductMapper.xml
This commit is contained in:
张松
2024-11-25 14:09:32 +08:00
parent e5c74051c7 43c51fff6e
commit b8b3de5226
9 changed files with 50 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductStockDetail.java
View File

@@ -12,7 +12,7 @@ public class TbProductStockDetail implements Serializable {
private String productName;
private Byte isStock;
private Integer isStock;
private String specSnap;
@@ -90,11 +90,11 @@ public class TbProductStockDetail implements Serializable {
this.productName = productName == null ? null : productName.trim();
}
public Byte getIsStock() {
public Integer getIsStock() {
return isStock;
}
public void setIsStock(Byte isStock) {
public void setIsStock(Integer isStock) {
this.isStock = isStock;
}

58
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProductWithBLOBs.java
View File

@@ -1,58 +0,0 @@
package com.chaozhanggui.system.cashierservice.entity;
import lombok.Getter;
import java.io.Serializable;
import java.util.List;
@Getter
public class TbProductWithBLOBs extends TbProduct implements Serializable {
private Object groundingSpecInfo;
private String images;
private String video;
private String notice;
private String groupSnap;
private String specInfo;
private String selectSpec;
private List<?> skuList;
private static final long serialVersionUID = 1L;
public void setGroundingSpecInfo(Object groundingSpecInfo) {
this.groundingSpecInfo = groundingSpecInfo;
}
public void setSkuList(List<?> skuList) {
this.skuList = skuList;
}
public void setImages(String images) {
this.images = images == null ? null : images.trim();
}
public void setVideo(String video) {
this.video = video == null ? null : video.trim();
}
public void setNotice(String notice) {
this.notice = notice == null ? null : notice.trim();
}
public void setGroupSnap(String groupSnap) {
this.groupSnap = groupSnap == null ? null : groupSnap.trim();
}
public void setSpecInfo(String specInfo) {
this.specInfo = specInfo == null ? null : specInfo.trim();
}
public void setSelectSpec(String selectSpec) {
this.selectSpec = selectSpec == null ? null : selectSpec.trim();
}
}

34
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/ProductGroupVo.java Normal file
View File

@@ -0,0 +1,34 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ProductGroupVo {
private Integer count;
//选几个
private Integer number;
//类别
private String title;
//食物
private List<Food> goods=new ArrayList<>();
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Food {
private Integer proId;
private String proName;
private Integer skuId;
private String skuName;
private BigDecimal price;
private String number;
private String unitName;
}
}