Merge branch 'feature/xgh/导购任务' into 'developer'

Feature/xgh/导购任务

See merge request !2246

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/clerktask/ClerkTaskController.java

@@ -27,6 +27,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -190,8 +192,26 @@ public class ClerkTaskController {
     @RequestMapping("save-content")
     @ResponseBody
     public RestResponse<String> saveContent(@RequestBody SaveContentQO qo) {
+        return this.save(qo) ;
+    }
+
+
+    private  RestResponse<String> save(SaveContentQO qo) {
         ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
         dto.setContentPublishType(2);
+        if(qo.getUpType()==2) {
+            String content = qo.getContent() ;
+            if(!qo.getContent().startsWith("http")) {
+                Pattern p = Pattern.compile("http.*xhslink.com/a/\\w+") ;
+                Matcher m = p.matcher(content) ;
+                while (m.find()) {
+                  content = m.group();
+                }
+                if(!content.startsWith("http")) {
+                    return RestResponse.failure("9999", "请输入小红书的链接,如：http://xhslink.com/a/uIZodbunsEaY");
+                }
+            }
+        }
         ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
         if(!resp.isSuccess()) {
             return RestResponse.failure("9999",resp.getMessage()) ;
@@ -205,13 +225,7 @@ public class ClerkTaskController {
     @RequestMapping("update-content")
     @ResponseBody
     public RestResponse<String> updateContent( @RequestBody SaveContentQO qo) {
-        ClerkTaskContentLogDTO dto = EntityUtil.changeEntityByJSON(ClerkTaskContentLogDTO.class,qo) ;
-        dto.setContentPublishType(2);
-        ServiceResponse<Long> resp = this.clerkTaskApiService.saveContent(dto) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
-        }
-        return RestResponse.successResult(resp.getResult()+"") ;
+       return this.save(qo) ;
     }
 
     /**