常规、活动课 增删改查

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumCoreController.java

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.controller.college;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ygj.yuemum.domain.college.CollegeCurriculumCore;
@@ -9,6 +10,7 @@ import com.ygj.yuemum.service.college.CollegeCurriculumCoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -30,21 +32,28 @@ public class CollegeCurriculumCoreController {
         return collegeCurriculumCoreService.getCollegeCurriculumCore(id);
     }
 
-    @PostMapping("/addCollegeCurriculumCore")
-    public int addCollegeCurriculumCore(@ModelAttribute CollegeCurriculumCore collegeCurriculumCore) {
-        return collegeCurriculumCoreService.addCollegeCurriculumCore(collegeCurriculumCore);
-    }
-
     @GetMapping("/deleteCollegeCurriculumCore")
     public int deleteCollegeCurriculumCore(@RequestParam("id") Integer id) {
         return collegeCurriculumCoreService.deleteCollegeCurriculumCore(id);
     }
 
-    @PostMapping("/updateCollegeCurriculumCore")
-    public int updateCollegeCurriculumCore(@ModelAttribute CollegeCurriculumCore collegeCurriculumCore) {
+    @RequestMapping(value = "/addCollegeCurriculumCore", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int addCollegeCurriculumCore(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumCore collegeCurriculumCore = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumCore.class);
+        return collegeCurriculumCoreService.addCollegeCurriculumCore(collegeCurriculumCore);
+    }
+
+
+
+    @RequestMapping(value = "/updateCollegeCurriculumCore", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int updateCollegeCurriculumCore(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumCore collegeCurriculumCore = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumCore.class);
         return collegeCurriculumCoreService.updateCollegeCurriculumCore(collegeCurriculumCore);
     }
 
+
     @PostMapping("/college/queryUserLearningCore")
     public String queryUserLearningCore(@RequestParam("openid") String openid) {
         LinkedHashMap<String, Object> orderTemps = collegeCurriculumCoreService.queryUserLearningCore(openid);

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumExperienceController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class CollegeCurriculumExperienceController {
@@ -21,9 +22,11 @@ public class CollegeCurriculumExperienceController {
     @Autowired
     private CollegeCurriculumExperienceService collegeCurriculumExperienceService;
 
-    @GetMapping("/getCollegeCurriculumExperiences")
-    public List<CollegeCurriculumExperience> getCollegeCurriculumExperiences() {
-        return collegeCurriculumExperienceService.getCollegeCurriculumExperiences();
+    @PostMapping("/getCollegeCurriculumExperiences")
+    public String getCollegeCurriculumExperiences(CollegeCurriculumExperience collegeCurriculumPractice) {
+        Map<String, Object> collegeCurriculumPractices = collegeCurriculumExperienceService.getCollegeCurriculumExperiences(collegeCurriculumPractice);
+        String jso = JSONObject.toJSONString(collegeCurriculumPractices);
+        return jso;
     }
 
     @GetMapping("/getCollegeCurriculumExperience")

src/main/java/com/ygj/yuemum/controller/college/CollegeCurriculumPracticeController.java

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.controller.college;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ygj.yuemum.domain.college.CollegeCurriculumPractice;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import java.text.ParseException;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class CollegeCurriculumPracticeController {
@@ -19,9 +21,11 @@ public class CollegeCurriculumPracticeController {
     @Autowired
     private CollegeCurriculumPracticeService collegeCurriculumPracticeService;
 
-    @GetMapping("/getCollegeCurriculumPractices")
-    public List<CollegeCurriculumPractice> getCollegeCurriculumPractices() {
-        return collegeCurriculumPracticeService.getCollegeCurriculumPractices();
+    @PostMapping("/getCollegeCurriculumPractices")
+    public String getCollegeCurriculumPractices(@ModelAttribute CollegeCurriculumPractice collegeCurriculumPractice) {
+        Map<String, Object> collegeCurriculumPractices = collegeCurriculumPracticeService.getCollegeCurriculumPractices(collegeCurriculumPractice);
+        String jso = JSONObject.toJSONString(collegeCurriculumPractices);
+        return jso;
     }
 
     @GetMapping("/getCollegeCurriculumPractice")
@@ -29,20 +33,29 @@ public class CollegeCurriculumPracticeController {
         return collegeCurriculumPracticeService.getCollegeCurriculumPractice(id);
     }
 
-    @PostMapping("/addCollegeCurriculumPractice")
-    public int addCollegeCurriculumPractice(@ModelAttribute CollegeCurriculumPractice collegeCurriculumPractice) {
+
+    @RequestMapping(value = "/addCollegeCurriculumPractice", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int addCollegeCurriculumPractice(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumPractice collegeCurriculumPractice = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumPractice.class);
         return collegeCurriculumPracticeService.addCollegeCurriculumPractice(collegeCurriculumPractice);
     }
 
+
+    @RequestMapping(value = "/updateCollegeCurriculumPractice", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int updateCollegeCurriculumPractice(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumPractice collegeCurriculumPractice = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumPractice.class);
+        return collegeCurriculumPracticeService.updateCollegeCurriculumPractice(collegeCurriculumPractice);
+    }
+
+
+
     @GetMapping("/deleteCollegeCurriculumPractice")
     public int deleteCollegeCurriculumPractice(@RequestParam("id") Integer id) {
         return collegeCurriculumPracticeService.deleteCollegeCurriculumPractice(id);
     }
 
-    @PostMapping("/updateCollegeCurriculumPractice")
-    public int updateCollegeCurriculumPractice(@ModelAttribute CollegeCurriculumPractice collegeCurriculumPractice) {
-        return collegeCurriculumPracticeService.updateCollegeCurriculumPractice(collegeCurriculumPractice);
-    }
 
 
     @PostMapping("/college/queryUserLearningPractice")

src/main/java/com/ygj/yuemum/dao/college/CollegeCurriculumExperienceDao.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Repository
 public interface CollegeCurriculumExperienceDao {
 
-    List<CollegeCurriculumExperience> getAll();
+    List<CollegeCurriculumExperience> getAll(CollegeCurriculumExperience collegeCurriculumPractice);
 
     CollegeCurriculumExperience selectByPrimaryKey(Integer id);
 

src/main/java/com/ygj/yuemum/dao/college/CollegeCurriculumPracticeDao.java

@@ -11,10 +11,12 @@ import java.util.List;
 @Repository
 public interface CollegeCurriculumPracticeDao {
 
-    List<CollegeCurriculumPractice> getAll();
+    List<CollegeCurriculumPractice> getAll(CollegeCurriculumPractice collegeCurriculumPractice);
 
     CollegeCurriculumPractice selectByPrimaryKey(Integer id);
 
+    CollegeCurriculumPractice getPracticeSeq();
+
     int deleteByPrimaryKey(Integer id);
 
     int insertSelective(CollegeCurriculumPractice record);

src/main/java/com/ygj/yuemum/dao/wxmini/WXMktInfoDao.java

@@ -11,4 +11,6 @@ public interface WXMktInfoDao {
     List<WXMktInfo> getMktInfos(Integer mi_branche_code);
 
     List<WXMktInfo> getAll();
+
+    WXMktInfo queryMktInfo(Integer id);
 }

src/main/java/com/ygj/yuemum/domain/college/CollegeCurriculumExperience.java

@@ -10,6 +10,7 @@ public class CollegeCurriculumExperience {
     private String c_desc;
     private String c_content;
     private String city;
+    private String branches_name;
     private String m_name;
     private String m_address;
     private String latitude;
@@ -27,6 +28,13 @@ public class CollegeCurriculumExperience {
     private Integer limit;
     private String img_href;
 
+    public String getBranches_name() {
+        return branches_name;
+    }
+
+    public void setBranches_name(String branches_name) {
+        this.branches_name = branches_name;
+    }
 
     public String getScholarships() {
         return scholarships;

src/main/java/com/ygj/yuemum/domain/college/CollegeCurriculumPractice.java

@@ -1,17 +1,17 @@
 package com.ygj.yuemum.domain.college;
 
-import org.omg.PortableInterceptor.INACTIVE;
-
 public class CollegeCurriculumPractice {
 
     private Integer id;
     private String c_code;
     private String c_name;
+    private Integer c_seq;
     private String c_type;
     private Integer c_step;
     private String c_desc;
     private String c_content;
     private String city;
+    private Integer branche_id;
     private String branches;
     private String address;
     private String startdate;
@@ -33,6 +33,22 @@ public class CollegeCurriculumPractice {
     private Integer limit;
     private String img_href;
 
+    public Integer getBranche_id() {
+        return branche_id;
+    }
+
+    public void setBranche_id(Integer branche_id) {
+        this.branche_id = branche_id;
+    }
+
+    public Integer getC_seq() {
+        return c_seq;
+    }
+
+    public void setC_seq(Integer c_seq) {
+        this.c_seq = c_seq;
+    }
+
     public String getScholarships() {
         return scholarships;
     }

src/main/java/com/ygj/yuemum/domain/coupon/CouponCreate.java

@@ -18,7 +18,15 @@ public class CouponCreate {
     private Integer limit;
     private String cb_packages;
     private String cb_citys;
+    private Integer no_amount;
 
+    public Integer getNo_amount() {
+        return no_amount;
+    }
+
+    public void setNo_amount(Integer no_amount) {
+        this.no_amount = no_amount;
+    }
 
     public boolean isCb_type() {
         return cb_type;

src/main/java/com/ygj/yuemum/domain/customer/CustomerCoupon.java

@@ -1,5 +1,8 @@
 package com.ygj.yuemum.domain.customer;
 
+import com.sun.imageio.plugins.common.I18N;
+import org.omg.PortableInterceptor.INACTIVE;
+
 public class CustomerCoupon {
 
     private Integer id;
@@ -21,6 +24,15 @@ public class CustomerCoupon {
     private String cp_enddate;
     private Integer cp_amount;
     private Integer cc_quantity;
+    private Integer no_amount;
+
+    public Integer getNo_amount() {
+        return no_amount;
+    }
+
+    public void setNo_amount(Integer no_amount) {
+        this.no_amount = no_amount;
+    }
 
     public Integer getCc_quantity() {
         return cc_quantity;

src/main/java/com/ygj/yuemum/domain/wxmini/WXMktInfo.java

@@ -6,9 +6,18 @@ public class WXMktInfo {
     private String mi_mktaddress;
     private String mi_latitude;
     private String mi_longitude;
+    private String mi_branche_code;
     private String mi_mkturl;
     private String mi_mapurl;
 
+    public String getMi_branche_code() {
+        return mi_branche_code;
+    }
+
+    public void setMi_branche_code(String mi_branche_code) {
+        this.mi_branche_code = mi_branche_code;
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/ygj/yuemum/service/college/CollegeCurriculumExperienceService.java

@@ -1,5 +1,7 @@
 package com.ygj.yuemum.service.college;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.dao.college.CollegeCurriculumExperienceDao;
 import com.ygj.yuemum.domain.college.*;
@@ -11,9 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class CollegeCurriculumExperienceService {
@@ -28,9 +28,15 @@ public class CollegeCurriculumExperienceService {
     @Autowired
     private CollegeScholarshipsDetailService collegeScholarshipsDetailService;
 
-    public List<CollegeCurriculumExperience> getCollegeCurriculumExperiences() {
-        List<CollegeCurriculumExperience> collegeCurriculumExperiences = collegeCurriculumExperienceDao.getAll();
-        return collegeCurriculumExperiences;
+    public Map<String, Object> getCollegeCurriculumExperiences(CollegeCurriculumExperience collegeCurriculumPractice) {
+        PageHelper.startPage(collegeCurriculumPractice.getPage(), collegeCurriculumPractice.getLimit());
+        List<CollegeCurriculumExperience> collegeCurriculumExperiences = collegeCurriculumExperienceDao.getAll(collegeCurriculumPractice);
+        PageInfo<CollegeCurriculumExperience> pageInfo = new PageInfo<CollegeCurriculumExperience>(collegeCurriculumExperiences);
+        long count = pageInfo.getTotal(); //获取总记录数
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", collegeCurriculumExperiences);
+        tableData.put("total", count);
+        return tableData;
     }
 
     public CollegeCurriculumExperience getCollegeCurriculumExperience(Integer id) {

src/main/java/com/ygj/yuemum/service/college/CollegeCurriculumPracticeService.java

@@ -1,9 +1,13 @@
 package com.ygj.yuemum.service.college;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.dao.college.CollegeCurriculumPracticeDao;
 import com.ygj.yuemum.domain.college.*;
+import com.ygj.yuemum.domain.wxmini.WXMktInfo;
 import com.ygj.yuemum.domain.wxmini.WXUser;
+import com.ygj.yuemum.service.wxmini.WXMktInfoService;
 import com.ygj.yuemum.service.wxmini.WXUserService;
 import com.ygj.yuemum.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 
 @Service
 public class CollegeCurriculumPracticeService {
@@ -27,11 +29,19 @@ public class CollegeCurriculumPracticeService {
     private WXUserService wxUserService;
     @Autowired
     private CollegeScholarshipsDetailService collegeScholarshipsDetailService;
-
-
-    public List<CollegeCurriculumPractice> getCollegeCurriculumPractices() {
-        List<CollegeCurriculumPractice> collegeCurriculumPractices = collegeCurriculumPracticeDao.getAll();
-        return collegeCurriculumPractices;
+    @Autowired
+    private WXMktInfoService wxMktInfoService;
+
+
+    public  Map<String, Object> getCollegeCurriculumPractices(CollegeCurriculumPractice collegeCurriculumPractice) {
+        PageHelper.startPage(collegeCurriculumPractice.getPage(), collegeCurriculumPractice.getLimit());
+        List<CollegeCurriculumPractice> collegeCurriculumPractices = collegeCurriculumPracticeDao.getAll(collegeCurriculumPractice);
+        PageInfo<CollegeCurriculumPractice> pageInfo = new PageInfo<CollegeCurriculumPractice>(collegeCurriculumPractices);
+        long count = pageInfo.getTotal(); //获取总记录数
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", collegeCurriculumPractices);
+        tableData.put("total", count);
+        return tableData;
     }
 
     public CollegeCurriculumPractice getCollegeCurriculumPractice(Integer id) {
@@ -92,6 +102,15 @@ public class CollegeCurriculumPracticeService {
     }
 
     public int addCollegeCurriculumPractice(CollegeCurriculumPractice collegeCurriculumPractice) {
+        //通过门店获取城市 地址
+        WXMktInfo wxMktInfo = wxMktInfoService.queryMktInfo(collegeCurriculumPractice.getBranche_id());
+        collegeCurriculumPractice.setBranches(wxMktInfo.getMi_mktname());
+        collegeCurriculumPractice.setAddress(wxMktInfo.getMi_mktaddress());
+        collegeCurriculumPractice.setCity(wxMktInfo.getMi_branche_code());
+        collegeCurriculumPractice.setPcount(0);
+        CollegeCurriculumPractice collegeCurriculumPracticeMax = collegeCurriculumPracticeDao.getPracticeSeq();
+        collegeCurriculumPractice.setC_code("P"+(collegeCurriculumPracticeMax.getId()+1));
+        //生成二维码
         return collegeCurriculumPracticeDao.insertSelective(collegeCurriculumPractice);
     }
 
@@ -100,6 +119,10 @@ public class CollegeCurriculumPracticeService {
     }
 
     public int updateCollegeCurriculumPractice(CollegeCurriculumPractice collegeCurriculumPractice) {
+        WXMktInfo wxMktInfo = wxMktInfoService.queryMktInfo(collegeCurriculumPractice.getBranche_id());
+        collegeCurriculumPractice.setBranches(wxMktInfo.getMi_mktname());
+        collegeCurriculumPractice.setAddress(wxMktInfo.getMi_mktaddress());
+        collegeCurriculumPractice.setCity(wxMktInfo.getMi_branche_code());
         return collegeCurriculumPracticeDao.updateByPrimaryKeySelective(collegeCurriculumPractice);
     }
 

src/main/java/com/ygj/yuemum/service/college/CollegeScholarshipsDetailService.java

@@ -183,7 +183,7 @@ public class CollegeScholarshipsDetailService {
             collegeUserPointsFirst.setScholarships_total(collegeUserPointsFirst.getScholarships_total() + collegeScholarshipsRule.getFirst());
             collegeUserPointsService.updateScholarships(collegeUserPointsFirst);
         }
-        return 1;
+        return scholarships;
     }
 
     //减少奖学金

src/main/java/com/ygj/yuemum/service/college/CollegeTestDetailService.java

@@ -2,6 +2,8 @@ package com.ygj.yuemum.service.college;
 
 import com.ygj.yuemum.dao.college.CollegeTestDetailDao;
 import com.ygj.yuemum.domain.college.*;
+import com.ygj.yuemum.domain.wxmini.WXUser;
+import com.ygj.yuemum.service.wxmini.WXUserService;
 import org.omg.PortableInterceptor.INACTIVE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +30,10 @@ public class CollegeTestDetailService {
     private CollegeCurriculumCoreService collegeCurriculumCoreService;
     @Autowired
     private CollegeScholarshipsDetailService collegeScholarshipsDetailService;
+    @Autowired
+    private CollegeUserLevelService collegeUserLevelService;
+    @Autowired
+    private WXUserService wxUserService;
 
     public List<CollegeTestDetail> getCollegeTestDetails() {
         List<CollegeTestDetail> collegeTestDetails = collegeTestDetailDao.getAll();
@@ -66,9 +72,11 @@ public class CollegeTestDetailService {
         return collegeTestDetailDao.queryTestComplete(collegeTestDetail);
     }
     public LinkedHashMap<String, Object> addTestDetail(String openid, Integer core_id, String answers) {
+        WXUser  wxUser = wxUserService.getWXUser(openid);
         LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
         CollegeTestDetail collegeTestDetailQuery = new CollegeTestDetail();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy.MM.dd");
         collegeTestDetailQuery.setOpenid(openid);
         collegeTestDetailQuery.setCoreid(core_id);
         collegeTestDetailQuery.setSys_type("YueSuo");
@@ -80,7 +88,9 @@ public class CollegeTestDetailService {
             String[] answersL = answers.split(",");
             int score = 0;
             int count = 0;
+            int scholarships = 0;
             int i = 0;
+            int level = 0;
             List<CollegeTest> collegeTests = collegeTestService.selectByCoreId(core_id);
             for (CollegeTest collegeTest: collegeTests) {
                 List<CollegeTestResult> collegeTestResults = collegeTestResultService.selectByTestId(collegeTest.getId());
@@ -116,18 +126,28 @@ public class CollegeTestDetailService {
             CollegePointsDetail collegePointsDetail = new CollegePointsDetail();
             collegePointsDetail.setOpenid(openid);
             collegePointsDetail.setCredit(collegeCurriculumCore.getCredit());
-            if (collegeUserPointsService.queryOneUserPoints(openid) != null) {
+            CollegeUserPoints collegeUserPoints = collegeUserPointsService.queryOneUserPoints(openid);
+            if (collegeUserPoints != null) {
                 collegeUserPointsService.updatePointsByTest(collegePointsDetail);
+                level = collegeUserPoints.getCredit_available() + collegeCurriculumCore.getCredit();
             } else {
-                CollegeUserPoints collegeUserPoints = new CollegeUserPoints();
-                collegeUserPoints.setOpenid(openid);
-                collegeUserPoints.setCredit_available(collegeCurriculumCore.getCredit());
-                collegeUserPoints.setCredit_total(collegeCurriculumCore.getCredit());
-                collegeUserPointsService.addCollegeUserPoints(collegeUserPoints);
+                CollegeUserPoints collegeUserPointsNew = new CollegeUserPoints();
+                collegeUserPointsNew.setOpenid(openid);
+                collegeUserPointsNew.setCredit_available(collegeCurriculumCore.getCredit());
+                collegeUserPointsNew.setCredit_total(collegeCurriculumCore.getCredit());
+                collegeUserPointsService.addCollegeUserPoints(collegeUserPointsNew);
+                level = 1;
             }
             //增加奖学金
             CollegeCurriculumCore collegeCurriculumCoreTemp = collegeCurriculumCoreService.getCollegeCurriculumCore(core_id);
-            collegeScholarshipsDetailService.addScholarships(openid,"learning","core",core_id,collegeCurriculumCoreTemp.getCredit(),score);
+            scholarships = collegeScholarshipsDetailService.addScholarships(openid,"learning","core",core_id,collegeCurriculumCoreTemp.getCredit(),score);
+            CollegeUserLevel collegeUserLevel = collegeUserLevelService.getUserLevel(level);
+            tableData.put("scholarships",scholarships);
+            tableData.put("nike_name",wxUser.getXu_name());
+            tableData.put("curriculum_name",collegeCurriculumCore.getC_name());
+            tableData.put("test_count",collegeTests.size());
+            tableData.put("date",sdf2.format(new Date()));
+            tableData.put("level",collegeUserLevel.getDesc());
             return tableData;
         } else {
             tableData.put("score","已做过测试");

src/main/java/com/ygj/yuemum/service/college/CollegeUserPointsService.java

@@ -431,7 +431,7 @@ public class CollegeUserPointsService {
         List<Object> presentInfoTemp = new LinkedList<>();
         WXUser wxUser = wxUserService.getWXUser(openid);
         CollegeUserPoints collegeUserPoints = collegeUserPointsDao.queryOneUserPoints(openid);
-        CollegeUserLevel collegeUserLevel = new CollegeUserLevel();
+        CollegeUserLevel collegeUserLevel;
         if(collegeUserPoints == null) {
             //新增用户
             CollegeUserPoints collegeUserPointsNew = new CollegeUserPoints();

src/main/java/com/ygj/yuemum/service/wxmini/WXMktInfoService.java

@@ -22,4 +22,8 @@ public class WXMktInfoService {
         return mktInfoDao.getAll();
     }
 
+    public WXMktInfo queryMktInfo(Integer id) {
+        return mktInfoDao.queryMktInfo(id);
+    }
+
 }