通知

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/qdto/NoticeMessageQDTO.java

@@ -17,6 +17,16 @@ public class NoticeMessageQDTO implements Serializable {
     private int messageType;
     private String templateCode;
     private Map<String, String> contentMap;
+    // 是否校验gic企业
+    private boolean checkFlag =false ;
+    
+    public boolean isCheckFlag() {
+        return checkFlag;
+    }
+
+    public void setCheckFlag(boolean checkFlag) {
+        this.checkFlag = checkFlag;
+    }
 
     public NoticeMessageQDTO() {
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageCategoryTypeEnum.java

@@ -10,6 +10,8 @@ public enum NoticeMessageCategoryTypeEnum {
     CUSTOMER(0, "客户相关"),
     TASK(1, "任务相关"),
     ACTIVITY(2, "活动相关"),
+    ORDER(4, "订单相关"),
+    REFUND(5, "售后相关"),
     OTHER(3, "其它"),;
     private int type;
     private String name;

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -57,6 +57,16 @@ public enum NoticeMessageTypeEnum {
     CUSTOMER_GET_COUPON(4004, "客户领券通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_get_coupon", "/pages/route/index?pageType=", "hbapp_customer_detail"),
     CUSTOMER_APPLY_ORDER_REFUND(4005, "客户申请退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_apply_order_refund", "/pages/route/index?pageType=", "hbapp_customer_order_detail"),
     CUSTOMER_SUCCESS_ORDER_REFUND(4006, "客户成功退单通知", NoticeMessageCategoryTypeEnum.CUSTOMER.getType(), "customer_success_order_refund", "/pages/route/index?pageType=", "hbapp_user_bill_detail"),
+    
+    // 订单- 待发货订单提醒
+    ORDER_TAKE(5000, "待自提订单提醒", NoticeMessageCategoryTypeEnum.ORDER.getType(), "order_take", "/pages/route/index?pageType=", "hbapp_order_verfication"),
+    ORDER_PAY(5001, "待发货订单提醒", NoticeMessageCategoryTypeEnum.ORDER.getType(), "order_pay", "/pages/route/index?pageType=", "hbapp_order_send"),
+    REFUND_AUDIT(5010, "售后待审核提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_audit", "/pages/route/index?pageType=", "hbapp_order_send"),
+    REFUND_MEMBER_CANCEL(5011, "买家取消售后提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_member_cancel", "/pages/route/index?pageType=", "hbapp_order_send"),
+    REFUND_EXCHANGE(5012, "换货待发货提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_exchange", "/pages/route/index?pageType=", "hbapp_order_send"),
+    REFUND_DELIVER(5013, "买家寄出退换货提醒", NoticeMessageCategoryTypeEnum.REFUND.getType(), "refund_deliver", "/pages/route/index?pageType=", "hbapp_order_send"),
+
+    
     ;
     /**
      * 消息类型

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

 package com.gic.haoban.manage.api.service;
 
+import java.util.List;
+
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
+import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 
 /**
  * Created by tgs on 2020/2/20.
@@ -24,40 +27,6 @@ public interface MessageApiService {
     void dealWxMessage(String param);
 
     /**
-     * 发送消费消息
-     *
-     * @param clerkId
-     * @param memberId
-     * @param memberName
-     * @param arrivalTime
-     * @param storeId
-     * @return
-     */
-    Boolean sendFaceMessage(String clerkId, String memberId, String memberName, String arrivalTime, String storeId);
-
-    /**
-     * 发送完善标签信息
-     *
-     * @param clerkId
-     * @param clerkId
-     * @param memberName
-     * @param customerTime
-     * @param orderId
-     * @param storeId
-     */
-    Boolean sendPerfectRemarkMessage(String clerkId, String memberId, String memberName, String customerTime, String orderId, String storeId);
-
-
-    /**
-     * 通用发送企业微信消息
-     *
-     * @param param 参数
-     * @author xuwenqian
-     * @date 2021-07-16 10:09:00
-     */
-    void sendWxMessage(String param);
-
-    /**
      * 获取新的微信用户id
      *
      * @param wxEnterpriseId 微信企业id
@@ -67,7 +36,7 @@ public interface MessageApiService {
      * @date 2022-03-10 13:48:10
      */
     String getNewWxUserIdByStaffId(String wxEnterpriseId, String staffId);
-    
+
     /**
      * 
     * @Title: sendPreMessage
@@ -79,6 +48,22 @@ public interface MessageApiService {
     * @return
     * @throws
      */
-    ServiceResponse<Void> sendPreMessage(String enterpriseId ,String storeId , String message) ;
+    ServiceResponse<Void> sendPreMessage(String enterpriseId, String storeId, String message);
+
+    /**
+     * 
+    * @Title: sendOrderMessage
+    * @Description: TODO(这里用一句话描述这个方法的作用)
+    * @author xugh
+    * @param enterpriseId
+    * @param templateCode
+    * @param clerkId
+    * @param memberId
+    * @param valueList
+    * @return
+    * @throws
+     */
+    ServiceResponse<Void> sendOrderMessage(String enterpriseId, NoticeMessageTypeEnum noticeType,  String orderId, String clerkId, String memberId,
+            List<String> valueList);
 
 }

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

@@ -43,9 +43,11 @@ public class NoticeMessageServiceImpl implements NoticeMessageService {
     }
 
     @Override
-    public Page<NoticeMessageBO> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo) {
+    public Page<NoticeMessageBO> pageNoticeMessage(String enterpriseId, String storeId, String clerkId,
+            int categoryType, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
-        List<TabNoticeMessage> list = noticeMessageMapper.listNoticeMessage(enterpriseId, storeId, clerkId, categoryType);
+        List<TabNoticeMessage> list = noticeMessageMapper.listNoticeMessage(enterpriseId, storeId, clerkId,
+                categoryType);
         Page<NoticeMessageBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, NoticeMessageBO.class);
         return retPage;
     }