修改验证

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinRecommendActiveController.java

@@ -40,17 +40,34 @@ public class KylinRecommendActiveController extends BaseController {
     @PostMapping("addKylinRecommendActive")
     @ApiOperation(value = "增加活动")
     @ResponseBody
-    public AjaxResult addKylinRecommendActive(@RequestBody KylinRecommendActiveParam kylinRecommendActiveParam) {
+    public AjaxResult addKylinRecommendActive(@Validated @RequestBody KylinRecommendActiveParam kylinRecommendActiveParam,BindingResult result) {
+        if (result!=null&&result.hasErrors()) {
+            List<ObjectError> errors = result.getAllErrors();
+            if (errors != null) {
+                return AjaxResult.error(errors.get(0).getDefaultMessage());
+            }
+        }
         KylinRecommendActive kylinRecommendActive = new KylinRecommendActive();
         BeanUtils.copyProperties(kylinRecommendActiveParam, kylinRecommendActive);
         if (kylinRecommendActiveService.validateTime(kylinRecommendActive) == 0) {
             List<KylinRecommendActiveRelation> list = new ArrayList<KylinRecommendActiveRelation>();
             if (kylinRecommendActiveParam.getList() != null) {
-                kylinRecommendActiveParam.getList().forEach(r -> {
+
+                for(KylinRecommendActiveRelationParam r:kylinRecommendActiveParam.getList()){
                     KylinRecommendActiveRelation kylinRecommendActiveRelation = new KylinRecommendActiveRelation();
+                    if(StringUtil.isBlank(r.getRecommendBindId())){
+                        return AjaxResult.error("操作失败", "推荐商品id不能为空");
+                    }else if(StringUtil.isBlank(r.getRecommendActiveId())){
+                        return AjaxResult.error("操作失败", "推荐活动id不能为空");
+                    }else if(null==r.getType()){
+                        return AjaxResult.error("操作失败", "推荐类型不能为空");
+                    }
                     BeanUtils.copyProperties(r, kylinRecommendActiveRelation);
                     list.add(kylinRecommendActiveRelation);
-                });
+                }
+           /*     kylinRecommendActiveParam.getList().forEach(r -> {
+
+                });*/
             }
             kylinRecommendActiveService.addKylinRecommendActive(kylinRecommendActive, list);
             return AjaxResult.success("操作成功", "");