test

haoban-manage3-wx/pom.xml

@@ -78,21 +78,6 @@
             <version>2.6.12</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.9</version>
-        </dependency>
-        <dependency>
             <groupId>com.gic</groupId>
             <artifactId>haoban-data-api</artifactId>
             <version>${haoban-data-api}</version>

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

@@ -40,7 +40,7 @@ public class UploadController extends WebBaseController {
     private EnterpriseService enterpriseService ;
 
 
-    @RequestMapping("upload-img")
+    @RequestMapping("upload-img-fee")
     @IgnoreLogin
     public HaobanResponse imgUpload(HttpServletRequest request) throws Exception {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
@@ -74,7 +74,7 @@ public class UploadController extends WebBaseController {
     }
     
     // fileType image:图片 video:视频  file:文件 audio音频 other:其它
-    @RequestMapping("upload-img-fee")
+    @RequestMapping("upload-img")
     @IgnoreLogin
     public HaobanResponse imgUploadFee(HttpServletRequest request , String fileType , String enterpriseId) throws Exception {
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/QwMessageController.java

@@ -44,7 +44,7 @@ public class QwMessageController extends WebBaseController {
      *  群发-分享 - 店员和店长
      */
     @RequestMapping("/message-send")
-    public RestResponse<Object> messageSend(CustomerQO qo, String imgJson, String selectedStoreId) {
+    public RestResponse<Object> messageSend(CustomerQO qo, String imgJson, String selectedStoreId , Long contentMaterialId) {
         CustomerDTO params = EntityUtil.changeEntityByJSON(CustomerDTO.class, qo);
         String clerkId = qo.getClerkId();
         String wxEnterpriseId = qo.getWxEnterpriseId();
@@ -87,6 +87,7 @@ public class QwMessageController extends WebBaseController {
         json.put("storeId", storeId);
         json.put("staffId", staffId);
         json.put("content", qo.getContent()) ;
+        json.put("contentMaterialId", contentMaterialId) ;
         // 群发-分享
         json.put("sendType", 1);
         json.put("wxEnterpriseId", wxEnterpriseId);
@@ -102,7 +103,7 @@ public class QwMessageController extends WebBaseController {
     
     // 朋友圈任务 - 店长和区经
     @RequestMapping("/add_moment_task")
-    public RestResponse<Object> share(CustomerQO qo, String imgJson) {
+    public RestResponse<Object> share(CustomerQO qo, String imgJson ,Long contentMaterialId) {
         String clerkId = qo.getClerkId();
         String wxEnterpriseId = qo.getWxEnterpriseId();
         String enterpriseId = qo.getEnterpriseId();
@@ -135,6 +136,7 @@ public class QwMessageController extends WebBaseController {
         json.put("sendType", 2);
         json.put("wxEnterpriseId", wxEnterpriseId);
         json.put("content", qo.getContent()) ;
+        json.put("contentMaterialId", contentMaterialId) ;
         String ret = json.toJSONString();
         try {
             GICMQClientUtil.getClientInstance().sendCommonMessage("haobanCommonRouter", ret,