通知

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java

@@ -53,17 +53,13 @@ public interface MessageApiService {
     /**
      * 
     * @Title: sendOrderMessage
-    * @Description: TODO(这里用一句话描述这个方法的作用)
-    * @author xugh
-    * @param enterpriseId
-    * @param templateCode
-    * @param clerkId
-    * @param memberId
-    * @param valueList
+    * @Description: 订单发送好办通知
+    * @param relationId 关联ID
+    * @param valueList 有变量的情况按顺序传参
     * @return
     * @throws
      */
-    ServiceResponse<Void> sendOrderMessage(String enterpriseId, NoticeMessageTypeEnum noticeType,  String orderId, String clerkId, String memberId,
-            List<String> valueList);
+    ServiceResponse<Void> sendOrderMessage(String enterpriseId, NoticeMessageTypeEnum noticeType, String relationId,
+            String clerkId, String memberId, List<String> valueList);
 
 }

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

@@ -122,7 +122,7 @@ public class MessageApiServiceImpl implements MessageApiService {
     @Autowired
     private GroupChatService groupChatService;
     @Autowired
-    private MemberService memberService ;
+    private MemberService memberService;
 
     @Override
     public void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO) {
@@ -584,42 +584,45 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     @Override
     public com.gic.api.base.commons.ServiceResponse<Void> sendOrderMessage(String enterpriseId,
-            NoticeMessageTypeEnum noticeType, String orderId, String clerkId, String memberId, List<String> valueList) {
-        log.info("订单消息通知={},{},{}",memberId,clerkId,orderId);
+            NoticeMessageTypeEnum noticeType, String relationId, String clerkId, String memberId,
+            List<String> valueList) {
+        log.info("订单消息通知={},{},{}", memberId, clerkId, relationId);
         List<NoticeMessageQDTO> list = new ArrayList<>();
         if (StringUtils.isAnyBlank(enterpriseId, clerkId, memberId)) {
-            return com.gic.api.base.commons.ServiceResponse.failure("9999","必传参数没传");
+            return com.gic.api.base.commons.ServiceResponse.failure("9999", "必传参数没传");
         }
         NoticeMessageTypeEnum messageTypeEnum = NoticeMessageTypeEnum.getByType(noticeType.getType());
         if (messageTypeEnum == null) {
-            return com.gic.api.base.commons.ServiceResponse.failure("9999","消息类型不存在");
+            return com.gic.api.base.commons.ServiceResponse.failure("9999", "消息类型不存在");
         }
-        ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId) ;
+        ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId);
         if (null == clerkDTO) {
-            return com.gic.api.base.commons.ServiceResponse.failure("9999","导购查不到");
+            return com.gic.api.base.commons.ServiceResponse.failure("9999", "导购查不到");
         }
         Map<String, Object> extendContent = new HashMap<>();
-        if(messageTypeEnum.getCategory()==5) {
-            if(messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_PAY)) {
-                extendContent.put("currentTab ", 0) ;
-            }else {
-                extendContent.put("currentTab ", 1) ;
+        if (messageTypeEnum.getCategory() == 5) {
+            if (messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_PAY)) {
+                extendContent.put("currentTab ", 0);
+            } else {
+                extendContent.put("currentTab ", 1);
             }
         }
-        Map<String,String> map = this.toMapValue(memberId,valueList);
-        NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, orderId, noticeType, map , extendContent) ;
+        Map<String, String> map = this.toMapValue(memberId, valueList);
+        NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, relationId, noticeType, map, extendContent);
         list.add(qdto);
-        String storeId = clerkDTO.getStoreId() ;
+        String storeId = clerkDTO.getStoreId();
         ClerkDTO dz = this.clerkService.getClerkLeaderByStoreId(storeId);
         if (null != dz && !dz.getClerkId().equals(clerkId)) {
-            NoticeMessageQDTO dzQdto = this.getDTO(enterpriseId, dz.getClerkId(), orderId, noticeType, map , extendContent) ;
+            NoticeMessageQDTO dzQdto = this.getDTO(enterpriseId, dz.getClerkId(), relationId, noticeType, map,
+                    extendContent);
             list.add(dzQdto);
         }
         NoticeMessageUtil.sendNoticeMessageBatch(list);
         return com.gic.api.base.commons.ServiceResponse.success();
     }
-    
-    private NoticeMessageQDTO getDTO(String enterpriseId , String clerkId , String orderId , NoticeMessageTypeEnum noticeType , Map<String,String> map,Map<String, Object> extendContent) {
+
+    private NoticeMessageQDTO getDTO(String enterpriseId, String clerkId, String orderId,
+            NoticeMessageTypeEnum noticeType, Map<String, String> map, Map<String, Object> extendContent) {
         NoticeMessageQDTO qdto = new NoticeMessageQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
@@ -628,19 +631,19 @@ public class MessageApiServiceImpl implements MessageApiService {
         qdto.setOptTargetId(orderId);
         qdto.setCheckFlag(true);
         qdto.setExtendContent(extendContent);
-        return qdto ;
+        return qdto;
     }
-    
-    private Map<String,String> toMapValue(String memberId ,List<String> valueList) {
-        Map<String,String> map = new HashMap<>() ;
-        if(CollectionUtils.isNotEmpty(valueList)) {
-            for(int i=0;i<valueList.size();i++) {
-                map.put(""+(i + 1), valueList.get(i)) ;
+
+    private Map<String, String> toMapValue(String memberId, List<String> valueList) {
+        Map<String, String> map = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(valueList)) {
+            for (int i = 0; i < valueList.size(); i++) {
+                map.put("" + (i + 1), valueList.get(i));
             }
         }
-        MemberDTO member = this.memberService.getMember(memberId) ;
-        String name = member.getThirdNickname() ;
-        map.put("memberName", name) ;
-        return map ;
+        MemberDTO member = this.memberService.getMember(memberId);
+        String name = member.getThirdNickname();
+        map.put("memberName", name);
+        return map;
     }
 }