bugfix

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -102,6 +102,15 @@ public class CmDiscernReceiptController extends BaseController {
 //        String list=cmDiscernReceiptService.discern(cmDiscernReceipt.getId());
 //        logger.info("+++++++++++++++++"+cmDiscernReceipt.getId());
         Page<CmDiscernReceipt> page = cmDiscernReceiptService.findPage(new Page<CmDiscernReceipt>(request, response), cmDiscernReceipt);
+        page.getList().forEach(p ->{
+            String date=p.getReceiptDate();
+            if(date!=null){
+            if(!date.contains(":")){
+                date+=" 00:00:01";
+            }
+            p.setReceiptDate(date);
+            }
+        });
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
 

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

@@ -18,6 +18,8 @@ import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -39,7 +41,9 @@ import java.util.List;
  * @author : Charles
  * @date : 2022/7/20
  */
-@Controller
+//@Controller
+@Configuration
+@EnableScheduling
 @RequestMapping(value = "${adminPath}/sys/Notification")
 public class NotificationController extends BaseController {
 
@@ -539,9 +543,8 @@ if(count<=0){
         }
         constraint=jedis.rpop("constraint");
         System.out.println(jedis.rpop("constraint"));
-        if("0".equals(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);
@@ -571,7 +574,6 @@ if(count<=0){
             }
             //械字号资质证书1个月后过期
             for (int i=0;i<pro1.size();i++){
-
                 MessageCenter messageCenter = new MessageCenter();
                 messageCenter.setShopId(pro1.get(i).getShopID());
                 messageCenter.setClubId(null);
@@ -600,7 +602,6 @@ if(count<=0){
             }
 //械字号资质证书7日后过期
             for (int i=0;i<pro2.size();i++){
-
                 MessageCenter messageCenter = new MessageCenter();
                 messageCenter.setShopId(pro2.get(i).getShopID());
                 messageCenter.setClubId(null);
@@ -727,7 +728,7 @@ if(count<=0){
                 name="";
                 shopID="";
             }
-        }
+//        }
         jedis.lpush("constraint","1");
         }
 

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

@@ -269,8 +269,9 @@ public class NewCmShopController extends BaseController {
             System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+num);
             System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+"1:"+date+"2:"+dateStrings+"3:"+dateString);
         }
+        Page<CmDiscernReceipt>discernReceip = newCmShopService.maintenanceList(new Page<CmDiscernReceipt>(request, response, 20),cmDiscernReceipt);
             model.addAttribute("CmDiscernReceipt", cmDiscernReceipt);
-        model.addAttribute("discernReceipt", discernReceipt);
+        model.addAttribute("discernReceipt", discernReceip);
         return "modules/user/maintenanceList";
     }
 

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

@@ -13,12 +13,14 @@
 	<select id="productTypeCount2" resultType="com.caimei.modules.product.entity.Product">
 		SELECT * FROM `cm_discern_receipt` a
 						  LEFT JOIN cm_receipt s ON s.receiptID = a.id
+						  LEFT JOIN shop c ON a.shopID = c.`shopID`
 		WHERE a.newReceiptType=1 AND DATE_ADD(NOW(), INTERVAL #{yat} MONTH)>s.dateStrings  AND  s.dateStrings > NOW() AND a.receStatct=0
 	</select>
 
 	<select id="productTypeCount3" resultType="com.caimei.modules.product.entity.Product">
 		SELECT * FROM `cm_discern_receipt` a
 		LEFT JOIN cm_receipt s ON s.receiptID = a.id
+		LEFT JOIN shop c ON a.shopID = c.`shopID`
 		WHERE a.newReceiptType=1 AND DATE_ADD(NOW(), INTERVAL #{yat} DAY)>s.dateStrings  AND  s.dateStrings > NOW() AND a.receStatct=0
 	</select>