Merge branch 'feature/社群' into 'master'

群发错误code

See merge request !863

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

@@ -117,7 +117,7 @@ public class QywxSendServiceImpl implements QywxSendService {
             return ServiceResponse.success(msgId);
         }
         String error = respon.getErrorMessage();
-        return ServiceResponse.failure("9999", error);
+        return ServiceResponse.failure(respon.getErrorCode()+"", error);
     }
 
     // 分享朋友圈

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -134,6 +134,7 @@ import com.google.common.collect.Sets;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.crypto.SecureUtil;
 
 @Service
@@ -1269,7 +1270,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private JSONResponse retJson(com.gic.api.base.commons.ServiceResponse<String> resp) {
         JSONResponse json = new JSONResponse();
         if(!resp.isSuccess()) {
-            json.setErrorCode(-1);
+            String code = resp.getCode() ;
+            if(NumberUtil.isNumber(code) && !"1".equals(code)) {
+                json.setErrorCode(Integer.valueOf(resp.getCode()));
+            }else {
+                json.setErrorCode(-1);
+            }
             json.setErrorMessage(resp.getMessage());
         }else {
             json.setSuccess(true);