Merge branch 'master' of wangqifan/zhuoka into dev

src/main/java/com/izouma/tcg/domain/card/Collection.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.NotFound;
 import org.hibernate.annotations.NotFoundAction;
-import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
 import java.util.List;

src/main/java/com/izouma/tcg/dto/cardCase/CardCaseDTO.java

@@ -19,4 +19,5 @@ public class CardCaseDTO {
     private String        caseStatus;
     private boolean       special;
     private String        storeLogo;
+    private String        description;
 }

src/main/java/com/izouma/tcg/service/card/CardCaseService.java

@@ -109,6 +109,7 @@ public class CardCaseService {
 //        });
 //        return result;
 //    }
+
     public List<CardCaseDTO> showStoreCasesMA(PageQuery pageQuery) {
         List<CardCase> cardCases = cardCaseRepo
                 .findAll(toSpecification(pageQuery, CardCase.class), toPageRequest(pageQuery)).getContent();
@@ -126,6 +127,7 @@ public class CardCaseService {
             cardCaseDTO.setImage(cardCase.getCollection().getImages().get(0));
             cardCaseDTO.setEndTime(cardCase.getStartTime());
             cardCaseDTO.setCaseStatus(cardCase.getCaseStatus().toString());
+            cardCaseDTO.setDescription(cardCase.getDescription());
             Integer preorderCount = cardBoxRepo.countAllByCardCaseIdAndUserIdNotNull(cardCase.getId());
             Store store = storeRepo.findById(cardCase.getStoreId()).orElse(null);
             if (store != null) {
@@ -180,12 +182,13 @@ public class CardCaseService {
         cardCaseDTO
                 .setCaseName(Optional.ofNullable(cardCase.getCollection()).orElseThrow(new BusinessException("暂无"))
                         .getName() + cardCase.getCode());
+        cardCaseDTO.setDescription(cardCase.getDescription());
         cardCaseDTO.setImage(cardCase.getCollection().getImages().get(0));
         cardCaseDTO.setEndTime(cardCase.getStartTime());
         cardCaseDTO.setPrice(cardCase.getBoxPrice());
-
         cardCaseDTO.setCaseStatus(cardCase.getCaseStatus().toString());
         cardCaseDTO.setSpecial(cardCase.isSpecial());
+        cardCaseDTO.setDescription(cardCase.getDescription());
         Integer preorderCount = cardBoxRepo.countAllByCardCaseIdAndUserIdNotNull(cardCase.getId());
         Store store = storeRepo.findById(cardCase.getStoreId()).orElse(null);
         if (store != null) {
@@ -225,6 +228,7 @@ public class CardCaseService {
         cardCase.setSeriesId(collection.getSeriesId());
         cardCase.setCollectionId(collection.getId());
         cardCase.setCode(cardCaseInputDTO.getCode());
+        cardCase.setDescription(cardCaseInputDTO.getDescription());
         if (cardCase.getCode() == null) {
             cardCase.setCode("");
         }
@@ -289,6 +293,7 @@ public class CardCaseService {
         cardCaseInputDTO.setCollectionId(cardCase.getCollectionId());
         cardCaseInputDTO.setSeriesId(cardCase.getSeriesId());
         cardCaseInputDTO.setStartTime(cardCase.getStartTime());
+        cardCaseInputDTO.setDescription(cardCase.getDescription());
         cardCaseInputDTO.setSpecial(cardCase.isSpecial());
         Map<String, List<CardBox>> groupMap = cardCase.getCardBoxList().stream()
                 .collect(Collectors.groupingBy(CardBox::getGroupCode));

src/main/java/com/izouma/tcg/service/delay/OrderDelayService.java

@@ -54,7 +54,7 @@ public class OrderDelayService {
 
         @Override
         public void run() {
-// 检查当前线程是否中断
+            // 检查当前线程是否中断
             while (!Thread.currentThread().isInterrupted()) {
                 try {
                     // take():获取队列，在必要时阻塞等待，直到该队列上有一个具有过期延迟的元素可用。

src/main/java/com/izouma/tcg/service/orderInfo/OrderInfoService.java

@@ -70,8 +70,9 @@ public class OrderInfoService {
         OrderInfo record = new OrderInfo();
         record.setOrderStatus(OrderStatus.CREATED);
         record.setBoxesCount(cardBoxList.size());
-        record.setTotal(cardBoxList.stream().map(CardBox::getBoxPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
-        record.setStoreId(69L);
+        record.setTotal(cardBoxList.stream().map(CardBox::getBoxPrice).reduce(BigDecimal::add).orElse(BigDecimal.ZERO)
+                .add(BigDecimal.valueOf(10L)));
+        record.setStoreId(cardCase.getStoreId());
         record.setUserId(user.getId());
         record.setUserAddressId(userAddressId);
         record.setRemark(remark);
@@ -113,10 +114,7 @@ public class OrderInfoService {
         List<CardBox> cardBoxList = cardBoxRepo.findAllByIdIn(boxIds);
         CardCase cardCase = cardCaseRepo.findById(caseId).orElseThrow(new BusinessException("无信息"));
         Map<String, Object> resultMap = new HashMap<>();
-        Store store = storeRepo.findById(cardCase.getStoreId()).orElse(null);
-        if (store != null) {
-            resultMap.put("store", store);
-        }
+        storeRepo.findById(cardCase.getStoreId()).ifPresent(store -> resultMap.put("store", store));
         if (cardCase.isSpecial()) {
             Map<String, List<CardBox>> stringListMap = cardBoxList.stream()
                     .collect(Collectors.groupingBy(CardBox::getGroupCode));
@@ -131,7 +129,7 @@ public class OrderInfoService {
         resultMap.put("selectedBoxes", cardBoxList);
         resultMap.put("selectedCase", cardCase);
         resultMap.put("total", cardBoxList.stream().map(CardBox::getBoxPrice).reduce(BigDecimal::add)
-                .orElse(BigDecimal.ZERO));
+                .orElse(BigDecimal.ZERO).add(BigDecimal.valueOf(10L)));
         return resultMap;
     }