return Training type in ProductService

rankin-product-service/src/main/java/cn/rankin/productservice/service/ProductService.java

@@ -4,6 +4,7 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.enums.ProductTypeEnum;
+import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.common.utils.util.JpaSortUtil;
 import cn.rankin.data.api.product.dto.CourseDTO;
 import cn.rankin.data.api.product.dto.PackageDTO;
@@ -14,13 +15,13 @@ import cn.rankin.data.api.product.entity.Package;
 import cn.rankin.productservice.code.ProductServiceAPICode;
 import cn.rankin.productservice.repository.MerchantProductRepository;
 import cn.rankin.productservice.repository.ProductRepository;
-import cn.rankin.productservice.utils.DTOConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import static cn.rankin.productservice.utils.DTOConverter.convert;
 
@@ -75,8 +76,12 @@ public class ProductService {
             return packageService.getPackage(productId);
         }else if (ProductTypeEnum.TRAINING.equals(type)) {
             Training entity =  trainingService.get(productId);
-            Product productEntity = DTOConverter.convert(entity);
-            APIResult.ok(productEntity);
+            if(null == entity){
+                return APIResult.error(ProductServiceAPICode.NOT_EXISTS);
+            }
+            Map<String, Object> ret = BeanUtil.convertToMap(entity);
+            ret.put("type", ProductTypeEnum.TRAINING);
+            return APIResult.ok(ret);
         }