超级会员列表bugfix

src/main/java/com/caimei/modules/supervip/dao/CmSvipHistoryDao.java

@@ -24,4 +24,5 @@ public interface CmSvipHistoryDao extends CrudDao<CmSvipHistory> {
 
     CmSvipHistory findOutEndTime(Long userId);
 
+    Integer findPackage(Integer pac);
 }

src/main/java/com/caimei/modules/supervip/entity/CmSvipHistory.java

@@ -17,7 +17,7 @@ public class CmSvipHistory extends DataEntity<CmSvipHistory> {
 
     private static final long serialVersionUID = 1L;
     private Long userId;        // 用户ID
-    private Long packageId;        // 超级会员套餐ID 12个月1 3个月2 1个月3
+    private Integer packageId;        // 超级会员套餐ID
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date beginTime;        // 生效时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -133,11 +133,11 @@ public class CmSvipHistory extends DataEntity<CmSvipHistory> {
         this.userId = userId;
     }
 
-    public Long getPackageId() {
+    public Integer getPackageId() {
         return packageId;
     }
 
-    public void setPackageId(Long packageId) {
+    public void setPackageId(Integer packageId) {
         this.packageId = packageId;
     }
 

src/main/java/com/caimei/modules/supervip/service/CmSvipHistoryService.java

@@ -1,10 +1,12 @@
 package com.caimei.modules.supervip.service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import com.caimei.modules.supervip.dao.CmSvipHistoryDao;
 import com.caimei.modules.supervip.entity.CmSvipHistory;
+import com.caimei.modules.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,17 +34,29 @@ public class CmSvipHistoryService extends CrudService<CmSvipHistoryDao, CmSvipHi
     }
 
     public List<CmSvipHistory> findHistoryform(CmSvipHistory cmSvipHistory) {
+        Integer packageId = cmSvipHistory.getPackageId();
+        if (packageId != 99 && packageId !=666) {
+            Integer aPackage = svipDao.findPackage(packageId);
+            cmSvipHistory.setPackageId(aPackage);
+        } else {
+            cmSvipHistory.setPackageId(null);
+        }
         List<CmSvipHistory> history = svipDao.findHistory(cmSvipHistory);
+        //1生效2过期3未生效
         for (CmSvipHistory svipHistory : history) {
-            CmSvipHistory vp = svipDao.findEndTime(svipHistory.getUserId());
-            CmSvipHistory vps=svipDao.findOutEndTime(svipHistory.getUserId());
-            if (vp != null) {
+            Date beginTime = svipHistory.getBeginTime();
+            Date endTime = svipHistory.getEndTime();
+            //开始时间<现在
+            Date now = new Date();
+            if (beginTime.after(now)) {
+                svipHistory.setStatus("3");
+            }
+            if (beginTime.before(now) && endTime.after(now)) {
                 svipHistory.setStatus("1");
-            } else {
-                svipHistory.setStatus("2");
             }
-            if(vps!=null){
-                svipHistory.setStatus("3");
+            //终止时间>现在
+            if (endTime.before(now)) {
+                svipHistory.setStatus("2");
             }
         }
         return history;
@@ -51,6 +65,13 @@ public class CmSvipHistoryService extends CrudService<CmSvipHistoryDao, CmSvipHi
     @Override
     public Page<CmSvipHistory> findPage(Page<CmSvipHistory> page, CmSvipHistory vip) {
         Page<CmSvipHistory> pageReslut = super.findPage(page, vip);
+        Integer packageId = vip.getPackageId();
+        if (packageId != 99 && packageId !=666) {
+            Integer aPackage = svipDao.findPackage(packageId);
+            vip.setPackageId(aPackage);
+        }else {
+            vip.setPackageId(null);
+        }
         List<CmSvipHistory> cmSvipHistories = svipDao.superFind(vip);
         for (CmSvipHistory cmSvipHistory : cmSvipHistories) {
             CmSvipHistory vp = svipDao.findEndTime(cmSvipHistory.getUserId());

src/main/java/com/caimei/modules/supervip/web/CmSvipHistoryController.java

@@ -49,6 +49,8 @@ public class CmSvipHistoryController extends BaseController {
 
     @RequestMapping(value = {"list", ""})
     public String list(CmSvipHistory cmSvipHistory, HttpServletRequest request, HttpServletResponse response, Model model) {
+        //packageid赋值
+        cmSvipHistory.setPackageId(666);
         Page<CmSvipHistory> page = cmSvipHistoryService.findPage(new Page<CmSvipHistory>(request, response), cmSvipHistory);
         model.addAttribute("page", page);
         return "modules/svip/cmSvipHistoryList";
@@ -58,6 +60,8 @@ public class CmSvipHistoryController extends BaseController {
     @RequestMapping(value = "form")
     public String form(CmSvipHistory cmSvipHistory, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<CmSvipHistory> page = new Page<>(request, response);
+        //packageid赋值
+        cmSvipHistory.setPackageId(666);
         List<CmSvipHistory> pageResult = cmSvipHistoryService.findHistoryform(cmSvipHistory);
         String mobile = "";
         String linkMan = "";
@@ -78,7 +82,7 @@ public class CmSvipHistoryController extends BaseController {
 
 
     @RequestMapping(value = "findHistory")
-    public String save(CmSvipHistory cmSvipHistory, Model model, HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) {
+    public String findHistory(CmSvipHistory cmSvipHistory, Model model, HttpServletRequest request, HttpServletResponse response,RedirectAttributes redirectAttributes) {
         Page<CmSvipHistory> page = new Page<>(request, response);
         List<CmSvipHistory> pageResult = cmSvipHistoryService.findHistoryform(cmSvipHistory);
         String mobile = "";

src/main/resources/mappings/modules/super/CmSvipHistoryMapper.xml

@@ -83,24 +83,24 @@
         cb.name as clubName,
         cb.linkMan1 as linkMan,
         cb.contractMobile1 as mobile,
+        cs.beginTime,
         cs.price,
         cs.payWay,
         cs.payType,
-        cs.price,
         cs.userBeans,
         cs.payTime,
         cs.endTime
         from cm_svip_history cs
         LEFT JOIN club cb ON cs.userId = cb.userId
         where cs.userId = #{userId}
-        <if test="startPayTime !=null and startPayTime!='' and endPayTime !=null and endPayTime!=''">
+        <if test="startPayTime != null and startPayTime != '' and endPayTime != null and endPayTime != ''">
             and (payTime between #{startPayTime} and #{endPayTime})
         </if>
-        <if test="startEndTime !=null and startEndTime!='' and endEndTime!=null and endEndTime!=''">
+        <if test="startEndTime != null and startEndTime != '' and endEndTime != null and endEndTime != ''">
             and (endTime between #{startEndTime} and #{endEndTime})
         </if>
-        <if test="packageId !=null and packageId!=''">
-            and packageId=#{packageId}
+        <if test="packageId != null">
+            and packageId = #{packageId}
         </if>
         <if test='status == "1"'>
             and endTime > NOW()
@@ -122,16 +122,16 @@
 
 
     <select id="superFind" resultType="com.caimei.modules.supervip.entity.CmSvipHistory">
-        SELECT cb.name as clubName, cb.linkMan1 as linkMan, cb.contractMobile1 as mobile, cs.userId,
-        cs.packageId
+        SELECT cb.name as clubName, cb.linkMan1 as linkMan, cb.contractMobile1 as mobile,
+        cs.userId,cs.beginTime,cs.endTime,cs.packageId
         FROM cm_svip_history cs
         LEFT JOIN club cb ON cs.userId = cb.userId
         LEFT JOIN cm_svip_user cu ON cs.userId = cu.userId
         <where>
-            <if test="clubName!=null and clubName!=''">
+            <if test="clubName != null and clubName != ''">
                 and cb.name like concat('%',#{clubName},'%')
             </if>
-            <if test="linkMan!=null and linkMan!=''">
+            <if test="linkMan != null and linkMan != ''">
                 and cb.linkMan1 like concat('%',#{linkMan},'%') or linkMan2 like concat('%',#{linkMan},'%')
             </if>
             <if test="mobile != null and mobile != ''">
@@ -163,4 +163,10 @@
           and beginTime > now()
     </select>
 
+    <select id="findPackage" resultType="java.lang.Integer">
+        select id
+        from cm_svip_package
+        where duration = #{pac}
+    </select>
+
 </mapper>

src/main/webapp/WEB-INF/views/modules/svip/cmSvipHistoryForm.jsp

@@ -42,19 +42,21 @@
            action="${ctx}/svip/cmSvipHistory/findHistory?userId=${cmSvipHistory.userId}" method="post"
            class="breadcrumb form-search">
     <div>
-        <p style="padding: 12px;"><b>机构名称：${clubName}</b><span class="clubName"></span></p>
-        <p style="padding: 12px;"><b>联系人：${linkMan}</b><span class="clubName"></span></p>
-        <p style="padding: 12px;"><b>手机号：${mobile}</b><span class="clubName"></span></p>
+        <p style="padding: 12px;">
+            <b>机构名称：${clubName}</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <b>联系人：${linkMan}</b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <b>手机号：${mobile}</b>
+            <span class="clubName"></span></p>
     </div>
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
         <label>购买套餐：</label>
         <form:select path="packageId" class="input-medium ">
-            <form:option value="" label="全部"/>
-            <form:option value="3" label="1个月"/>
-            <form:option value="2" label="3个月"/>
-            <form:option value="1" label="12个月"/>
+            <form:option value="99" label="全部"/>
+            <form:option value="1" label="1个月"/>
+            <form:option value="3" label="3个月"/>
+            <form:option value="12" label="12个月"/>
         </form:select>
         <label>会员状态：</label>
         <form:select path="status" class="input-medium ">
@@ -121,7 +123,6 @@
             <td>
                 <c:if test="${cmSvipHistory.status eq '1'}"><font color="green">已生效</font> </c:if>
                 <c:if test="${cmSvipHistory.status eq '2'}"><font color="red">已过期</font> </c:if>
-                <c:if test="${cmSvipHistory.status eq '3'}"><font color="red">暂未生效</font> </c:if>
             </td>
             <td><fmt:formatDate value="${cmSvipHistory.payTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
             <td><fmt:formatDate value="${cmSvipHistory.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>

src/main/webapp/WEB-INF/views/modules/svip/cmSvipHistoryList.jsp

@@ -43,10 +43,10 @@
         <form:input path="mobile" htmlEscape="false" class="input-medium"/>
         <label>购买套餐：</label>
         <form:select path="packageId" class="input-medium required">
-            <form:option value="" label="全部"/>
-            <form:option value="3" label="1个月"/>
-            <form:option value="2" label="3个月"/>
-            <form:option value="1" label="12个月"/>
+            <form:option value="99" label="全部"/>
+            <form:option value="1" label="1个月"/>
+            <form:option value="3" label="3个月"/>
+            <form:option value="12" label="12个月"/>
         </form:select>
         <label>会员状态：</label>
         <form:select path="status" class="input-medium required">