Browse Source

fix lesson warelist

huodongdong 7 years ago
parent
commit
503a8f4481

+ 1 - 1
rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Lesson.java

@@ -47,5 +47,5 @@ public class Lesson implements Serializable {
     private Date gmtModified;
 
     @Transient
-    private List<CourseWare> courseWareList;
+    private List<CourseWare> wareList;
 }

+ 8 - 0
rankin-data-api/src/main/java/cn/rankin/data/api/product/vo/LessonVo.java

@@ -1,8 +1,10 @@
 package cn.rankin.data.api.product.vo;
 
+import cn.rankin.common.utils.enums.BaseStatusEnum;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -18,6 +20,12 @@ public class LessonVo implements Serializable {
 
     private Integer sort;
 
+    private BaseStatusEnum status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
     private List<CourseWareVo> wareList;
 
 }

+ 2 - 0
rankin-product-service/src/main/java/cn/rankin/productservice/repository/MerchantProductRepository.java

@@ -10,6 +10,8 @@ import java.util.List;
 
 public interface MerchantProductRepository extends BasicJpaRepository<MerchantProduct, String> {
 
+    List<MerchantProduct> findByPid(String pid);
+
     @Query(value = "select m from MerchantProduct m where m.pid in (:pids) and m.status = 0")
     List<MerchantProduct> findByPidIn(@Param("pids") List<String> pids);
 

+ 36 - 0
rankin-product-service/src/main/java/cn/rankin/productservice/service/PackageChangeService.java

@@ -0,0 +1,36 @@
+package cn.rankin.productservice.service;
+
+import cn.rankin.data.api.product.dto.PackageProductDTO;
+import cn.rankin.data.api.product.entity.MerchantProduct;
+import cn.rankin.data.api.product.entity.Product;
+import cn.rankin.productservice.repository.GoodsRepository;
+import cn.rankin.productservice.repository.MerchantProductRepository;
+import cn.rankin.productservice.repository.ProductRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PackageChangeService {
+
+    @Autowired
+    private MerchantProductRepository merchantProductRepository;
+
+    @Autowired
+    private GoodsRepository goodsRepository;
+
+    @Autowired
+    private ProductRepository productRepository;
+
+    @Transactional
+    public void updatePackageInsideGoods(String pkgId, List<PackageProductDTO> dtoList) {
+        List<String> productIdList = new ArrayList<>();
+        dtoList.forEach(dto -> productIdList.add(dto.getPid()));
+
+        List<Product> productList = productRepository.findByPids(productIdList);
+        List<MerchantProduct> merchantProductList = merchantProductRepository.findByPid(pkgId);
+    }
+}

+ 1 - 1
rankin-product-service/src/main/java/cn/rankin/productservice/service/PackageService.java

@@ -146,7 +146,7 @@ public class PackageService {
 
         List<Product> productList = productRepository.findByPids(productIdList);
         if (productIdList.size() != productList.size()) {
-            return true;
+            return false;
         }
 
         packageProductRelationService.updateRelation(pkgId, packageProductDTOList);