推送版本bugfix

src/main/java/com/caimei/modules/coupon/redis/RedisLearn.java

@@ -7,6 +7,7 @@ import com.caimei.modules.user.entity.MessageCenter;
 import com.cmme.modules.product.entity.CmmeProductImage;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import redis.clients.jedis.Jedis;
 
@@ -24,14 +25,21 @@ import java.util.concurrent.atomic.AtomicReference;
 public class RedisLearn {
 
 
-
-
     public static void producer( List<Integer> clubIds) {
-        Jedis jedis = new Jedis("172.31.165.27", 6379);
-        jedis.auth("6#xsI%b4o@5c3RoE");
+
         clubIds.forEach(clubId -> {
+            Jedis jedis=null;
+            String constraint="";
+
+                jedis=new Jedis("172.31.165.27", 6379);
+                jedis.auth("6#xsI%b4o@5c3RoE");
+
+//                jedis=new Jedis("192.168.2.100", 6379);
+
+//                jedis=new Jedis("172.31.165.23", 6379);
+
             // 记录机构ID
-            jedis.lpush(clubId.toString(),clubId.toString());
+            jedis.lpush("mess"+clubId.toString(),clubId.toString());
         });
     }
 

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

@@ -25,6 +25,8 @@ import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -67,6 +69,8 @@ public class CmCouponController extends BaseController {
     private NewShopOrderDao newShopOrderDao;
     @Autowired
     private WeChatService weChatService;
+    @Value("${wwwServer}")
+    private String domain;
 
     @ModelAttribute
     public CmCoupon get(@RequestParam(required = false) String id) {
@@ -81,6 +85,8 @@ public class CmCouponController extends BaseController {
     }
 
 
+
+
     @RequiresPermissions("coupon:cmCoupon:view")
     @RequestMapping(value = {"list", ""})
     public String list(CmCoupon cmCoupon, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -140,21 +146,231 @@ public class CmCouponController extends BaseController {
             return "modules/coupon/couponNewUserForm";
         }
     }
+    @Scheduled(cron = "0 0/3 * * * ?")
+public void ConSumertime(){
+        logger.info("》》》》》》》》》》》开始检测优惠券是否生效");
+   List<CmCoupon>coupons=messageCenterDao.couponTime();
+   coupons.forEach(cmCoupon->{
+       List<Integer> clubIds = messageCenterDao.ClubIds();
+       new Thread(() ->  clubIds.forEach(clubIdb -> {
+           Jedis jedis=null;
+           String constraint="";
+           if(domain.contains("-b")){
+               jedis=new Jedis("172.31.165.27", 6379);
+               jedis.auth("6#xsI%b4o@5c3RoE");
+           }else if(domain.contains("localhost")){
+               jedis=new Jedis("192.168.2.100", 6379);
+           }else {
+               jedis=new Jedis("172.31.165.23", 6379);
+           }
+           // 获取消息
+           String clubIdc = jedis.rpop("mess"+clubIdb.toString());
+           Integer clubId = Integer.parseInt(clubIdc);
+           if (clubId != null) {
+               Date date = new Date();
+               SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+               CmUser user = messageCenterDao.clubList(clubId);
+               int coumt = 0;//计数五种消息只推送一条
+               String catego = "";
+               Integer ts = (date.compareTo(cmCoupon.getStartDate()));
+               if (ts >= 0) {
+                   if ("90".equals(user.getClubStatus()) && 0 == cmCoupon.getCouponType()) {
+                       CmCoupon coupon = messageCenterDao.CouponList(0);//查询优惠券信息
+                       if (coupon != null) {
+                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                           MessageCenter messageCenter = new MessageCenter();
+                           messageCenter.setShopId(null);
+                           messageCenter.setClubId(clubId);
+                           messageCenter.setUserType(1);
+                           messageCenter.setMessageType(4);
+                           messageCenter.setContent(null);
+                           messageCenter.setTime(curDateStr);
+                           messageCenter.setCouponType(0);
+                           messageCenter.setCouponMessageType(1);
+                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
+                           messageCenterDao.addMessageCenter(messageCenter);
+                           String content = "【采美365】采美平台送您" + coupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                           boolean sendSms = false;
+                           try {
+                               sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
+                           } catch (Exception e) {
+                               e.printStackTrace();
+                           }
+                           if (sendSms) {
+                               logger.info(">>>>>>>发送成功");
+                           }
+                           jedis.del("mess"+clubIdc);
+                           coumt++;
+                       }
+                   }
+                   if ("90".equals(user.getClubStatus()) && coumt == 0 && 1 == cmCoupon.getCouponType()) {
+                       CmCoupon coupon = messageCenterDao.CouponList(1);//查询优惠券信息
+                       if (coupon != null) {
+                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                           MessageCenter messageCenter = new MessageCenter();
+                           messageCenter.setShopId(null);
+                           messageCenter.setClubId(clubId);
+                           messageCenter.setUserType(1);
+                           messageCenter.setMessageType(4);
+                           if (coupon != null && "1".equals(coupon.getCategoryType())) {
+                               catego = "产品";
+                           }
+                           if (coupon != null && "2".equals(coupon.getCategoryType())) {
+                               catego = "仪器";
+                           }
+                           messageCenter.setContent(catego);
+                           messageCenter.setTime(curDateStr);
+                           messageCenter.setCouponType(1);
+                           messageCenter.setCouponMessageType(1);
+                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
+                           messageCenterDao.addMessageCenter(messageCenter);
+                           String content = "【采美365】采美平台" + catego + "类商品大优惠，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                           boolean sendSms = false;
+                           try {
+                               sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
+                           } catch (Exception e) {
+                               e.printStackTrace();
+                           }
+                           if (sendSms) {
+                               logger.info(">>>>>>>发送成功");
+                           }
+
+                           jedis.del("mess"+clubIdc);
+                           coumt++;
+                       }
+                   }
+                   if (coumt == 0 && 2 == cmCoupon.getCouponType()) {
+                       CmCoupon coupon = messageCenterDao.CouponList(2);//查询优惠券信息
+                       if (coupon != null) {
+                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                           MessageCenter messageCenter = new MessageCenter();
+                           if (coupon != null && coupon.getUserId() != null) {
+                               messageCenter.setShopId(null);
+                               messageCenter.setClubId(clubId);
+                               messageCenter.setUserType(1);
+                               messageCenter.setMessageType(4);
+                               messageCenter.setContent(null);
+                               messageCenter.setTime(curDateStr);
+                               messageCenter.setCouponType(2);
+                               messageCenter.setCouponMessageType(1);
+                               messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
+                               messageCenterDao.addMessageCenter(messageCenter);
+
+                               String content = "【采美365】为了答谢您对采美平台的支持，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                               boolean sendSms = false;
+                               try {
+                                   sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
+                               } catch (Exception e) {
+                                   e.printStackTrace();
+                               }
+                               if (sendSms) {
+                                   logger.info(">>>>>>>发送成功");
+                               }
+
+                               jedis.del("mess"+clubIdc);
+                               coumt++;
+                           }
+                       }
+                   }
+                   if ("90".equals(user.getClubStatus()) && coumt == 0 && 3 == cmCoupon.getCouponType()) {
+                       CmCoupon coupon = messageCenterDao.CouponList(3);//查询优惠券信息
+                       if (coupon != null) {
+                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                           MessageCenter messageCenter = new MessageCenter();
+                           messageCenter.setShopId(null);
+                           messageCenter.setClubId(clubId);
+                           messageCenter.setUserType(1);
+                           messageCenter.setMessageType(4);
+                           messageCenter.setContent(user.getName());
+                           messageCenter.setTime(curDateStr);
+                           messageCenter.setCouponType(3);
+                           messageCenter.setCouponMessageType(1);
+                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
+                           messageCenterDao.addMessageCenter(messageCenter);
+
+                           String content = "【采美365】采美平台为了回馈客户，赠送您" + coupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                           boolean sendSms = false;
+                           try {
+                               sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
+                           } catch (Exception e) {
+                               e.printStackTrace();
+                           }
+                           if (sendSms) {
+                               logger.info(">>>>>>>发送成功");
+                           }
+
+                           jedis.del("mess"+clubIdc);
+                           coumt++;
+                       }
+                   }
+                   if (coumt == 0 && 4 == cmCoupon.getCouponType()) {
+                       CmCoupon coupon = messageCenterDao.CouponList(4);//查询优惠券信息
+                       if (coupon != null) {
+                           String startDate = sdf.format(coupon.getStartDate());
+                           int num = startDate.compareTo(user.getRegisterTime());
+                           if (num > 0) {
+                               String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+                               MessageCenter messageCenter = new MessageCenter();
+                               if (coupon != null && coupon.getUserId() != null) {
+                                   messageCenter.setShopId(null);
+                                   messageCenter.setClubId(clubId);
+                                   messageCenter.setUserType(1);
+                                   messageCenter.setMessageType(4);
+                                   messageCenter.setContent(null);
+                                   messageCenter.setTime(curDateStr);
+                                   messageCenter.setCouponType(4);
+                                   messageCenter.setCouponMessageType(1);
+                                   messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
+                                   messageCenterDao.addMessageCenter(messageCenter);
+
+                                   String content = "【采美365】恭喜成功注册采美平台。采美平台赠送您" + coupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                   boolean sendSms = false;
+                                   try {
+                                       sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
+                                   } catch (Exception e) {
+                                       e.printStackTrace();
+                                   }
+                                   if (sendSms) {
+                                       logger.info(">>>>>>>发送成功");
+                                   }
+
+                                   jedis.del("mess"+clubIdc);
+                                   coumt++;
+                               }
+                           }
+                       }
+                   }
+               }
+           }
+           jedis.del("mess"+clubIdc);
+           System.out.println(jedis.rpop("mess"+clubIdc));
+       }));
+   });
+
+}
+
 
     //优惠券站内消息推送
     private void consumer(CmCoupon cmCoupon, List<Integer> clubIds) {
-        Jedis jedis = new Jedis("172.31.165.27", 6379);
-        jedis.auth("6#xsI%b4o@5c3RoE");
         // 消费消息
-        while (true) {
+//        while (true) {
             clubIds.forEach(clubIdb -> {
+                Jedis jedis=null;
+                String constraint="";
+                if(domain.contains("-b")){
+                    jedis=new Jedis("172.31.165.27", 6379);
+                    jedis.auth("6#xsI%b4o@5c3RoE");
+                }else if(domain.contains("localhost")){
+                    jedis=new Jedis("192.168.2.100", 6379);
+                }else {
+                    jedis=new Jedis("172.31.165.23", 6379);
+                }
                 // 获取消息
-                String clubIdc = jedis.rpop(clubIdb.toString());
+                String clubIdc = jedis.rpop("mess"+clubIdb.toString());
                 Integer clubId = Integer.parseInt(clubIdc);
                 if (clubId != null) {
                     Date date = new Date();
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-
                     CmUser user = messageCenterDao.clubList(clubId);
                     int coumt = 0;//计数五种消息只推送一条
                     String catego = "";
@@ -175,7 +391,7 @@ public class CmCouponController extends BaseController {
                                 messageCenter.setCouponMessageType(1);
                                 messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
                                 messageCenterDao.addMessageCenter(messageCenter);
-                                String content = "短信模板：【采美365】采美平台送您" + coupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                String content = "【采美365】采美平台送您" + coupon.getCouponAmount() + "元优惠券，众多大牌正品等着您，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取下单吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                 boolean sendSms = false;
                                 try {
                                     sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
@@ -185,7 +401,7 @@ public class CmCouponController extends BaseController {
                                 if (sendSms) {
                                     logger.info(">>>>>>>发送成功");
                                 }
-                                jedis.del(clubIdc);
+                                jedis.del("mess"+clubIdc);
                                 coumt++;
                             }
                         }
@@ -210,7 +426,7 @@ public class CmCouponController extends BaseController {
                                 messageCenter.setCouponMessageType(1);
                                 messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
                                 messageCenterDao.addMessageCenter(messageCenter);
-                                String content = "短信模板：【采美365】采美平台" + catego + "类商品大优惠，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                String content = "【采美365】采美平台" + catego + "类商品大优惠，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                 boolean sendSms = false;
                                 try {
                                     sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
@@ -221,7 +437,7 @@ public class CmCouponController extends BaseController {
                                     logger.info(">>>>>>>发送成功");
                                 }
 
-                                jedis.del(clubIdc);
+                                jedis.del("mess"+clubIdc);
                                 coumt++;
                             }
                         }
@@ -242,7 +458,7 @@ public class CmCouponController extends BaseController {
                                     messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
                                     messageCenterDao.addMessageCenter(messageCenter);
 
-                                    String content = "短信模板：【采美365】为了答谢您对采美平台的支持，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                    String content = "【采美365】为了答谢您对采美平台的支持，采美平台送您" + coupon.getCouponAmount() + "元优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                     boolean sendSms = false;
                                     try {
                                         sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
@@ -253,7 +469,7 @@ public class CmCouponController extends BaseController {
                                         logger.info(">>>>>>>发送成功");
                                     }
 
-                                    jedis.del(clubIdc);
+                                    jedis.del("mess"+clubIdc);
                                     coumt++;
                                 }
                             }
@@ -274,7 +490,7 @@ public class CmCouponController extends BaseController {
                                 messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
                                 messageCenterDao.addMessageCenter(messageCenter);
 
-                                String content = "短信模板：【采美365】采美平台为了回馈客户，赠送您" + coupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                String content = "【采美365】采美平台为了回馈客户，赠送您" + coupon.getCouponAmount() + "元的店铺专属优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                 boolean sendSms = false;
                                 try {
                                     sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
@@ -285,7 +501,7 @@ public class CmCouponController extends BaseController {
                                     logger.info(">>>>>>>发送成功");
                                 }
 
-                                jedis.del(clubIdc);
+                                jedis.del("mess"+clubIdc);
                                 coumt++;
                             }
                         }
@@ -309,7 +525,7 @@ public class CmCouponController extends BaseController {
                                         messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
                                         messageCenterDao.addMessageCenter(messageCenter);
 
-                                        String content = "短信模板：【采美365】恭喜成功注册采美平台。采美平台赠送您" + coupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
+                                        String content = "【采美365】恭喜成功注册采美平台。采美平台赠送您" + coupon.getCouponAmount() + "元新用户优惠券，快戳采美网站链接www.caimei365.com/M2Tr98CG 或微信搜索“采美采购商城”小程序登录采美平台领取吧。关注公众号“采美网”获取更多优惠和精彩资讯。";
                                         boolean sendSms = false;
                                         try {
                                             sendSms = newOrderService.getSendSms(9, user.getBindMobile(), content);
@@ -320,7 +536,7 @@ public class CmCouponController extends BaseController {
                                             logger.info(">>>>>>>发送成功");
                                         }
 
-                                        jedis.del(clubIdc);
+                                        jedis.del("mess"+clubIdc);
                                         coumt++;
                                     }
                                 }
@@ -328,9 +544,13 @@ public class CmCouponController extends BaseController {
                         }
                     }
                 }
+                jedis.del("mess"+clubIdc);
+                System.out.println(jedis.rpop("mess"+clubIdc));
             });
+
         }
-    }
+
+//    }
 
 
     @RequestMapping(value = "save")
@@ -340,128 +560,8 @@ public class CmCouponController extends BaseController {
         }
         List<Integer> clubIds = messageCenterDao.ClubIds();
         new Thread(() -> consumer(cmCoupon, clubIds)).start();
-
         RedisLearn.producer(clubIds);
 
-
-//        /**
-//         * 站内消息-优惠券推送
-//         */
-//        Date date = new Date();
-//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-//        //登入的日期
-//            List<Integer> clubIds=messageCenterDao.ClubIds();
-//
-//
-//           clubIds.forEach(clubId->{
-//               RedisLearn.producer(clubId.toString(),clubId.toString());
-//               CmUser user = messageCenterDao.clubList(clubId);
-//               int coumt = 0;//计数五种消息只推送一条
-//               String catego = "";
-//               Integer ts=(date.compareTo(cmCoupon.getStartDate()));
-//                  if(ts>=0){
-//                   if ("90".equals(user.getClubStatus())) {
-//                       CmCoupon coupon = messageCenterDao.CouponList(0);//查询优惠券信息
-//                       if(coupon!=null){
-//                       String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//                       MessageCenter messageCenter = new MessageCenter();
-//                       messageCenter.setShopId(null);
-//                       messageCenter.setClubId(clubId);
-//                       messageCenter.setUserType(1);
-//                       messageCenter.setMessageType(4);
-//                       messageCenter.setContent(null);
-//                       messageCenter.setTime(curDateStr);
-//                       messageCenter.setCouponType(0);
-//                       messageCenter.setCouponMessageType(1);
-//                       messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
-//                       messageCenterDao.addMessageCenter(messageCenter);
-//                       coumt++;
-//                       }
-//                   } else if ("90".equals(user.getClubStatus()) && coumt == 0) {
-//                       CmCoupon coupon = messageCenterDao.CouponList(1);//查询优惠券信息
-//                       if(coupon!=null) {
-//                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//                           MessageCenter messageCenter = new MessageCenter();
-//                           messageCenter.setShopId(null);
-//                           messageCenter.setClubId(clubId);
-//                           messageCenter.setUserType(1);
-//                           messageCenter.setMessageType(4);
-//                           if (coupon != null && "1".equals(coupon.getCategoryType())) {
-//                               catego = "产品";
-//                           }
-//                           if (coupon != null && "2".equals(coupon.getCategoryType())) {
-//                               catego = "仪器";
-//                           }
-//                           messageCenter.setContent(catego);
-//                           messageCenter.setTime(curDateStr);
-//                           messageCenter.setCouponType(1);
-//                           messageCenter.setCouponMessageType(1);
-//                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
-//                           messageCenterDao.addMessageCenter(messageCenter);
-//                           coumt++;
-//                       }
-//                   } else if (coumt == 0) {
-//                       CmCoupon coupon = messageCenterDao.CouponList(2);//查询优惠券信息
-//                       if(coupon!=null){
-//                       String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//                       MessageCenter messageCenter = new MessageCenter();
-//                       if (coupon != null && coupon.getUserId() != null) {
-//                           messageCenter.setShopId(null);
-//                           messageCenter.setClubId(clubId);
-//                           messageCenter.setUserType(1);
-//                           messageCenter.setMessageType(4);
-//                           messageCenter.setContent(null);
-//                           messageCenter.setTime(curDateStr);
-//                           messageCenter.setCouponType(2);
-//                           messageCenter.setCouponMessageType(1);
-//                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
-//                           messageCenterDao.addMessageCenter(messageCenter);
-//                           coumt++;
-//                       }
-//                       }
-//                   } else if ("90".equals(user.getClubStatus()) && coumt == 0) {
-//                       CmCoupon coupon = messageCenterDao.CouponList(3);//查询优惠券信息
-//                       if(coupon!=null) {
-//                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//                           MessageCenter messageCenter = new MessageCenter();
-//                           messageCenter.setShopId(null);
-//                           messageCenter.setClubId(clubId);
-//                           messageCenter.setUserType(1);
-//                           messageCenter.setMessageType(4);
-//                           messageCenter.setContent(user.getName());
-//                           messageCenter.setTime(curDateStr);
-//                           messageCenter.setCouponType(3);
-//                           messageCenter.setCouponMessageType(1);
-//                           messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
-//                           messageCenterDao.addMessageCenter(messageCenter);
-//                           coumt++;
-//                       }
-//                   } else if (coumt == 0) {
-//                       CmCoupon coupon = messageCenterDao.CouponList(4);//查询优惠券信息
-//                       if(coupon!=null){
-//                       String startDate = sdf.format(coupon.getStartDate());
-//                       int num = startDate.compareTo(user.getRegisterTime());
-//                       if (num > 0) {
-//                           String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
-//                           MessageCenter messageCenter = new MessageCenter();
-//                           if (coupon != null && coupon.getUserId() != null) {
-//                               messageCenter.setShopId(null);
-//                               messageCenter.setClubId(clubId);
-//                               messageCenter.setUserType(1);
-//                               messageCenter.setMessageType(4);
-//                               messageCenter.setContent(null);
-//                               messageCenter.setTime(curDateStr);
-//                               messageCenter.setCouponType(4);
-//                               messageCenter.setCouponMessageType(1);
-//                               messageCenter.setCouponFee(coupon.getCouponAmount().doubleValue());
-//                               messageCenterDao.addMessageCenter(messageCenter);
-//                               coumt++;
-//                           }
-//                           }
-//                       }
-//                   }
-//               }
-//               });
         cmCouponService.save(cmCoupon);
         addMessage(redirectAttributes, "保存优惠券成功");
         return "redirect:" + Global.getAdminPath() + "/coupon/cmCoupon/list?couponType=" + cmCoupon.getCouponType();

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

@@ -742,11 +742,11 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                         //全部退
                         String name=newOrder.getProductName();
                         if (name.length() > 10) {
-                            name = org.apache.commons.lang3.StringUtils.strip(name.substring(0, 11));
+                            name = StringUtils.strip(name.substring(0, 11));
                             name += "...";
                         }
                         String shortLink = newOrderService.getShortLink(8, 10, wwwServer + "user/order/detail.html?orderId=" + newOrder.getOrderID());
-                        String content = "【采美365】订单（"+name+"等"+productCount+"件商品）已全部退款成功，退款金额￥"+returnedPurchase.getRefundFee()+"。您可点击采美网址www.caimei.com 或使用微信小程序“采美采购商城”查看订单。";
+                        String content = "【采美365】订单（"+name+"等"+productCount+"件商品）已部份退款成功，退款金额￥"+returnedPurchase.getRefundFee()+"。您可点击采美网址www.caimei.com 或使用微信小程序“采美采购商城”查看订单。";
                         sendSms = newOrderService.getSendSms(10, user.getBindMobile(), content);
                     }
                     if (!sendSms) {

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

@@ -1583,6 +1583,19 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 cmUserDao.updateUserBeans(order.getUserID(), beans);
             }
         }
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String current = dateFormat.format(new Date());
+        MessageCenter messageCenter = new MessageCenter();
+        messageCenter.setShopId(null);
+        messageCenter.setClubId(order.getClubID());
+        messageCenter.setUserType(1);
+        messageCenter.setMessageType(1);
+        messageCenter.setOrderMessageType(4);
+        messageCenter.setContent("您的订单已成功取消！");
+        messageCenter.setOrderId(orderID);
+        messageCenter.setTime(current);
+        messageCenterDao.addMessageCenter(messageCenter);
+
 
         //取消订单短信推送（取消订单推送）
         /*try {

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

@@ -900,18 +900,22 @@ public class ProductNewController extends BaseController {
                messageCenter.setMessageType(2);
                messageCenter.setShopMessType(3);
                messageCenter.setContent(null);
+               messageCenter.setProductId(productID);
                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);
+            if(newvalidFlag!=null){
+                if(newvalidFlag ==2) {
+                    messageCenter.setShopId(shopid);
+                    messageCenter.setClubId(null);
+                    messageCenter.setUserType(2);
+                    messageCenter.setMessageType(2);
+                    messageCenter.setShopMessType(4);
+                    messageCenter.setContent(null);
+                    messageCenter.setProductId(productID);
+                    messageCenter.setTime(current);
+                    messageCenterDao.addMessageCenter(messageCenter);
+                }
             }
 
             map.put("success", true);

src/main/java/com/caimei/modules/supervip/service/CmSvipGiveService.java

@@ -5,12 +5,14 @@ import com.caimei.modules.supervip.dao.CmSvipHistoryDao;
 import com.caimei.modules.supervip.entity.CmSvipGive;
 import com.caimei.modules.supervip.entity.CmSvipHistory;
 import com.caimei.modules.user.dao.MessageCenterDao;
+import com.caimei.modules.user.entity.MessageCenter;
 import com.thinkgem.jeesite.common.service.CrudService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -40,6 +42,18 @@ public class CmSvipGiveService extends CrudService<CmSvipHistoryDao, CmSvipHisto
         cmSvipHistory.setPayWay("5");
         cmSvipHistory.setPayTime(now);
         CmSvipHistory user = svipDao.findVipUser(cmSvipGive.getUserId());
+Integer clubID=messageCenterDao.clubIdCule(Integer.parseInt(cmSvipGive.getUserId()));
+        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(clubID);
+        messageCenter.setUserType(1);
+        messageCenter.setMessageType(2);
+        messageCenter.setAccountType(4);
+        messageCenter.setContent(cmSvipGive.getMonth().toString());
+        messageCenter.setTime(curDateStr);
+        messageCenterDao.addMessageCenter(messageCenter);
 
        String bindMobile= messageCenterDao.contractMobile(cmSvipGive.getUserId());
 

src/main/java/com/caimei/modules/supervip/web/CmSvipGiveController.java

@@ -2,6 +2,8 @@ package com.caimei.modules.supervip.web;
 
 import com.caimei.modules.supervip.entity.CmSvipGive;
 import com.caimei.modules.supervip.service.CmSvipGiveService;
+import com.caimei.modules.user.dao.MessageCenterDao;
+import com.caimei.modules.user.entity.MessageCenter;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
@@ -14,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Controller
 @RequestMapping(value = "${adminPath}/svip/cmSvipGive")
@@ -22,6 +26,9 @@ public class CmSvipGiveController extends BaseController {
     @Autowired
     private CmSvipGiveService svipService;
 
+    @Autowired
+    private MessageCenterDao messageCenterDao;
+
     @ModelAttribute
     public CmSvipGive get(@RequestParam(required = false) String id) {
         CmSvipGive entity = new CmSvipGive();

src/main/java/com/caimei/modules/sys/dao/NotificationDao.java

@@ -34,6 +34,8 @@ public interface NotificationDao extends CrudDao<Notification> {
 
     void hide(@Param("hide")Integer hide, @Param("Id") Integer Id);
 
+    void hides();
+
     void addNotification(Notification notification);
 
     Integer count();

src/main/java/com/caimei/modules/sys/web/NotificationController.java

@@ -86,7 +86,6 @@ public class NotificationController extends BaseController {
         }else if(domain.contains("localhost")){
              jedis=new Jedis("192.168.2.100", 6379);
         }else {
-
             jedis=new Jedis("172.31.165.23", 6379);
         }
 
@@ -297,7 +296,7 @@ public class NotificationController extends BaseController {
                 page.getList().get(i).setPorductIDs(porductIDs);
                  page.getList().get(i).setShopIDs(shopIDs);
             }
-
+        notificationDao.hides();
         model.addAttribute("Notification", notifi);
         model.addAttribute("page", page);
         return "modules/sys/Notification";
@@ -484,4 +483,237 @@ if(count<=0){
         return "redirect:"+Global.getAdminPath()+"/sys/Notification/list";
     }
 
+    @RequestMapping(value = {"hides"})
+    public String hides( Notification notification,HttpServletRequest request, HttpServletResponse response, Model model){
+
+        notificationDao.hides();
+        return "redirect:"+Global.getAdminPath()+"/sys/Notification/list";
     }
+    @Scheduled(cron = "0 0/2 * * * ?")
+    public void time(){
+        logger.info("》》》》》》》》》》》开始检测商品资质证书和上架费是否过期");
+        //械字号资质证书3个月后过期
+        Integer count=0;
+        String name="";
+        String productID="";
+        String shopID="";
+        Date date=new Date();
+        String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+        //资质证书
+        List<Product>pro=notificationDao.productTypeCount(3);
+        List<Product>pro1=notificationDao.productTypeCount(1);
+        List<Product>pro2=notificationDao.productTypeCount1(7);
+        List<Product>pro3=notificationDao.productTypeCount1(1);
+        //上架费
+        List<Product>product=notificationDao.productTypeCount2(3);
+        List<Product>product1=notificationDao.productTypeCount2(1);
+        List<Product>product2=notificationDao.productTypeCount3(7);
+        List<Product>product3=notificationDao.productTypeCount3(1);
+//
+        Jedis jedis=null;
+        String constraint="";
+        if(domain.contains("-b")){
+            jedis=new Jedis("172.31.165.27", 6379);
+            jedis.auth("6#xsI%b4o@5c3RoE");
+        }else if(domain.contains("localhost")){
+            jedis=new Jedis("192.168.2.100", 6379);
+        }else {
+            jedis=new Jedis("172.31.165.23", 6379);
+        }
+
+        if(!"1".equals(jedis.rpop("constraint"))){
+            jedis.lpush("constraint","0");
+
+        }
+        constraint=jedis.rpop("constraint");
+        System.out.println(jedis.rpop("constraint"));
+//        if("0".equals(constraint)){
+            for (int i=0;i<pro.size();i++){
+
+                MessageCenter messageCenter = new MessageCenter();
+                messageCenter.setShopId(pro.get(i).getShopID());
+                messageCenter.setClubId(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(5);
+                messageCenter.setContent("该商品的资质证书将于3个月后失效，请及时登录采美网站上传新证书。");
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+
+                if(i!=0){
+                    name+=",";
+                    productID+=",";
+                }
+                name +="("+pro.get(i).getProductID().toString()+")"+pro.get(i).getProductName();
+                productID+=pro.get(i).getProductID().toString();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下械字号商品的资质证书将于3个月后失效，请及时提醒供应商更换证书。");
+                notification.setShopContent(name);
+                notification.setPorductID(productID);
+                notificationDao.addNotification(notification);
+                name="";
+                productID="";
+            }
+            //械字号资质证书1个月后过期
+            for (int i=0;i<pro1.size();i++){
+
+                MessageCenter messageCenter = new MessageCenter();
+                messageCenter.setShopId(pro1.get(i).getShopID());
+                messageCenter.setClubId(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(5);
+                messageCenter.setContent("该商品的资质证书将于1个月后失效，请及时登录采美网站上传新证书。");
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+                if(i!=0){
+                    name+=",";
+                    productID+=",";
+                }
+                name +="("+pro1.get(i).getProductID().toString()+")"+pro.get(i).getProductName();
+                productID+=pro1.get(i).getProductID().toString();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下械字号商品的资质证书将于1个月后失效，请及时提醒供应商更换证书。");
+                notification.setShopContent(name);
+                notification.setPorductID(productID);
+                notificationDao.addNotification(notification);
+                name="";
+                productID="";
+            }
+//械字号资质证书7日后过期
+            for (int i=0;i<pro2.size();i++){
+
+                MessageCenter messageCenter = new MessageCenter();
+                messageCenter.setShopId(pro2.get(i).getShopID());
+                messageCenter.setClubId(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(5);
+                messageCenter.setContent("该商品的资质证书将于7天后失效，请及时登录采美网站上传新证书。");
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+                if(i!=0){
+                    name+=",";
+                    productID+=",";
+                }
+                name +="("+pro2.get(i).getProductID().toString()+")"+pro.get(i).getProductName();
+                productID+=pro2.get(i).getProductID().toString();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下械字号商品的资质证书将于7天后失效，请及时提醒供应商更换证书。");
+                notification.setShopContent(name);
+                notification.setPorductID(productID);
+                notificationDao.addNotification(notification);
+                name="";
+                productID="";
+            }
+//械字号资质证书今日后过期
+            for (int i=0;i<pro3.size();i++){
+                MessageCenter messageCenter = new MessageCenter();
+                messageCenter.setShopId(pro3.get(i).getShopID());
+                messageCenter.setClubId(null);
+                messageCenter.setUserType(2);
+                messageCenter.setMessageType(2);
+                messageCenter.setShopMessType(5);
+                messageCenter.setContent("该商品的资质证书将于今天后失效，请及时登录采美网站上传新证书。");
+                messageCenter.setTime(curDateStr);
+                messageCenterDao.addMessageCenter(messageCenter);
+                if(i!=0){
+                    name+=",";
+                    productID+=",";
+                }
+                name +="("+pro3.get(i).getProductID().toString()+")"+pro.get(i).getProductName();
+                productID+=pro3.get(i).getProductID().toString();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下械字号商品的资质证书将于今天后失效，请及时提醒供应商更换证书。");
+                notification.setShopContent(name);
+                notification.setPorductID(productID);
+                notificationDao.addNotification(notification);
+                name="";
+                productID="";
+            }
+            //上架费
+            for (int i=0;i<product.size();i++){
+                if(i!=0){
+                    name+=",";
+                    shopID+=",";
+                }
+                name +=product.get(i).getShopName();
+                shopID+=product.get(i).getShopID();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下供应商的上架费将于3个月后到期，请及时提醒供应商续费。");
+                notification.setShopContent(name);
+                notification.setShopID(shopID);
+                notificationDao.addNotification(notification);
+                name="";
+                shopID="";
+            }
+            //上架费1个月后过期
+            for (int i=0;i<product1.size();i++){
+                if(i!=0){
+                    name+=",";
+                    shopID+=",";
+                }
+                name +=product1.get(i).getShopName();
+                shopID+=product1.get(i).getShopID();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下供应商的上架费将于1个月后到期，请及时提醒供应商续费。");
+                notification.setShopContent(name);
+                notification.setShopID(shopID);
+                notificationDao.addNotification(notification);
+                name="";
+                shopID="";
+            }
+//上架费7日后过期
+            for (int i=0;i<product2.size();i++){
+                if(i!=0){
+                    name+=",";
+                    shopID+=",";
+                }
+                name +=product2.get(i).getShopName();
+                shopID+=product2.get(i).getShopID();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下供应商的上架费将于7天后到期，请及时提醒供应商续费。");
+                notification.setShopContent(name);
+                notification.setShopID(shopID);
+                notificationDao.addNotification(notification);
+                name="";
+                shopID="";
+            }
+//上架费今日后过期
+            for (int i=0;i<product3.size();i++){
+                if(i!=0){
+                    name+=",";
+                    shopID+=",";
+                }
+                name +=product3.get(i).getShopName();
+                shopID+=product3.get(i).getShopID();
+            }
+            if(!"".equals(name)){
+                Notification notification=new Notification();
+                notification.setTheme("以下供应商的上架费将于今天后到期，请及时提醒供应商续费。");
+                notification.setShopContent(name);
+                notification.setShopID(shopID);
+                notificationDao.addNotification(notification);
+                name="";
+                shopID="";
+            }
+//        }
+        jedis.lpush("constraint","1");
+        }
+
+    }
+

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

@@ -40,4 +40,6 @@ public interface MessageCenterDao extends CrudDao<MessageCenter> {
     String Mobile(Integer shopID);
 
     Integer userID(Integer shopID);
+
+    List<CmCoupon> couponTime();
 }

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

@@ -83,6 +83,19 @@ public class MessageCenter extends DataEntity<MessageCenter> {
      */
     private Integer couponMessageType;
 
+    /**
+     *商品ID
+     */
+    private Integer productId;
+
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
 
     @Override
     public String getId() {

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

@@ -300,7 +300,7 @@ public class NewCmShopController extends BaseController {
 
         }
 
-        return "redirect:" + Global.getAdminPath() + "/user/maintenanceList";
+        return "redirect:" + Global.getAdminPath() + "/user/newCmShop/maintenanceList?shopID="+cmDiscernReceipt.getShopID()+"&shopName"+cmDiscernReceipt.getShopName();
     }
 
     /**
@@ -394,9 +394,16 @@ public class NewCmShopController extends BaseController {
             newCmShopService.updateShopAudit(auditStatus, auditNote, format, name, manufacturerStatus, shopId);
             map.put("success", true);
             map.put("msg", "审核成功");
-
-
-
+            String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
+            MessageCenter messageCenter = new MessageCenter();
+            messageCenter.setShopId(shopId);
+            messageCenter.setClubId(null);
+            messageCenter.setUserType(2);
+            messageCenter.setMessageType(2);
+            messageCenter.setShopMessType(2);
+            messageCenter.setContent(null);
+            messageCenter.setTime(curDateStr);
+            messageCenterDao.addMessageCenter(messageCenter);
             if (StringUtils.isNotEmpty(mobile)) {
                 boolean sendSms = newOrderService.getSendSms(9, mobile, smsMessage);
                 if(sendSms){

src/main/resources/mappings/modules/sys/Notification.xml

@@ -55,6 +55,10 @@
 
 	</update>
 
+	<update id="hides">
+		UPDATE notification SET hide=0
+	</update>
+
 	<insert id="addNotification">
 		INSERT INTO notification(theme,newTime,shopContent,porductID,shopID) VALUES (#{theme},NOW(),#{shopContent},#{porductID},#{shopID})
 	</insert>

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

@@ -6,12 +6,12 @@
 <!--        VALUES (#{shopId}, #{clubId}, #{userType}, #{messageType},#{content},#{time},#{accountType},#{orderID},#{orderMessageType},#{shopMessType})-->
 <!--    </insert>-->
     <insert id="addMessageCenter">
-        INSERT INTO message_center (shopID, clubID, userType, messageType, content,time,accountType,couponType,couponFee,couponMessageType,orderID,orderMessageType,shopMessType)
-        VALUES (#{shopId}, #{clubId}, #{userType}, #{messageType}, #{content},#{time},#{accountType},#{couponType},#{couponFee},#{couponMessageType},#{orderId},#{orderMessageType},#{shopMessType})
+        INSERT INTO message_center (shopID, clubID, userType, messageType, content,time,accountType,couponType,couponFee,couponMessageType,orderID,orderMessageType,shopMessType,productId)
+        VALUES (#{shopId}, #{clubId}, #{userType}, #{messageType}, #{content},#{time},#{accountType},#{couponType},#{couponFee},#{couponMessageType},#{orderId},#{orderMessageType},#{shopMessType},#{productId})
     </insert>
 
     <select id="clubIdCule" resultType="java.lang.Integer">
-        SELECT clubID FROM `user` WHERE userId=#{userId}
+        SELECT clubID FROM `club` WHERE userId=#{userId}
     </select>
 
     <select id="contractMobile" resultType="java.lang.String">
@@ -32,6 +32,7 @@
 
     <select id="ClubIds" resultType="java.lang.Integer">
         SELECT clubID FROM `user` WHERE YEAR(loginTime)>YEAR(NOW())-3 AND clubID IS NOT NULL
+#         ORDER BY clubID DESC
     </select>
 
     <select id="userID" resultType="java.lang.Integer">
@@ -48,4 +49,12 @@
         LIMIT 1
     </select>
 
+    <select id="couponTime" resultType="com.caimei.modules.coupon.entity.CmCoupon">
+        SELECT * FROM `cm_coupon` WHERE
+            NOW() >= startDate
+            AND endDate >= NOW()
+            AND STATUS = 1
+            AND delFlag=0
+    </select>
+
 </mapper>

src/main/webapp/WEB-INF/views/modules/sys/Notification.jsp

@@ -34,6 +34,7 @@
     <script type="text/javascript">
         $(document).ready(function () {
             // $(".chopContent").hide()
+
         });
 
         function page(n, s) {
@@ -44,7 +45,6 @@
         }
 
         function connct(id,hide) {
-            alert(id)
             window.location.href = "${ctx}/sys/Notification/hide?id=" + id+"&hide="+hide;
         }
 

src/main/webapp/WEB-INF/views/modules/sys/sysIndex.jsp

@@ -15,22 +15,14 @@
 		#userControl>li>a{/*color:#fff;*/text-shadow:none;} #userControl>li>a:hover, #user #userControl>li.open>a{background:transparent;}
 		#redi {
 			width: 10px;
