fix training update

rankin-common-utils/src/main/java/cn/rankin/common/utils/util/BeanUtil.java

@@ -1,7 +1,5 @@
 package cn.rankin.common.utils.util;
 
-import com.alibaba.fastjson.JSON;
-
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.HashMap;
@@ -13,6 +11,10 @@ public class BeanUtil {
     private BeanUtil(){}
 
     public static Map<String, Object> convertToMap(Object obj) {
+        return convertToMap(obj, false);
+    }
+
+    public static Map<String, Object> convertToMap(Object obj, boolean convertNull) {
         if(obj == null){
             return null;
         }
@@ -38,6 +40,9 @@ public class BeanUtil {
                     }
                     map.put(field.getName(), o);
                 }
+                else if(convertNull) {
+                   map.put(field.getName(), null);
+                }
 
             } catch (IllegalAccessException e) {
                 e.printStackTrace();

rankin-product-service/src/main/java/cn/rankin/productservice/controller/cms/ProductController.java

@@ -64,6 +64,11 @@ public class ProductController {
         return productService.update(packageDTO);
     }
 
+    @RequestMapping(value = "/training", method = RequestMethod.PUT)
+    public APIResult<Training> updateTraining(@RequestBody TrainingDTO dto) {
+        return productService.update(dto);
+    }
+
     @RequestMapping(value = "/course", method = RequestMethod.POST)
     public APIResult<Course> createCourse(@RequestBody CourseDTO courseDTO) {
         return productService.create(courseDTO);
@@ -84,6 +89,7 @@ public class ProductController {
         return productService.getPackage(productId);
     }
 
+
     @RequestMapping(value = "/training", method = RequestMethod.POST)
     public APIResult<Training> createTraining(@RequestBody TrainingDTO dto) {
         return productService.create(dto);

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

@@ -79,7 +79,7 @@ public class ProductService {
             if(null == entity){
                 return APIResult.error(ProductServiceAPICode.NOT_EXISTS);
             }
-            Map<String, Object> ret = BeanUtil.convertToMap(entity);
+            Map<String, Object> ret = BeanUtil.convertToMap(entity, true);
             ret.put("type", ProductTypeEnum.TRAINING);
             return APIResult.ok(ret);
         }