群发

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

@@ -11,8 +11,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,9 +19,9 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.GlobalVar;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.haoban.app.customer.service.api.service.MemberChatApiService;
 import com.gic.haoban.common.anno.IgnoreLogin;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -78,8 +76,15 @@ public class UploadController extends WebBaseController {
     
     // fileType image:图片 video:视频  file:文件 audio音频 other:其它
     @RequestMapping("upload-img-fee")
-    @IgnoreLogin
-    public HaobanResponse imgUploadFee(HttpServletRequest request , String fileType , String enterpriseId) throws Exception {
+    public RestResponse<Object> imgUploadFee(HttpServletRequest request , String fileType , String enterpriseId) throws Exception {
+        if(StringUtils.isEmpty(enterpriseId)) {
+            return RestResponse.failure("9999", "企业未传") ;
+        }
+        EnterpriseDTO enterprise = this.enterpriseService.getEnterpriseById(enterpriseId) ;
+        if(null == enterprise) {
+            return RestResponse.failure("9999", "商户不存在") ;
+        }
+        String factoryCode = enterprise.getFactoryCode() ;
         MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
         Iterator<String> iter = multiRequest.getFileNames();
         java.util.List<Map<String, Object>> picList = new ArrayList<>();
@@ -91,13 +96,8 @@ public class UploadController extends WebBaseController {
                 map = new HashMap<>();
                 MultipartFile mf = list.get(i);
                 CloudFileTypeEnum type = getType(fileType) ;
-                EnterpriseDTO enterprise = this.enterpriseService.getEnterpriseById(enterpriseId) ;
                 File file = File.createTempFile("tmp", null);
                 mf.transferTo(file);
-                String factoryCode = "jhdm";
-                if(null != enterprise) {
-                    factoryCode= enterprise.getFactoryCode() ;
-                }
                 CloudFileInfo uploadInfo = CloudFileUtil.uploadTempFile(file, mf.getOriginalFilename(), type, factoryCode , CloudFileBusinessOptEnum.COMMON, 7*24L) ;
                 if (uploadInfo != null) {
                     map.put("qcloudImageUrl", uploadInfo.getOrgFileUrl());
@@ -107,7 +107,7 @@ public class UploadController extends WebBaseController {
                 file.deleteOnExit();
             }
         }
-        return resultResponse(HaoBanErrCode.ERR_1, picList);
+        return RestResponse.successResult(picList);
     }
     
     

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

@@ -88,6 +88,7 @@ public class QwMessageController extends WebBaseController {
         json.put("staffId", staffId);
         json.put("content", qo.getContent()) ;
         json.put("contentMaterialId", contentMaterialId) ;
+        json.put("sendClerkId", clerkId);
         // 群发-分享
         json.put("sendType", 1);
         json.put("wxEnterpriseId", wxEnterpriseId);
@@ -132,6 +133,7 @@ public class QwMessageController extends WebBaseController {
         json.put("enterpriseId", enterpriseId);
         json.put("imgJson", imgJson);
         json.put("staffId", staffId);
+        json.put("sendClerkId", clerkId);
         // 朋友圈-分享
         json.put("sendType", 2);
         json.put("wxEnterpriseId", wxEnterpriseId);