消息中心推送

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -12,12 +12,10 @@ import com.caimei.modules.order.utils.*;
 import com.caimei.modules.product.dao.CmPromotionDao;
 import com.caimei.modules.product.dao.CmSecondHandDetailDao;
 import com.caimei.modules.product.entity.CmPromotion;
-import com.caimei.modules.user.dao.CmUserBalanceRecordDao;
-import com.caimei.modules.user.dao.CmUserDao;
-import com.caimei.modules.user.dao.CmUserbeanshistoryDao;
-import com.caimei.modules.user.dao.NewCmClubDao;
+import com.caimei.modules.user.dao.*;
 import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.CmUserBalanceRecord;
+import com.caimei.modules.user.entity.MessageCenter;
 import com.caimei.modules.user.entity.UserBeansHistory;
 import com.caimei.modules.user.service.CmUserBalanceRecordService;
 import com.caimei.utils.AppUtils;
@@ -103,6 +101,9 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
     private CmUserbeanshistoryDao cmUserbeanshistoryDao;
     @Autowired
     private CmCouponClubDao cmCouponClubDao;
+    @Autowired
+    private MessageCenterDao messageCenterDao;
+
 
 
     public CmReturnedPurchase get(String id) {
@@ -696,12 +697,41 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                     String wwwServer = Global.getConfig("wwwServer");
                     boolean sendSms = false;
                     if ("1".equals(newOrder.getRefundType())) {
+                        Date date = new Date();
+                        String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                        //推送信息中心-交易物流
+                       Integer clubId= messageCenterDao.clubIdCule(newOrder.getUserID());
+                        MessageCenter messageCenter=new MessageCenter();
+                        messageCenter.setShopID(null);
+                        messageCenter.setClubID(clubId);
+                        messageCenter.setUserType(1);
+                        messageCenter.setMessageType(1);
+                        messageCenter.setOrderMessageType(3);
+                        messageCenter.setOrderID(newOrder.getOrderID());
+                        messageCenter.setContent(returnedPurchase.getRefundFee().toString());
+                        messageCenter.setTime(curDateStr);
+                        messageCenterDao.addMessageCenter(messageCenter);
                         //部分退
                         String shortLink = newOrderService.getShortLink(8, 9, wwwServer + "user/order/detail.html?orderId=" + newOrder.getOrderID());
                         String content = "订单（订单编号：" + newOrder.getOrderNo() + "）已部分退款成功，本次退款金额￥" + returnedPurchase.getRefundFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +
                                 "平台公众号：微信搜索“采美365网”; 微信小程序：微信搜索“采美采购商城”；网址：www.caimei365.com/t/" + shortLink;
                         sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
                     } else if ("2".equals(newOrder.getRefundType())) {
+
+                        Date date = new Date();
+                        String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                        //推送信息中心-交易物流
+                        Integer clubId= messageCenterDao.clubIdCule(newOrder.getUserID());
+                        MessageCenter messageCenter=new MessageCenter();
+                        messageCenter.setShopID(null);
+                        messageCenter.setClubID(clubId);
+                        messageCenter.setUserType(1);
+                        messageCenter.setMessageType(1);
+                        messageCenter.setOrderMessageType(3);
+                        messageCenter.setOrderID(newOrder.getOrderID());
+                        messageCenter.setContent(returnedPurchase.getRefundFee().toString());
+                        messageCenter.setTime(curDateStr);
+                        messageCenterDao.addMessageCenter(messageCenter);
                         //全部退
                         String shortLink = newOrderService.getShortLink(8, 10, wwwServer + "user/order/detail.html?orderId=" + newOrder.getOrderID());
                         String content = "订单（订单编号：" + newOrder.getOrderNo() + "）已全部退款成功，退款金额￥" + returnedPurchase.getRefundFee() + "。您可关注采美公众号或者访问采美微信小程序和网站查看订单。" +

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -30,6 +30,7 @@ import com.caimei.modules.product.entity.CmPromotion;
 import com.caimei.modules.product.entity.OrderProductLadderPrice;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.dao.NewCmClubDao;
 import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.*;
@@ -128,6 +129,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     private HeHeNewOrderDao heHeNewOrderDao;
     @Autowired
     private WeChatService weChatService;
+    @Autowired
+    private MessageCenterDao messageCenterDao;
 
     @Transactional(readOnly = false)
     public void updateClauseContent(NewOrder newOrder) {
@@ -1697,6 +1700,28 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 } else {
                     autoCloseTimeMills += cfg.getValue() * 60 * 1000;
                 }
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //24小时制
+
+                Date dat = new Date();
+                Date d=new Date();
+                dat.setTime(autoCloseTimeMills);
+                System.out.println("时间戳转日期格式：" + simpleDateFormat.format(dat));
+                Long s=(d.getTime()-dat.getTime())/24/60/60/1000;
+                if(s>cfg.getValue()){
+                    //推送信息中心-交易物流
+                    String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(dat);
+                    MessageCenter messageCenter=new MessageCenter();
+                    messageCenter.setShopID(null);
+                    messageCenter.setClubID(shopOrder.getClubID());
+                    messageCenter.setUserType(1);
+                    messageCenter.setMessageType(1);
+                    messageCenter.setOrderMessageType(5);
+                    messageCenter.setOrderID(shopOrder.getOrderID());
+                    messageCenter.setContent(null);
+                    messageCenter.setTime(curDateStr);
+                    messageCenterDao.addMessageCenter(messageCenter);
+                }
+
 
                 shopOrder.setAutoReceiveTimeMills(autoCloseTimeMills);
             }
@@ -1735,6 +1760,18 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                     } catch (Exception e) {
                         logger.error("【订单发货通知】获取微信公众号access_token异常！", e);
                     }
