体验课 增删改查 奖学金规则

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

@@ -1,10 +1,12 @@
 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;
 import com.ygj.yuemum.domain.college.CollegeCurriculumExperience;
+import com.ygj.yuemum.domain.college.CollegeCurriculumPractice;
 import com.ygj.yuemum.domain.college.CollegeQuery;
 import com.ygj.yuemum.service.college.CollegeCurriculumCoreService;
 import com.ygj.yuemum.service.college.CollegeCurriculumExperienceService;
@@ -34,8 +36,10 @@ public class CollegeCurriculumExperienceController {
         return collegeCurriculumExperienceService.getCollegeCurriculumExperience(id);
     }
 
-    @PostMapping("/addCollegeCurriculumExperience")
-    public int addCollegeCurriculumExperience(@ModelAttribute CollegeCurriculumExperience collegeCurriculumExperience) {
+    @RequestMapping(value = "/addCollegeCurriculumExperience", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int addCollegeCurriculumExperience(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumExperience collegeCurriculumExperience = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumExperience.class);
         return collegeCurriculumExperienceService.addCollegeCurriculumExperience(collegeCurriculumExperience);
     }
 
@@ -44,11 +48,14 @@ public class CollegeCurriculumExperienceController {
         return collegeCurriculumExperienceService.deleteCollegeCurriculumExperience(id);
     }
 
-    @PostMapping("/updateCollegeCurriculumExperience")
-    public int updateCollegeCurriculumExperience(@ModelAttribute CollegeCurriculumExperience collegeCurriculumExperience) {
+    @RequestMapping(value = "/updateCollegeCurriculumExperience", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
+    @ResponseBody
+    public int updateCollegeCurriculumExperience(@RequestBody Map<String, Object> jsonParam) {
+        CollegeCurriculumExperience collegeCurriculumExperience = JSON.parseObject(JSON.toJSONString(jsonParam), CollegeCurriculumExperience.class);
         return collegeCurriculumExperienceService.updateCollegeCurriculumExperience(collegeCurriculumExperience);
     }
 
+
     @PostMapping("/college/queryUserLearningExperience")
     public String queryUserLearningExperience(@RequestParam("openid") String openid,@RequestParam("city") String city) {
         LinkedHashMap<String, Object> orderTemps = collegeCurriculumExperienceService.queryUserLearningExperience(openid,city);

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

@@ -1,6 +1,7 @@
 package com.ygj.yuemum.controller.college;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ygj.yuemum.domain.college.CollegePointsDetail;
 import com.ygj.yuemum.domain.college.CollegeUserPoints;
 import com.ygj.yuemum.service.college.CollegePointsDetailService;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 @RestController
 public class CollegePointsDetailController {
@@ -47,4 +49,13 @@ public class CollegePointsDetailController {
     }
 
 
+    @PostMapping("/queryCreditsLogs") //++++++
+    public String queryCreditsLogs(@ModelAttribute CollegePointsDetail collegePointsDetail ) {
+        Map<String, Object> collegeCurriculumCores = collegePointsDetailService.queryCreditsLogs(collegePointsDetail);
+        String jso = JSONObject.toJSONString(collegeCurriculumCores);
+        return jso;
+    }
+
+
+
 }

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

@@ -0,0 +1,22 @@
+package com.ygj.yuemum.controller.college;
+
+
+import com.ygj.yuemum.domain.college.CollegePresentCredit;
+import com.ygj.yuemum.service.college.CollegePresentCreditService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+public class CollegePresentCreditsController {
+
+    @Autowired
+    private CollegePresentCreditService collegePresentCreditService;
+
+    @GetMapping("/getCollegePresentCreditList")
+    public List<CollegePresentCredit> getCollegePresentCreditList() {
+        return collegePresentCreditService.getCollegePresentCredits();
+    }
+}

src/main/java/com/ygj/yuemum/controller/wxmini/WXUserController.java

@@ -11,21 +11,31 @@ public class WXUserController {
 
     @Autowired
     private WXUserService wxUserService;
+
     @GetMapping("/getWXUser")
     public WXUser getWXUser(@RequestParam("xu_openid") String xu_openid) {
         WXUser wxUser = wxUserService.getWXUser(xu_openid);
         return wxUser;
     }
+
     @GetMapping("/getWXUserType")
     public int getWXUserType(@RequestParam("xu_openid") String xu_openid) {
         return wxUserService.getWXUserType(xu_openid);
     }
+
     @PostMapping("/insertWXUser")
     public int insertWXUser(@ModelAttribute WXUser wxUser) {
         return wxUserService.insertWXUser(wxUser);
     }
+
     @PostMapping("/updateWXUser")
     public int updateWXUser(@ModelAttribute WXUser wxUser) {
         return wxUserService.updateWXUser(wxUser);
     }
+
+    @PostMapping("/college/enableCollege")
+    public int enableCollege(@RequestParam("openid") String openid) {
+        return wxUserService.enableCollege(openid);
+    }
+
 }

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

@@ -31,5 +31,7 @@ public interface CollegeCurriculumExperienceDao {
     int updatePCountAdd(String c_code);
     int updatePCountCancel(String c_code);
 
+    CollegeCurriculumExperience getExperienceSeq();
+
 
 }

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

@@ -17,4 +17,6 @@ public interface CollegePointsDetailDao {
     int insertSelective(CollegePointsDetail record);
 
     int updateByPrimaryKeySelective(CollegePointsDetail record);
+
+    List<CollegePointsDetail> queryCreditsLogs(CollegePointsDetail record);
 }

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

@@ -11,4 +11,5 @@ public interface WXUserDao {
     int updateWXUser(WXUser wxUser);
     int getWXUserType(String xu_openid);
     int checkWXUser(String xu_phone);
+    int enableCollege(String xu_openid);
 }

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

@@ -4,6 +4,7 @@ public class CollegeCurriculumExperience {
 
     private Integer id;
     private String c_code;
+    private Integer c_seq;
     private String c_name;
     private String c_type;
     private Integer c_step;
@@ -28,6 +29,14 @@ public class CollegeCurriculumExperience {
     private Integer limit;
     private String img_href;
 
+    public Integer getC_seq() {
+        return c_seq;
+    }
+
+    public void setC_seq(Integer c_seq) {
+        this.c_seq = c_seq;
+    }
+
     public String getBranches_name() {
         return branches_name;
     }

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

@@ -9,9 +9,18 @@ public class CollegePointsDetail {
     private String context;
     private Integer credit;
     private String date;
+    private String xu_phone;
     private Integer page;
     private Integer limit;
 
+    public String getXu_phone() {
+        return xu_phone;
+    }
+
+    public void setXu_phone(String xu_phone) {
+        this.xu_phone = xu_phone;
+    }
+
     public Integer getRule_id() {
         return rule_id;
     }

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

@@ -17,6 +17,15 @@ public class WXUser {
     private Integer xu_isauthorize;
     private String xu_content_type;
     private String xu_content_date;
+    private boolean college_enable;
+
+    public boolean isCollege_enable() {
+        return college_enable;
+    }
+
+    public void setCollege_enable(boolean college_enable) {
+        this.college_enable = college_enable;
+    }
 
     public String getXu_content_type() {
         return xu_content_type;

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

@@ -6,6 +6,7 @@ import com.ygj.yuemum.component.Constant;
 import com.ygj.yuemum.dao.college.CollegeCurriculumExperienceDao;
 import com.ygj.yuemum.domain.college.*;
 import com.ygj.yuemum.domain.wxmini.WXUser;
+import com.ygj.yuemum.service.distributionchannel.MiniAppService;
 import com.ygj.yuemum.service.wxmini.WXUserService;
 import com.ygj.yuemum.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,8 @@ public class CollegeCurriculumExperienceService {
     private WXUserService wxUserService;
     @Autowired
     private CollegeScholarshipsDetailService collegeScholarshipsDetailService;
+    @Autowired
+    private MiniAppService miniAppService;
 
     public Map<String, Object> getCollegeCurriculumExperiences(CollegeCurriculumExperience collegeCurriculumPractice) {
         PageHelper.startPage(collegeCurriculumPractice.getPage(), collegeCurriculumPractice.getLimit());
@@ -45,6 +48,11 @@ public class CollegeCurriculumExperienceService {
     }
 
     public int addCollegeCurriculumExperience(CollegeCurriculumExperience collegeCurriculumExperience) {
+        CollegeCurriculumExperience collegeCurriculumExperienceMax = collegeCurriculumExperienceDao.getExperienceSeq();
+        collegeCurriculumExperience.setC_code("E"+(collegeCurriculumExperienceMax.getId()+1));
+        collegeCurriculumExperience.setPcount(0);
+        //创建二维码
+        collegeCurriculumExperience.setQrcode(miniAppService.createQrCode("E"+(collegeCurriculumExperienceMax.getId()+1)));
         return collegeCurriculumExperienceDao.insertSelective(collegeCurriculumExperience);
     }
 

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

@@ -7,6 +7,7 @@ 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.distributionchannel.MiniAppService;
 import com.ygj.yuemum.service.wxmini.WXMktInfoService;
 import com.ygj.yuemum.service.wxmini.WXUserService;
 import com.ygj.yuemum.utils.DateUtil;
@@ -31,7 +32,8 @@ public class CollegeCurriculumPracticeService {
     private CollegeScholarshipsDetailService collegeScholarshipsDetailService;
     @Autowired
     private WXMktInfoService wxMktInfoService;
-
+    @Autowired
+    private MiniAppService miniAppService;
 
     public  Map<String, Object> getCollegeCurriculumPractices(CollegeCurriculumPractice collegeCurriculumPractice) {
         PageHelper.startPage(collegeCurriculumPractice.getPage(), collegeCurriculumPractice.getLimit());
@@ -111,6 +113,7 @@ public class CollegeCurriculumPracticeService {
         CollegeCurriculumPractice collegeCurriculumPracticeMax = collegeCurriculumPracticeDao.getPracticeSeq();
         collegeCurriculumPractice.setC_code("P"+(collegeCurriculumPracticeMax.getId()+1));
         //生成二维码
+        collegeCurriculumPractice.setQrcode(miniAppService.createQrCode("P"+(collegeCurriculumPracticeMax.getId()+1)));
         return collegeCurriculumPracticeDao.insertSelective(collegeCurriculumPractice);
     }
 

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

@@ -1,11 +1,15 @@
 package com.ygj.yuemum.service.college;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.ygj.yuemum.dao.college.CollegePointsDetailDao;
 import com.ygj.yuemum.domain.college.CollegePointsDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CollegePointsDetailService {
@@ -23,6 +27,17 @@ public class CollegePointsDetailService {
         return collegeUserPoints;
     }
 
+    public Map<String, Object> queryCreditsLogs(CollegePointsDetail collegePointsDetail) {
+        PageHelper.startPage(collegePointsDetail.getPage(), collegePointsDetail.getLimit());
+        List<CollegePointsDetail>  collegePointsDetails = collegePointsDetailDao.queryCreditsLogs(collegePointsDetail);
+        PageInfo<CollegePointsDetail> pageInfo = new PageInfo<CollegePointsDetail>(collegePointsDetails);
+        long count = pageInfo.getTotal(); //获取总记录数
+        Map<String, Object> tableData = new HashMap<>();
+        tableData.put("items", collegePointsDetails);
+        tableData.put("total", count);
+        return tableData;
+    }
+
     public int addCollegePointsDetail(CollegePointsDetail collegePointsDetail) {
         return collegePointsDetailDao.insertSelective(collegePointsDetail);
     }

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

@@ -104,6 +104,10 @@ public class CollegeUserPointsService {
         tableData.put("stage", null);
         tableData.put("stage_date", null);
         if (wxUser != null && wxUser.getXu_phone() != null) {
+            if(!wxUser.isCollege_enable()) {
+                tableData.put("errStatus", "9"); //没有开通超人学院
+                return tableData;
+            }
             if (wxUser.getXu_content_type() != null && wxUser.getXu_content_date() != null) {
                 try {
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -345,11 +349,11 @@ public class CollegeUserPointsService {
                     return tableData;
                 }
             } else {
-                tableData.put("status", "5"); //没有设置日期
+                tableData.put("errStatus", "5"); //没有设置日期
                 return tableData;
             }
         } else {
-            tableData.put("status", "6"); //没有授权手机号
+            tableData.put("errStatus", "6"); //没有授权手机号
             return tableData;
         }
     }

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

@@ -33,5 +33,8 @@ public class WXUserService {
     public int checkWXUser(String xu_phone) {
         return wxUserDao.checkWXUser(xu_phone);
     }
+    public int enableCollege(String xu_phone) {
+        return wxUserDao.enableCollege(xu_phone);
+    }
 
 }

src/main/java/com/ygj/yuemum/shiro/ShiroConfig.java

@@ -168,6 +168,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/college/queryUserScholarshipsLog", "anon");
         filterChainDefinitionMap.put("/college/queryRedeemDetail", "anon");
         filterChainDefinitionMap.put("/college/userRedeem", "anon");
+        filterChainDefinitionMap.put("/college/enableCollege", "anon");
 //        //用户，需要角色权限 “user”
 //        filterChainDefinitionMap.put("/user/**", "roles[user]");
 //        //管理员，需要角色权限 “admin”

src/main/resources/mybatis/mapper/college/CollegeCurriculumExperienceMapper.xml

@@ -25,8 +25,28 @@
 
     <select id="getAll" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumExperience" >
         select
-        *
-        from college_curriculum_experience
+        ta.*,
+        fgetbranches_name(ta.city) branches_name
+        from college_curriculum_experience as ta
+        where 1=1
+        <if test="c_name != null and c_name != ''">
+            and c_name like "%"#{c_name,jdbcType=VARCHAR}"%"
+        </if>
+        <if test="c_type != null and c_type != ''">
+            and c_type = #{c_type,jdbcType=VARCHAR}
+        </if>
+        <if test="c_step != null and c_step != ''">
+            and c_step = #{c_step,jdbcType=INTEGER}
+        </if>
+        <if test="credit != null and credit != ''">
+            and credit = #{credit,jdbcType=INTEGER}
+        </if>
+        <if test="city != null and city != ''">
+            and city = #{city,jdbcType=INTEGER}
+        </if>
+        <if test="m_name != null and m_name != ''">
+            and m_name like "%"#{m_name,jdbcType=VARCHAR}"%"
+        </if>
         order by id desc
     </select>
 
@@ -277,4 +297,11 @@
         where c_code =  #{c_code,jdbcType=VARCHAR}
     </update>
 
+    <select id="getExperienceSeq" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore">
+        select
+        *
+        from college_curriculum_experience
+        order by id desc limit 1
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/college/CollegeCurriculumPracticeMapper.xml

@@ -13,6 +13,7 @@
         <result column="c_content" property="c_content" jdbcType="VARCHAR" />
         <result column="city" property="city" jdbcType="VARCHAR" />
         <result column="branches" property="branches" jdbcType="VARCHAR" />
+        <result column="branche_id" property="branche_id" jdbcType="INTEGER" />
         <result column="address" property="address" jdbcType="VARCHAR" />
         <result column="startdate" property="startdate" jdbcType="VARCHAR" />
         <result column="enddate" property="enddate" jdbcType="VARCHAR" />
@@ -25,11 +26,35 @@
     </resultMap>
     <!--获取所有数据-->
 
-    <select id="getAll" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice" >
+    <select id="getAll" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice">
         select
         *
         from college_curriculum_practice
-        order by id desc
+        where 1=1
+        <if test="c_name != null and c_name != ''">
+            and c_name like "%"#{c_name,jdbcType=VARCHAR}"%"
+        </if>
+        <if test="c_type != null and c_type != ''">
+            and c_type = #{c_type,jdbcType=VARCHAR}
+        </if>
+        <if test="c_step != null and c_step != ''">
+            and c_step = #{c_step,jdbcType=INTEGER}
+        </if>
+        <if test="credit != null and credit != ''">
+            and credit = #{credit,jdbcType=INTEGER}
+        </if>
+        <if test="branche_id != null and branche_id != ''">
+            and branche_id = #{branche_id,jdbcType=INTEGER}
+        </if>
+        <if test="deadline != null and deadline != ''">
+            and DATE_FORMAT(deadline,'%Y-%m-%d') = DATE_FORMAT(#{deadline,jdbcType=DATE},'%Y-%m-%d')
+        </if>
+        <if test="startdate != null and startdate != null and enddate != 0 and enddate != 0">
+            and startdate &gt;= DATE_FORMAT(#{startdate,jdbcType=VARCHAR},'%Y-%m-%d')
+            and enddate &lt;=  DATE_FORMAT(#{enddate,jdbcType=VARCHAR},'%Y-%m-%d')
+        </if>
+
+        order by id asc
     </select>
 
 
@@ -146,6 +171,9 @@
             <if test="city != null" >
                 city,
             </if>
+            <if test="branche_id != null" >
+                branche_id,
+            </if>
             <if test="branches != null" >
                 branches,
             </if>
@@ -202,6 +230,9 @@
             <if test="city != null" >
                 #{city,jdbcType=VARCHAR},
             </if>
+            <if test="branche_id != null" >
+                #{branche_id,jdbcType=INTEGER},
+            </if>
             <if test="branches != null" >
                 #{branches,jdbcType=VARCHAR},
             </if>
@@ -238,9 +269,6 @@
     <update id="updateByPrimaryKeySelective" parameterType="com.ygj.yuemum.domain.college.CollegeCurriculumPractice" >
         update college_curriculum_practice
         <set >
-            <if test="c_code != null" >
-                c_code = #{c_code,jdbcType=VARCHAR},
-            </if>
             <if test="c_seq != null" >
                 c_seq = #{c_seq,jdbcType=INTEGER},
             </if>
@@ -262,6 +290,9 @@
             <if test="city != null" >
                 city = #{city,jdbcType=VARCHAR},
             </if>
+            <if test="branche_id != null" >
+                branche_id = #{branche_id,jdbcType=INTEGER},
+            </if>
             <if test="branches != null" >
                 branches = #{branches,jdbcType=VARCHAR},
             </if>
@@ -307,4 +338,11 @@
         where c_code =  #{c_code,jdbcType=VARCHAR}
     </update>
 
+    <select id="getPracticeSeq" resultType="com.ygj.yuemum.domain.college.CollegeCurriculumCore">
+        select
+        *
+        from college_curriculum_practice
+        order by id desc limit 1
+    </select>
+
 </mapper>

src/main/resources/mybatis/mapper/college/CollegePointsDetailMapper.xml

@@ -21,6 +21,25 @@
     </select>
 
 
+    <select id="queryCreditsLogs" resultType="com.ygj.yuemum.domain.college.CollegePointsDetail" >
+        select
+        ta.*,
+        tb.xu_phone
+        from college_points_detail ta  LEFT JOIN wx_user tb ON ta.openid = tb.xu_openid
+        where 1=1
+        <if test="xu_phone != null and xu_phone != ''">
+            and tb.xu_phone = #{xu_phone,jdbcType=INTEGER}
+        </if>
+        <if test="rule_id != null and rule_id != ''">
+            and rule_id = #{rule_id,jdbcType=INTEGER}
+        </if>
+        <if test="date != null and date != ''">
+            and DATE_FORMAT(`date`,'%Y-%m-%d') = DATE_FORMAT(#{date,jdbcType=DATE},'%Y-%m-%d')
+        </if>
+        order by id desc
+    </select>
+
+
     <select id="selectByPrimaryKey" resultType="com.ygj.yuemum.domain.college.CollegePointsDetail" parameterType="java.lang.Integer" >
         select
         *
@@ -52,7 +71,7 @@
                 credit,
             </if>
             <if test="date != null" >
-                date
+                `date`
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >

src/main/resources/mybatis/mapper/coupon/CouponCreateMapper.xml

@@ -16,10 +16,11 @@
         <result column="syncmodoo" property="syncmodoo" jdbcType="VARCHAR" />
         <result column="usercode" property="usercode" jdbcType="VARCHAR" />
         <result column="cb_type" property="cb_type" jdbcType="BIT" />
+        <result column="no_amount" property="no_amount" jdbcType="INTEGER" />
     </resultMap>
 
     <sql id="Base_Column_List" >
-      id,cb_code,cc_quantity,cc_amount,cc_createdate,cc_startdate,cc_enddate,cc_status,syncmodoodate,syncmodoo,usercode,cb_type
+      id,cb_code,cc_quantity,cc_amount,cc_createdate,cc_startdate,cc_enddate,cc_status,syncmodoodate,syncmodoo,usercode,cb_type,no_amount
     </sql>
 
     <!--获取所有数据-->
@@ -39,7 +40,8 @@
             cc_amount,
             cc_quantity,
             cc_status,
-            cb_type
+            cb_type,
+            no_amount
         FROM
             coupon_create
         order by id desc
@@ -101,7 +103,10 @@
                 cc_status,
             </if>
             <if test="cb_type != null" >
-                cb_type
+                cb_type,
+            </if>
+            <if test="no_amount != null" >
+                no_amount
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -129,6 +134,9 @@
             <if test="cb_type != null" >
                 #{cb_type,jdbcType=BIT}
             </if>
+            <if test="no_amount != null" >
+                #{no_amount,jdbcType=INTEGER}
+            </if>
         </trim>
     </insert>
 
@@ -161,7 +169,10 @@
                 cb_type = #{cb_type,jdbcType=BIT},
             </if>
             <if test="date != null" >
-                `date` = #{date,jdbcType=DATE}
+                `date` = #{date,jdbcType=DATE},
+            </if>
+            <if test="no_amount != null" >
+                no_amount = #{no_amount,jdbcType=INTEGER}
             </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
@@ -217,7 +228,8 @@
         ta.cc_createdate,
         ta.cc_status,
         ta.cc_startdate,
-        ta.cc_enddate
+        ta.cc_enddate,
+        ta.no_amount
         FROM
         coupon_create ta
         LEFT JOIN coupon_batch tb ON ta.cb_code = tb.cb_code

src/main/resources/mybatis/mapper/customer/CustomerCouponMapper.xml

@@ -118,6 +118,7 @@
     <select id="getWXCustomerCoupons" resultMap="BaseResultMap" parameterType="java.lang.String"  >
         SELECT
         ta.cc_code,
+        ta.cb_code,
         tb.cb_name,
         tb.cb_rule,
         fgetpackages(tb.id) cb_packages,
@@ -126,11 +127,13 @@
         DATE_FORMAT(tc.cp_enddate,'%Y-%m-%d') cp_enddate,
         tc.cp_amount,
         cc_getdate,
-        ta.cp_status
+        ta.cp_status,
+        IFNULL(td.no_amount,0) no_amount
         FROM
         customer_coupon ta
         LEFT JOIN coupon_batch tb ON ta.cb_code = tb.cb_code
         left JOIN coupon tc on ta.cc_code = tc.cp_code
+        left join coupon_create td on ta.cb_code =  td.cb_code
         where
         ta.cm_phone = #{cm_phone,jdbcType=VARCHAR}
         and ta.cp_status = 2

src/main/resources/mybatis/mapper/wxmini/WXMktInfoMapper.xml

@@ -37,5 +37,13 @@
             wx_mkt_info
         order by id asc
     </select>
+    <select id="queryMktInfo" resultType="com.ygj.yuemum.domain.wxmini.WXMktInfo" parameterType="java.lang.Integer">
+        SELECT
+           *
+        FROM
+            wx_mkt_info
+        where id = #{id,jdbcType=INTEGER}
+        order by id asc
+    </select>
 
 </mapper>

src/main/resources/mybatis/mapper/wxmini/WXUserMapper.xml

@@ -19,12 +19,13 @@
         <result column="xu_isauthorize" property="xu_isauthorize" jdbcType="INTEGER"/>
         <result column="xu_content_type" property="xu_content_type" jdbcType="INTEGER"/>
         <result column="xu_content_date" property="xu_content_date" jdbcType="INTEGER"/>
+        <result column="college_enable" property="college_enable" jdbcType="INTEGER"/>
     </resultMap>
 
     <!--获取所有数据-->
     <select id="getWXUser" resultType="com.ygj.yuemum.domain.wxmini.WXUser" parameterType="java.lang.String">
         select
-        id,xu_openid,xu_sessionkey,xu_phone,xu_name,xu_avatarUrl,xu_gender,xu_city,xu_province,xu_country,xu_language,xu_ydate,xu_isauthorize,xu_content_type,xu_content_date
+        id,xu_openid,xu_sessionkey,xu_phone,xu_name,xu_avatarUrl,xu_gender,xu_city,xu_province,xu_country,xu_language,xu_ydate,xu_isauthorize,xu_content_type,xu_content_date,college_enable
         from wx_user
         where xu_openid = #{xu_openid,jdbcType=VARCHAR}
         order by id asc
@@ -67,7 +68,10 @@
                 xu_ydate,
             </if>
             <if test="xu_isauthorize != null" >
-                xu_isauthorize
+                xu_isauthorize,
+            </if>
+            <if test="college_enable != null" >
+                college_enable
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -105,7 +109,10 @@
                 #{xu_ydate,jdbcType=DATE},
             </if>
             <if test="xu_isauthorize != null" >
-                #{xu_isauthorize,jdbcType=INTEGER}
+                #{xu_isauthorize,jdbcType=INTEGER},
+            </if>
+            <if test="college_enable != null" >
+                #{college_enable,jdbcType=INTEGER}
             </if>
         </trim>
     </insert>
@@ -156,7 +163,10 @@
                 xu_content_type = #{xu_content_type,jdbcType=VARCHAR},
             </if>
             <if test="xu_content_date != null" >
-                xu_content_date = #{xu_content_date,jdbcType=DATE}
+                xu_content_date = #{xu_content_date,jdbcType=DATE},
+            </if>
+            <if test="college_enable != null" >
+                college_enable = #{college_enable,jdbcType=INTEGER}
             </if>
         </set>
         where xu_openid = #{xu_openid,jdbcType=VARCHAR}
@@ -177,4 +187,9 @@
         where xu_phone = #{xu_phone,jdbcType=VARCHAR}
         order by id asc
     </select>
+    <update id="enableCollege" parameterType="java.lang.String" >
+        update wx_user
+        set college_enable = 1
+        where xu_openid = #{xu_openid,jdbcType=VARCHAR}
+    </update>
 </mapper>