行情第二版

src/main/java/com/izouma/nineth/domain/Result.java

@@ -4,6 +4,7 @@ import com.izouma.nineth.enums.SystemCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 
@@ -14,7 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 public class Result<T> {
     //返回码
-    private String code;
+    private int code;
     //提示信息
     private String msg;
     // 返回对象
@@ -26,8 +27,8 @@ public class Result<T> {
     }
 
 
-    public static Result error(String code, String msg) {
-        return new Result(code, msg);
+    public static Result NO() {
+        return new Result(SystemCode.ERROR);
     }
 
 
@@ -39,14 +40,14 @@ public class Result<T> {
 
 
     public void setCodeIsNUll(String code) {
-        if (StringUtils.isBlank(getCode())) {
+        if (ObjectUtils.isEmpty(getCode())) {
             setMsg(code);
         }
     }
 
 
     public void setSysCodeIsNUll(SystemCode sysCode) {
-        if (StringUtils.isBlank(getCode())) {
+        if (ObjectUtils.isEmpty(getCode())) {
             setCode(sysCode.getCode());
         }
         if (StringUtils.isBlank(getMsg())) {
@@ -60,7 +61,7 @@ public class Result<T> {
     }
 
 
-    public Result(String code, String msg) {
+    public Result(int code, String msg) {
         this(code, msg, null);
     }
 

src/main/java/com/izouma/nineth/dto/PriceListVo.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PriceListVo {
+    private String name;
+    private String img;
+    private String price;
+    private String origin_price;
+}

src/main/java/com/izouma/nineth/enums/SystemCode.java

@@ -6,28 +6,28 @@ public enum SystemCode {
     /**
      * 操作成功
      **/
-    SUCCESS("1", "操作成功"),
+    SUCCESS(1, "SUCCESS"),
     /**
      * 操作失败
      **/
-    ERROR("2", "操作失败"),
+    ERROR(2, "ERROR"),
     ;
 
     /**
      * 自定义状态码
      **/
-    private String code;
+    private int code;
     /**
      * 自定义描述
      **/
     private String message;
 
-    SystemCode(String code, String message) {
+    SystemCode(int code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public String getCode() {
+    public int getCode() {
         return code;
     }
 

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -166,6 +166,12 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
             "and c.stock > 0 order by c.price limit 5) t", nativeQuery = true)
     String lowestPrice(String search);
 
+    @Query(value = "select c.original_price from collection_info c where c.name like ?1 " +
+            "and c.source = 'OFFICIAL' " +
+            "and c.original_price != null " +
+            "and c.stock > 0 order by c.original_price limit 1", nativeQuery = true)
+    String lowestOriginPrice(String search);
+
     @Query("select c from Collection c join c.tags t on t.id = ?1 ")
     Page<Collection> byTag(Long tagId, Pageable pageable);
 

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -129,7 +129,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/auctionRecord/all").permitAll()
                 .antMatchers("/ossNotify").permitAll()
                 .antMatchers("/priceList/list").permitAll()
-                .antMatchers("/priceList/list2").permitAll()
+                .antMatchers("/priceList/priceListVo").permitAll()
                 .antMatchers("/user/collectionInvitorList").permitAll()
                 .antMatchers("/auth/oasisLogin").permitAll()
                 .antMatchers("/auth/oasisLoginPhone").permitAll()

src/main/java/com/izouma/nineth/web/PriceListController.java

@@ -2,6 +2,7 @@ package com.izouma.nineth.web;
 
 import com.izouma.nineth.domain.PriceList;
 import com.izouma.nineth.domain.Result;
+import com.izouma.nineth.dto.PriceListVo;
 import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.service.PriceListService;
 import com.izouma.nineth.dto.PageQuery;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -88,10 +90,20 @@ public class PriceListController extends BaseController {
             return map;
         }).collect(Collectors.toList());
     }
-    @GetMapping("/list2")
-//    @Cacheable("priceList")
-    public Result<PriceList> priceList() {
-        return Result.OK().success(priceListRepo.findAll());
+    @GetMapping("/priceListVo")
+    @Cacheable("priceList")
+    public Result<PriceListVo> priceList() {
+        ArrayList<PriceListVo> list = new ArrayList<>();
+        List<PriceList> priceLists = priceListRepo.findAll();
+        for (PriceList priceList : priceLists) {
+            list.add(new PriceListVo().builder()
+                    .name(priceList.getName())
+                    .img(priceList.getPic())
+                    .price(priceList.getPrice())
+                    .origin_price((collectionRepo.lowestOriginPrice(priceList.getSearch())))
+                    .build());
+        }
+         return Result.OK().success(list);
     }
 }