-
-			height: 10px;
-
-			font: 12px/18px Arial;
-
 			border-radius: 7px;
-
-			display: inline-block;
-
+			display: block;
 			vertical-align: middle;
-
-			position: relative;
-
+			position: absolute;
 			background: red;
-
-
+			right: 6px;
+			top: 15px;
+			height: 10px;
 		}
 	</style>
 	<script type="text/javascript">
@@ -180,8 +172,10 @@
 						<!--[if lte IE 6]><script type="text/javascript">$('#themeSwitch').hide();</script><![endif]-->
 					</li>
 					<li>
-						<span id="redi"></span>
-						<a href="${ctx}/sys/Notification" target="mainFrame"><i class="icon-bell"></i></a>
+						<a href="${ctx}/sys/Notification/list" target="mainFrame" style="position: relative;">
+							<i class="icon-bell"></i>
+							<span id="redi"></span>
+						</a>
 					</li>
 					<li id="userInfo" class="dropdown">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" title="个人信息">您好, ${fns:getUser().name}&nbsp;<span id="notifyNum" class="label label-info hide"></span></a>

src/main/webapp/WEB-INF/views/modules/user/maintenanceList.jsp

@@ -208,8 +208,8 @@
 	</tr>
 	</thead>
 	<tbody>
-	<c:forEach items="${discernReceipt.list}" var="discernReceipt">
-		<td>${(page.pageNo-1)*page.pageSize+index.index+1}</td>
+	<c:forEach items="${discernReceipt.list}" var="discernReceipt" varStatus="in">
+		<td>${in.index+1}</td>
 		<c:if test="${discernReceipt.receStatct eq 2}">
 			<td>免除上架费</td>
 			<td>${discernReceipt.receiptDate}</td>