bugfix

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

@@ -7,6 +7,7 @@ import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.aop.OperationLogShop;
 import com.caimei.modules.user.dao.CmUserDao;
+import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.CmMessage;
 import com.caimei.modules.user.entity.CmOperationUser;
 import com.caimei.modules.user.entity.CmUser;
@@ -64,6 +65,8 @@ public class NewCmShopController extends BaseController {
     private CmOperationUserService cmOperationUserService;
     @Autowired
     private CmUserDao cmUserDao;
+    @Autowired
+    private NewCmShopDao newCmShopDao;
 
     public static NewCmShop newcm;
     public static CmUser cmus;
@@ -91,13 +94,84 @@ public class NewCmShopController extends BaseController {
         if (null != newCmShop.getEndTime() && !"".equals(newCmShop.getEndTime()) && !newCmShop.getEndTime().endsWith("23:59:59")) {
             newCmShop.setEndTime(newCmShop.getEndTime() + " 23:59:59");
         }
+        //屏蔽特殊供应商
+        newCmShop.setShopType(1);
         Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
         newcm = newCmShop;
-        logger.info("******输出page"+page.getList()+"*****"+newCmShop.getSname());
         model.addAttribute("page", page);
         return "modules/user/newCmShopList";
     }
 
+    @RequestMapping(value = "/special/new")
+    public String specialList(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //新品供应商
+        newCmShop.setShopType(2);
+        Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
+        model.addAttribute("page", page);
+        model.addAttribute("newCmShop",newCmShop);
+        model.addAttribute("shopType",2);
+        return "modules/user/cmNewProductShopList";
+    }
+    @RequestMapping(value = "/special/new/edit")
+    public String specialEdit(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        if(null!=newCmShop.getShopID()){
+            newCmShop.setSplitCodes(newCmShopDao.findSplitCode(newCmShop.getShopID()));
+        }
+        model.addAttribute("newCmShop",newCmShop);
+        return "modules/user/cmNewProductShopEdit";
+    }
+
+    @RequestMapping(value = "/special/new/save")
+    public String specialSave(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        newCmShopService.saveSpecial(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("newCmShop",newCmShop);
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("newCmShop",newCmShop);
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
+
+    @RequestMapping(value = "/special/offline")
+    public String specialOffline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //下线
+        newCmShopService.offline(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
+
+    @RequestMapping(value = "/special/online")
+    public String specialOnline(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //上线
+        newCmShopService.online(newCmShop);
+        if(2==newCmShop.getShopType()){
+            model.addAttribute("shopType",2);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/new?repage";
+        }else{
+            model.addAttribute("shopType",3);
+            return "redirect:" + Global.getAdminPath() + "/user/newCmShop/special/second?repage";
+        }
+    }
+
+    @RequestMapping(value = "/special/second")
+    public String secondList(NewCmShop newCmShop, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //二手供应商
+        newCmShop.setShopType(3);
+        Page<NewCmShop> page = newCmShopService.findPage(new Page<NewCmShop>(request, response), newCmShop);
+        model.addAttribute("page", page);
+        model.addAttribute("shopType",3);
+        model.addAttribute("newCmShop",newCmShop);
+        return "modules/user/cmNewProductShopList";
+    }
+
     @RequiresPermissions("user:newCmShop:view")
     @RequestMapping(value = "form")
     public String form(NewCmShop newCmShop, Model model) {