提交 d8209970 authored 作者: 吴德鹏's avatar 吴德鹏

提交

上级 55828696
...@@ -49,8 +49,8 @@ public class UploadController { ...@@ -49,8 +49,8 @@ public class UploadController {
List<String> urlList = new ArrayList<>(); List<String> urlList = new ArrayList<>();
for (int i = 0; i < strImg.length; i++) { for (int i = 0; i < strImg.length; i++) {
// String url = sendFile(strImg[i], api); // String url = sendFile(strImg[i], api);
byte[] by = BASE64DecodedMultipartFile.base64ToFile(strImg[i]); MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(strImg[i]);
byte[] bytes = PicUtils.compressPicForScale(by, 30); byte[] bytes = PicUtils.compressPicForScale(file.getBytes(), 30);
// ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes); // ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
long l = System.currentTimeMillis(); long l = System.currentTimeMillis();
String urlName = UUID.randomUUID() + "_" + String.valueOf(l).substring(6) + ".jpg"; String urlName = UUID.randomUUID() + "_" + String.valueOf(l).substring(6) + ".jpg";
......
...@@ -114,6 +114,7 @@ public class BASE64DecodedMultipartFile implements MultipartFile { ...@@ -114,6 +114,7 @@ public class BASE64DecodedMultipartFile implements MultipartFile {
} }
byte[] bytes = Base64.decode(base64); byte[] bytes = Base64.decode(base64);
return bytes; return bytes;
} }
......
...@@ -130,8 +130,8 @@ public class TbCfStationItem { ...@@ -130,8 +130,8 @@ public class TbCfStationItem {
@JoinColumn(columnDefinition = "template", name = "template") @JoinColumn(columnDefinition = "template", name = "template")
private TbCfExpressTemplate express; private TbCfExpressTemplate express;
@Formula(value = "(SELECT IFNULL(ROUND(SUM((a.item_score+a.service_score+a.logistics_score+a.price_score)/4)/COUNT(a.item_id),1),5.0) FROM tb_cf_item_comment a WHERE a.item_id=item_id)") @Formula(value = "(SELECT IFNULL(CEILING(SUM((a.item_score+a.service_score+a.logistics_score+a.price_score)/4)/COUNT(a.item_id)),5) FROM tb_cf_item_comment a WHERE a.item_id=item_id)")
private double totalScore; private int totalScore = 0;
@Formula(value = "(SELECT IFNULL(ROUND(SUM((a.item_score+a.service_score+a.logistics_score+a.price_score)/4)/COUNT(a.item_id),1),5.0) FROM tb_cf_item_comment a WHERE a.item_id=item_id)") @Formula(value = "(SELECT IFNULL(ROUND(SUM((a.item_score+a.service_score+a.logistics_score+a.price_score)/4)/COUNT(a.item_id),1),5.0) FROM tb_cf_item_comment a WHERE a.item_id=item_id)")
private double itemScore; private double itemScore;
...@@ -190,10 +190,14 @@ public class TbCfStationItem { ...@@ -190,10 +190,14 @@ public class TbCfStationItem {
return itemCode; return itemCode;
} }
public double getTotalScore() { public int getTotalScore() {
return totalScore; return totalScore;
} }
public void setTotalScore(Integer totalScore) {
this.totalScore = totalScore;
}
public BigDecimal getOneOfPrices() { public BigDecimal getOneOfPrices() {
return discountPrice == null ? itemPrice == null ? BigDecimal.ZERO : itemPrice : discountPrice; return discountPrice == null ? itemPrice == null ? BigDecimal.ZERO : itemPrice : discountPrice;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论