站内消息提交

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -7,8 +7,10 @@ import com.caimei.modules.coupon.service.CmCouponService;
 import com.caimei.modules.product.entity.Product;
 import com.caimei.modules.product.service.ProductService;
 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.entity.CmUser;
+import com.caimei.modules.user.entity.MessageCenter;
 import com.caimei.modules.user.entity.NewCmClub;
 import com.caimei.modules.user.entity.NewCmShop;
 import com.caimei.utils.AppUtils;
@@ -27,7 +29,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -48,6 +52,8 @@ public class CmCouponController extends BaseController {
     private NewCmClubDao newCmClubDao;
     @Autowired
     private ProductService productService;
+    @Autowired
+    private MessageCenterDao messageCenterDao;
 
     @ModelAttribute
     public CmCoupon get(@RequestParam(required = false) String id) {
@@ -318,4 +324,4 @@ public class CmCouponController extends BaseController {
         model.addAttribute("moneyCoupons", moneyCoupons);
         return "/modules/coupon/productCouponDetails";
     }
-}
+}

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -12,8 +12,10 @@ import com.caimei.modules.product.dao.ProductNewDao;
 import com.caimei.modules.product.entity.*;
 import com.caimei.modules.product.service.*;
 import com.caimei.modules.sys.utils.UploadImageUtils;
+import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.entity.CmPageModules;
 import com.caimei.modules.user.entity.CmUserOrganize;
+import com.caimei.modules.user.entity.MessageCenter;
 import com.caimei.modules.user.entity.SplitCode;
 import com.caimei.modules.user.service.CmUserOrganizeService;
 import com.caimei.po.ProductImage;
@@ -84,7 +86,8 @@ public class ProductNewController extends BaseController {
     private GenerateUtils generateUtils;
     @Resource
     private ProductNewDao productNewDao;
-
+    @Autowired
+    private MessageCenterDao messageCenterDao;
     @ModelAttribute
     public Product get(@RequestParam(required = false) String id) {
         Product entity = null;
@@ -886,6 +889,30 @@ public class ProductNewController extends BaseController {
             }
 
             productNewService.auditProduct(validFlag,newvalidFlag,showtime, beforeValidFlag, productID);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String current = dateFormat.format(new Date());
+            MessageCenter messageCenter = new MessageCenter();
+           Integer shopid= messageCenterDao.shopID(productID);
+           if("8".equals(validFlag)){
+               messageCenter.setShopID(shopid);
+               messageCenter.setClubID(null);
+               messageCenter.setUserType(2);
+               messageCenter.setMessageType(2);
+               messageCenter.setShopMessType(3);
+               messageCenter.setContent(null);
+               messageCenter.setTime(current);
+               messageCenterDao.addMessageCenter(messageCenter);
+           }
+            if(newvalidFlag==2){
+                messageCenter.setShopID(shopid);
+                messageCenter.setClubID(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(4);
+                messageCenter.setContent(null);
+                messageCenter.setTime(current);
+                messageCenterDao.addMessageCenter(messageCenter);
+            }
 
             map.put("success", true);
             map.put("msg", "操作成功");

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

@@ -1,8 +1,12 @@
 package com.caimei.modules.user.dao;
 
+import com.caimei.modules.user.entity.ClubChangeSp;
+import com.caimei.modules.user.entity.ClubTemporary;
+import com.caimei.modules.user.entity.CmUser;
 import com.caimei.modules.user.entity.MessageCenter;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.thinkgem.jeesite.modules.sys.entity.User;
 
 /**
  * Description
@@ -16,5 +20,9 @@ public interface MessageCenterDao extends CrudDao<MessageCenter> {
 
     void addMessageCenter(MessageCenter messageCenter);
 
+    Integer shopID(Integer productID);
+
     Integer clubIdCule(Integer userId);
+
+    CmUser clubList(Integer userId);
 }

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

@@ -43,6 +43,12 @@ private Integer orderID;
 订单信息中心类型
  */
 private Integer orderMessageType;
+    /**
+     *供应商消息类型 1,账号审核通知,2.成为公司运营人员通知,3.商品上架审核通知,4.新品展示审核通知
+     */
+    private Integer shopMessType;
+
+
 
     public Integer getShopID() {
         return shopID;
@@ -115,4 +121,12 @@ private Integer orderMessageType;
     public void setOrderMessageType(Integer orderMessageType) {
         this.orderMessageType = orderMessageType;
     }
+
+    public Integer getShopMessType() {
+        return shopMessType;
+    }
+
+    public void setShopMessType(Integer shopMessType) {
+        this.shopMessType = shopMessType;
+    }
 }

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -6,6 +6,7 @@ import com.caimei.modules.order.entity.CmDiscernReceipt;
 import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
@@ -66,6 +67,8 @@ public class NewCmShopController extends BaseController {
     CmOperationalLogService cmOperationalLogService;
     @Autowired
     private SysLogService sysLogService;
+    @Autowired
+    private MessageCenterDao messageCenterDao;
 
 
     @ModelAttribute
@@ -366,7 +369,17 @@ public class NewCmShopController extends BaseController {
             map.put("success", true);
             map.put("msg", "审核成功");
 
-
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String current = dateFormat.format(new Date());
+            MessageCenter messageCenter = new MessageCenter();
+                messageCenter.setShopID(shopId);
+                messageCenter.setClubID(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(1);
+                messageCenter.setContent(null);
+                messageCenter.setTime(current);
+                messageCenterDao.addMessageCenter(messageCenter);
 
             if (StringUtils.isNotEmpty(mobile)) {
                 SMSUtils.sendSms(mobile, smsMessage);

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -161,13 +161,14 @@
                 AND a.payType = #{payType}
             </if>
             <if test="receiptType != null and receiptType != ''">
-                <if test="receiptType==2">
+                <if test="receiptType==2 and newReceiptType==3">
                     and (a.receiptType = 9)
             or a.receiptType = #{receiptType}
                 </if>
                 <if test="receiptType!=2">
                     AND a.receiptType = #{receiptType}
                 </if>
+                AND a.receiptType = #{receiptType}
             </if>
         <if test="newReceiptType !=null">
             <if test="newReceiptType==3">

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

@@ -2,11 +2,18 @@
 <!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 INTO message_center (shopID, clubID, userType, messageType,content,time,accountType,orderID,orderMessageType,shopMessType)
+        VALUES (#{shopID}, #{clubID}, #{userType}, #{messageType},#{content},#{time},#{accountType},#{orderID},#{orderMessageType},#{shopMessType})
     </insert>
 
     <select id="clubIdCule" resultType="java.lang.Integer">
         SELECT clubID FROM `user` WHERE userId=#{userId}
     </select>
+
+    <select id="clubList" resultType="com.caimei.modules.user.entity.CmUser">
+        SELECT * FROM `user` WHERE userId=#{userId}
+    </select>
+    <select id="shopID" resultType="java.lang.Integer">
+        SELECT shopID FROM `product` WHERE productID=#{productID}
+    </select>
 </mapper>