信息中心优化

src/main/java/com/caimei365/user/controller/CmBrandLandingApi.java

@@ -108,7 +108,7 @@ public class CmBrandLandingApi {
         if (source == null) {
             return ResponseJson.error("source异常！", null);
         }
-        if (landing.type() == null || landing.type().equals("2") || landing.type().equals("3")) {
+        if (landing.type() == null || (!landing.type().equals("2") && !landing.type().equals("3"))) {
             return ResponseJson.error("type异常！", null);
         }
         if (source == 1) {

src/main/java/com/caimei365/user/model/vo/CmBrandLandingVO.java

@@ -1,24 +1,12 @@
 package com.caimei365.user.model.vo;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Date;
-
-import com.alibaba.fastjson.JSON;
-import com.caimei365.user.model.po.CmBrandLanding;
-import com.caimei365.user.model.po.CmDistribution;
-import com.caimei365.user.model.vo.CmBrandFilesVO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.type.Alias;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.springframework.beans.BeanUtils;
-import org.springframework.cglib.beans.BeanCopier;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -100,7 +88,7 @@ public class CmBrandLandingVO implements Serializable
     /**
      * 文件资料
      */
-    private List<CmBrandFilesVO> BrandFiles;
+    private List<CmBrandFilesVO> cmBrandFiles;
 
 
 }

src/test/java/com/caimei365/user/UserApplicationTests.java

@@ -1,115 +1,115 @@
-package com.caimei365.user;
-
-import com.caimei365.user.feign.ToolsFeign;
-import com.caimei365.user.mapper.SuperVipMapper;
-import com.caimei365.user.model.po.SuperVipPo;
-import com.caimei365.user.model.po.VipPayHistoryPo;
-import com.caimei365.user.service.LoginService;
-import com.caimei365.user.utils.AliyunSmsUtil;
-import com.caimei365.user.utils.CodeUtil;
-import com.caimei365.user.utils.ValidateUtil;
-import com.caimei365.user.utils.message.InsideMessage;
-import com.caimei365.user.utils.message.MessageModel;
-import com.caimei365.user.utils.message.MessageType;
-import com.caimei365.user.utils.message.MqInfo;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-@SpringBootTest
-class UserApplicationTests {
-    @Resource
-    private ToolsFeign smsFeign;
-    @Resource
-    LoginService loginService;
-    @Test
-    void contextLoads() {
-
-//        //站内信
-//        MessageModel<InsideMessage> insideMessageMessageModel = new MessageModel<>();
-//        insideMessageMessageModel.code(MessageType.WEB_INSIDE_MESSAGE)
-//                .mqInfo(new MqInfo().topic("MessageLine").delay(1).async(0))
-//                .info(new InsideMessage()
-//                        .userType(3)
-//                        .messageType(3)
-//                        .shopTieredType(4)
-//                        .name("user.getUserName()")
-//                        .userName("user.getUserName()")
-//                        .mobile("164848989")
-//                        .thisId(4648)
-//                        .clubId(448)
-//                );
-//        smsFeign.sendCommonMessage(insideMessageMessageModel);
-        /*List<Integer> listShopId = loginService.getMessageCenterListDay(1);
-        System.out.println("-------->listShopId == "+listShopId.toString()+" <--------------");*/
-//        boolean b = ValidateUtil.validateEmail("182126@qq.com");
-//        System.out.println(b);
-    }
-//    @Resource
-//    private ToolsFeign feign;
+// package com.caimei365.user;
 //
+// import com.caimei365.user.feign.ToolsFeign;
+// import com.caimei365.user.mapper.SuperVipMapper;
+// import com.caimei365.user.model.po.SuperVipPo;
+// import com.caimei365.user.model.po.VipPayHistoryPo;
+// import com.caimei365.user.service.LoginService;
+// import com.caimei365.user.utils.AliyunSmsUtil;
+// import com.caimei365.user.utils.CodeUtil;
+// import com.caimei365.user.utils.ValidateUtil;
+// import com.caimei365.user.utils.message.InsideMessage;
+// import com.caimei365.user.utils.message.MessageModel;
+// import com.caimei365.user.utils.message.MessageType;
+// import com.caimei365.user.utils.message.MqInfo;
+// import org.junit.jupiter.api.Test;
+// import org.springframework.beans.factory.annotation.Autowired;
+// import org.springframework.boot.test.context.SpringBootTest;
 //
-//    @Test
-//    void sms(){
-//        String mobile = "15827317748";
-////        String randomCode = CodeUtil.generateCodeInt(6);
-////        String name ="dsfsd";
-//        //AliyunSmsUtil.sendSms(mobile, 6, "{name:"+ mobile +",content:"+ randomCode +"}");
-////        AliyunSmsUtil.sendSms(mobile, 11, "{name:\""+ name +"\",code:" + randomCode + "}");
-//        feign.getSendSms(mobile,"恭喜您成功开通采美平台超级会员，为期1个月，快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯！");
-//    }
-//    @Test
-//    public static void main(String[] args) {
-//        Calendar cal = Calendar.getInstance();
-//        System.out.println(cal.get(Calendar.MONTH));
+// import javax.annotation.Resource;
+// import java.text.ParseException;
+// import java.text.SimpleDateFormat;
+// import java.util.ArrayList;
+// import java.util.Calendar;
+// import java.util.Date;
+// import java.util.List;
 //
-//    }
-//    @Resource
-//    SuperVipMapper mapper;
+// @SpringBootTest
+// class UserApplicationTests {
+//     @Resource
+//     private ToolsFeign smsFeign;
+//     @Resource
+//     LoginService loginService;
+//     @Test
+//     void contextLoads() {
 //
-//    @Test
-//    void testmap(){
-//        Calendar cal = Calendar.getInstance();
-//        SuperVipPo vip = new SuperVipPo();
-//        Date date = new Date();
-//        vip.setUpdateTime(date);
-//        cal.setTime(date);
-//        cal.add(Calendar.MONTH,36);
-//        vip.setUserId(13990);
-//        vip.setEndTime(cal.getTime());
-//        mapper.updateVip(vip);
-//    }
-    /*@Autowired
-    private SuperVipMapper vipMapper;
-
-    @Test
-    void time() throws ParseException {
-        List<VipPayHistoryPo> vipHistory = vipMapper.findVipHistory(13990);
-        for (VipPayHistoryPo vipPayHistoryPo : vipHistory) {
-            System.out.println(vipPayHistoryPo);
-        }
-    }*/
-
-//    @Test
-//    void contextLoads() {
-//        Calendar cal = Calendar.getInstance();
-//        cal.setTime(new Date());
-//        cal.set(Calendar.HOUR_OF_DAY, 0);
-//        cal.set(Calendar.MINUTE, 0);
-//        cal.set(Calendar.SECOND,0);
-//        cal.set(Calendar.MILLISECOND, 0);
-//        Date now = cal.getTime();
-//        System.out.println(now);
-//        System.out.println("=======================");
-//        cal.add(Calendar.DAY_OF_MONTH,1);
-//        System.out.println(cal.getTime());
-//    }
-}
+// //        //站内信
+// //        MessageModel<InsideMessage> insideMessageMessageModel = new MessageModel<>();
+// //        insideMessageMessageModel.code(MessageType.WEB_INSIDE_MESSAGE)
+// //                .mqInfo(new MqInfo().topic("MessageLine").delay(1).async(0))
+// //                .info(new InsideMessage()
+// //                        .userType(3)
+// //                        .messageType(3)
+// //                        .shopTieredType(4)
+// //                        .name("user.getUserName()")
+// //                        .userName("user.getUserName()")
+// //                        .mobile("164848989")
+// //                        .thisId(4648)
+// //                        .clubId(448)
+// //                );
+// //        smsFeign.sendCommonMessage(insideMessageMessageModel);
+//         /*List<Integer> listShopId = loginService.getMessageCenterListDay(1);
+//         System.out.println("-------->listShopId == "+listShopId.toString()+" <--------------");*/
+// //        boolean b = ValidateUtil.validateEmail("182126@qq.com");
+// //        System.out.println(b);
+//     }
+// //    @Resource
+// //    private ToolsFeign feign;
+// //
+// //
+// //    @Test
+// //    void sms(){
+// //        String mobile = "15827317748";
+// ////        String randomCode = CodeUtil.generateCodeInt(6);
+// ////        String name ="dsfsd";
+// //        //AliyunSmsUtil.sendSms(mobile, 6, "{name:"+ mobile +",content:"+ randomCode +"}");
+// ////        AliyunSmsUtil.sendSms(mobile, 11, "{name:\""+ name +"\",code:" + randomCode + "}");
+// //        feign.getSendSms(mobile,"恭喜您成功开通采美平台超级会员，为期1个月，快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯！");
+// //    }
+// //    @Test
+// //    public static void main(String[] args) {
+// //        Calendar cal = Calendar.getInstance();
+// //        System.out.println(cal.get(Calendar.MONTH));
+// //
+// //    }
+// //    @Resource
+// //    SuperVipMapper mapper;
+// //
+// //    @Test
+// //    void testmap(){
+// //        Calendar cal = Calendar.getInstance();
+// //        SuperVipPo vip = new SuperVipPo();
+// //        Date date = new Date();
+// //        vip.setUpdateTime(date);
+// //        cal.setTime(date);
+// //        cal.add(Calendar.MONTH,36);
+// //        vip.setUserId(13990);
+// //        vip.setEndTime(cal.getTime());
+// //        mapper.updateVip(vip);
+// //    }
+//     /*@Autowired
+//     private SuperVipMapper vipMapper;
+//
+//     @Test
+//     void time() throws ParseException {
+//         List<VipPayHistoryPo> vipHistory = vipMapper.findVipHistory(13990);
+//         for (VipPayHistoryPo vipPayHistoryPo : vipHistory) {
+//             System.out.println(vipPayHistoryPo);
+//         }
+//     }*/
+//
+// //    @Test
+// //    void contextLoads() {
+// //        Calendar cal = Calendar.getInstance();
+// //        cal.setTime(new Date());
+// //        cal.set(Calendar.HOUR_OF_DAY, 0);
+// //        cal.set(Calendar.MINUTE, 0);
+// //        cal.set(Calendar.SECOND,0);
+// //        cal.set(Calendar.MILLISECOND, 0);
+// //        Date now = cal.getTime();
+// //        System.out.println(now);
+// //        System.out.println("=======================");
+// //        cal.add(Calendar.DAY_OF_MONTH,1);
+// //        System.out.println(cal.getTime());
+// //    }
+// }