提交 1f09662d authored 作者: Whispa's avatar Whispa

commit

上级 d6e7c603
...@@ -24,8 +24,9 @@ public class ItemController { ...@@ -24,8 +24,9 @@ public class ItemController {
private final TbCfItemSkuRepository skuRepository; private final TbCfItemSkuRepository skuRepository;
private final TbCfItemDescRepository descRepository; private final TbCfItemDescRepository descRepository;
private final TbCfItemCollectionRepository collectionRepository; private final TbCfItemCollectionRepository collectionRepository;
private final TbCfItemParamRepository itemParamRepository;
public ItemController(TbCfStationItemRepository repository, TbCfGoodstwotypeRepository goodstwotypeRepository, TbCfGoodstypeRepository goodstypeRepository, TbCfDescripitonRepository descriptionRepository, TbCfCategoryRepository categoryRepository, TbCfItemSkuRepository skuRepository, TbCfItemDescRepository descRepository, TbCfItemCollectionRepository collectionRepository) { public ItemController(TbCfStationItemRepository repository, TbCfGoodstwotypeRepository goodstwotypeRepository, TbCfGoodstypeRepository goodstypeRepository, TbCfDescripitonRepository descriptionRepository, TbCfCategoryRepository categoryRepository, TbCfItemSkuRepository skuRepository, TbCfItemDescRepository descRepository, TbCfItemCollectionRepository collectionRepository, TbCfItemParamRepository itemParamRepository) {
this.repository = repository; this.repository = repository;
this.goodstwotypeRepository = goodstwotypeRepository; this.goodstwotypeRepository = goodstwotypeRepository;
this.goodstypeRepository = goodstypeRepository; this.goodstypeRepository = goodstypeRepository;
...@@ -34,6 +35,7 @@ public class ItemController { ...@@ -34,6 +35,7 @@ public class ItemController {
this.skuRepository = skuRepository; this.skuRepository = skuRepository;
this.descRepository = descRepository; this.descRepository = descRepository;
this.collectionRepository = collectionRepository; this.collectionRepository = collectionRepository;
this.itemParamRepository = itemParamRepository;
} }
@GetMapping("/queryAll") @GetMapping("/queryAll")
...@@ -146,12 +148,15 @@ public class ItemController { ...@@ -146,12 +148,15 @@ public class ItemController {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
TbCfStationItem item = itemOptional.get(); TbCfStationItem item = itemOptional.get();
//商品参数
List<TbCfItemParam> itemParamList = itemParamRepository.findAllByItemId(itemId);
map.put("score",item.getTotalScore()); map.put("score",item.getTotalScore());
map.put("isCollection",userId != null && !userId.isEmpty() && collectionRepository.existsByUserIdAndItemId(userId,itemId)); map.put("isCollection",userId != null && !userId.isEmpty() && collectionRepository.existsByUserIdAndItemId(userId,itemId));
map.put("optionList",categoryList); map.put("optionList",categoryList);
map.put("itemDetail",skusList); map.put("itemDetail",skusList);
map.put("itemInfo", item); map.put("itemInfo", item);
map.put("itemParam", itemParamList);
map.put("itemDesc",descRepository.findById(itemId)); map.put("itemDesc",descRepository.findById(itemId));
return new Result<>(map); return new Result<>(map);
......
...@@ -11,6 +11,7 @@ import java.util.Date; ...@@ -11,6 +11,7 @@ import java.util.Date;
abstract class Model { abstract class Model {
@Id @Id
@JsonProperty @JsonProperty
@Column(length = 64)
protected String id; protected String id;
@JsonIgnore @JsonIgnore
......
package com.example.afrishop_v3.models;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
/**
* 商品参数实体
* 表名 tb_cf_item_param
*
* @author lipengjun
* @date 2020-05-20 10:50:25
*/
@Entity
@Data
public class TbCfItemParam {
/**
* 商品参数ID
*/
@Id
private String id;
/**
* 参数名
*/
private String paramName;
/**
* 参数值
*/
private String paramValue;
/**
* 商品ID
*/
private String itemId;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 设置:商品参数ID
*/
public void setId(String id) {
this.id = id;
}
/**
* 获取:商品参数ID
*/
public String getId() {
return id;
}
/**
* 设置:参数名
*/
public void setParamName(String paramName) {
this.paramName = paramName;
}
/**
* 获取:参数名
*/
public String getParamName() {
return paramName;
}
/**
* 设置:参数值
*/
public void setParamValue(String paramValue) {
this.paramValue = paramValue;
}
/**
* 获取:参数值
*/
public String getParamValue() {
return paramValue;
}
/**
* 设置:商品ID
*/
public void setItemId(String itemId) {
this.itemId = itemId;
}
/**
* 获取:商品ID
*/
public String getItemId() {
return itemId;
}
/**
* 设置:创建时间
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* 获取:创建时间
*/
public Date getCreateTime() {
return createTime;
}
/**
* 设置:更新时间
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* 获取:更新时间
*/
public Date getUpdateTime() {
return updateTime;
}
}
package com.example.afrishop_v3.repository;
import com.example.afrishop_v3.models.TbCfItemParam;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface TbCfItemParamRepository extends PagingAndSortingRepository<TbCfItemParam,String> {
List<TbCfItemParam> findAllByItemId(String itemId);
}
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论