朋友圈

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

@@ -158,6 +158,9 @@ public class QywxSendServiceImpl implements QywxSendService {
         text.setContent(dto.getContent());
         moment.setText(text);
         List<String> sendUser = new ArrayList<>();
+        if(CollectionUtils.isEmpty(clerkIdList)) {
+            return ServiceResponse.failure("9999", "无导购") ;
+        }
         List<StaffClerkRelationDTO> clerkList = this.tabHaobanStaffClerkRelationMapper.listByClerkIds(clerkIdList,
                 wxEnterpriseId);
         if (CollectionUtils.isEmpty(clerkList)) {

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

@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.GICMQClientUtil;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
 import com.gic.haoban.app.customer.dto.MemberInfoListParamsDTO;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
@@ -40,7 +41,7 @@ public class QwMessageController extends WebBaseController {
      *  群发-分享
      */
     @RequestMapping("/message-send")
-    public HaobanResponse messageSend(CustomerQO qo, String imgJson, String selectedStoreId) {
+    public RestResponse<Object> messageSend(CustomerQO qo, String imgJson, String selectedStoreId) {
         CustomerDTO params = EntityUtil.changeEntityByJSON(CustomerDTO.class, qo);
         String clerkId = qo.getClerkId();
         String wxEnterpriseId = qo.getWxEnterpriseId();
@@ -59,7 +60,7 @@ public class QwMessageController extends WebBaseController {
         params.setQwFriendFlag(true);
         List<String> sendMemberIds = distributeApiService.getMemberIds(params, memberIdList, memberInfoListParamsDTO);
         if (CollectionUtils.isEmpty(sendMemberIds)) {
-            return this.fail("无会员数据");
+            return RestResponse.failure("-1","无会员数据");
         }
         List<String> userIdList = new ArrayList<>();
         if (clerk.getClerkType() > 0) {
@@ -84,12 +85,12 @@ public class QwMessageController extends WebBaseController {
         } catch (Exception e) {
             logger.info(e.getMessage(), e);
         }
-        return resultResponse(HaoBanErrCode.ERR_1);
+        return RestResponse.successResult();
     }
     
     // 朋友圈任务
     @RequestMapping("/add_moment_task")
-    public HaobanResponse share(CustomerQO qo, String imgJson) {
+    public RestResponse<Object> share(CustomerQO qo, String imgJson) {
         String clerkId = qo.getClerkId();
         String wxEnterpriseId = qo.getWxEnterpriseId();
         String enterpriseId = qo.getEnterpriseId();
@@ -105,6 +106,9 @@ public class QwMessageController extends WebBaseController {
                 
             }
         }
+        if(CollectionUtils.isEmpty(clerkIdList)) {
+            return RestResponse.failure("-1","无发送导购数据");
+        }
         JSONObject json = new JSONObject();
         json.put("clerkIdList", clerkIdList);
         json.put("enterpriseId", enterpriseId);
@@ -113,6 +117,7 @@ public class QwMessageController extends WebBaseController {
         // 朋友圈-分享
         json.put("sendType", 2);
         json.put("wxEnterpriseId", wxEnterpriseId);
+        json.put("content", qo.getContent()) ;
         String ret = json.toJSONString();
         try {
             GICMQClientUtil.getClientInstance().sendCommonMessage("haobanCommonRouter", ret,
@@ -120,7 +125,7 @@ public class QwMessageController extends WebBaseController {
         } catch (Exception e) {
             logger.info(e.getMessage(), e);
         }
-        return resultResponse(HaoBanErrCode.ERR_1);
+        return RestResponse.successResult();
     }
 
 }