+                    String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                    //推送信息中心-交易物流
+                    MessageCenter messageCenter=new MessageCenter();
+                    messageCenter.setShopID(null);
+                    messageCenter.setClubID(order.getClubID());
+                    messageCenter.setUserType(1);
+                    messageCenter.setMessageType(1);
+                    messageCenter.setOrderMessageType(5);
+                    messageCenter.setOrderID(order.getOrderID());
+                    messageCenter.setContent(null);
+                    messageCenter.setTime(curDateStr);
+                    messageCenterDao.addMessageCenter(messageCenter);
                 }
             }
             //所有的子订单都已经完成发货了
@@ -1764,6 +1801,20 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 } catch (Exception e) {
                     logger.error("【订单发货通知】获取微信公众号access_token异常！", e);
                 }
+
+                String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                //推送信息中心-交易物流
+                MessageCenter messageCenter=new MessageCenter();
+                messageCenter.setShopID(null);
+                messageCenter.setClubID(order.getClubID());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(1);
+                messageCenter.setOrderMessageType(5);
+                messageCenter.setOrderID(order.getOrderID());
+                messageCenter.setContent(null);
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+
             }
 
             //代码走到这里订单肯定是有发货了  整个订单里面的商品没有全部发完  那就是部分发货了

src/main/java/com/caimei/modules/user/dao/MessageCenterDao.java

@@ -0,0 +1,20 @@
+package com.caimei.modules.user.dao;
+
+import com.caimei.modules.user.entity.MessageCenter;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/7/7
+ */
+@MyBatisDao
+public interface MessageCenterDao extends CrudDao<MessageCenter> {
+
+
+    void addMessageCenter(MessageCenter messageCenter);
+
+    Integer clubIdCule(Integer userId);
+}

src/main/java/com/caimei/modules/user/entity/MessageCenter.java

