Browse Source

套餐展示

licailing 4 năm trước cách đây
mục cha
commit
4694fe643f

+ 2 - 3
src/main/java/com/izouma/jiashanxia/service/PackageService.java

@@ -130,14 +130,13 @@ public class PackageService {
         PackageVO vo = new PackageVO();
         BeanUtil.copyProperties(aPackage, vo);
 
-
         List<Stock> stocks = stockRepo.findAllByPackageId(aPackage.getId());
         if (CollUtil.isNotEmpty(stocks)) {
             stocks.sort(Comparator.comparing(Stock::getPrice));
             Stock min = stocks.get(0);
             Stock max = stocks.get(stocks.size() - 1);
-            vo.setAmount(min.getPrice() + " - " + max.getPrice());
-            vo.setAmount(min.getOriginalPrice() + " - " + max.getOriginalPrice());
+            vo.setAmount(min.getPrice() + "-" + max.getPrice());
+            vo.setOriginalPrice(min.getOriginalPrice() + "-" + max.getOriginalPrice());
             vo.setStocks(stocks);
         }
         return vo;

+ 25 - 0
src/test/java/com/izouma/jiashanxia/service/PackageServiceTest.java

@@ -0,0 +1,25 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.ApplicationTests;
+import com.izouma.jiashanxia.domain.Package;
+import com.izouma.jiashanxia.exception.BusinessException;
+import com.izouma.jiashanxia.repo.PackageRepo;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.Assert.*;
+
+public class PackageServiceTest extends ApplicationTests {
+
+    @Autowired
+    private PackageRepo packageRepo;
+
+    @Autowired
+    private PackageService packageService;
+
+    @Test
+    public void toVO() {
+        Package aPackage = packageRepo.findById(17L).orElseThrow(new BusinessException("无"));
+        System.out.println(packageService.toVO(aPackage));
+    }
+}