@@ -0,0 +1,118 @@
+package com.caimei.modules.user.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+
+public class MessageCenter extends DataEntity<MessageCenter> {
+
+
+    /**
+    供应商id
+     */
+    private Integer shopID;
+    /**
+    机构id
+     */
+    private Integer clubID;
+    /**
+   用户类型1.机构2.供应商
+     */
+    private Integer userType;
+    /**
+     消息类型1.交易物流2.账户通知3.服务通知4.优惠促销
+     */
+    private Integer messageType;
+    /**
+     * 消息内容
+     */
+    private String content;
+    /**
+     * 操作完成时间
+     */
+    private String time;
+    /**
+     *账户通知类型 1.注册成功通知 2.购买超级会员成功 3.超级会员到期提醒 4.超级会员到期提醒 5.升级资质机构成功 6.升级资质机构失败 7.成为机构运营人员通知
+     */
+    private Integer accountType;
+
+    /**
+     *订单id
+     */
+private Integer orderID;
+/*
+订单信息中心类型
+ */
+private Integer orderMessageType;
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public Integer getClubID() {
+        return clubID;
+    }
+
+    public void setClubID(Integer clubID) {
+        this.clubID = clubID;
+    }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    public Integer getMessageType() {
+        return messageType;
+    }
+
+    public void setMessageType(Integer messageType) {
+        this.messageType = messageType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public Integer getAccountType() {
+        return accountType;
+    }
+
+    public void setAccountType(Integer accountType) {
+        this.accountType = accountType;
+    }
+
+    public Integer getOrderID() {
+        return orderID;
+    }
+
+    public void setOrderID(Integer orderID) {
+        this.orderID = orderID;
+    }
+
+    public Integer getOrderMessageType() {
+        return orderMessageType;
+    }
+
+    public void setOrderMessageType(Integer orderMessageType) {
+        this.orderMessageType = orderMessageType;
+    }
+}

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -9,6 +9,7 @@ import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.aop.OperationLogAnnotation;
+import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
 import com.caimei.utils.AppKeys;
@@ -80,6 +81,8 @@ public class AgencyController extends BaseController {
     private CmOperationUserService cmOperationUserService;
     @Autowired
     private SysLogService sysLogService;
+    @Autowired
+    private MessageCenterDao messageCenterDao;
 
     @ModelAttribute
     public NewCmClub get(@RequestParam(required = false) String id) {
@@ -845,8 +848,17 @@ public class AgencyController extends BaseController {
                         int i = sysLogService.insert(sysLog);
                     }
                 }
-
-
+                Date date = new Date();
+                String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                MessageCenter messageCenter=new MessageCenter();
+                messageCenter.setShopID(null);
+                messageCenter.setClubID(newCmClub.getClubID());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(2);
+                messageCenter.setContent(null);
+                messageCenter.setTime(curDateStr);
+                messageCenter.setAccountType(5);
+                messageCenterDao.addMessageCenter(messageCenter);
 
                 userPermission = 2;
                 status = "90";
@@ -860,6 +872,19 @@ public class AgencyController extends BaseController {
                 int userBeans = companyUser.getUserBeans() == null ? 0 : companyUser.getUserBeans();
                 companyUser.setUserBeans(userBeans + 500);
             } else {
+                Date date = new Date();
+                String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                MessageCenter messageCenter=new MessageCenter();
+                messageCenter.setShopID(null);
+                messageCenter.setClubID(newCmClub.getClubID());
+                messageCenter.setUserType(1);
+                messageCenter.setMessageType(2);
+                messageCenter.setAccountType(6);
+                messageCenter.setContent(null);
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+
+
                 //审核未通过,普通机构权限
                 userPermission = 5;
                 companyUser.setUserPermission(userPermission);

src/main/resources/mappings/modules/user/MessageCenter.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.user.dao.MessageCenterDao">
+    <insert id="addMessageCenter">
+        INSERT INTO message_center (shopID, clubID, userType, messageType,content,time,accountType,orderID,orderMessageType)
+        VALUES (#{shopID}, #{clubID}, #{userType}, #{messageType},#{content},#{time},#{accountType},#{orderID},#{orderMessageType})
+    </insert>
+
+    <select id="clubIdCule" resultType="java.lang.Integer">
+        SELECT clubID FROM `user` WHERE userId=#{userId}
+    </select>
+</mapper>