bugfix

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

@@ -34,13 +34,6 @@ 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) {
@@ -76,13 +69,6 @@ 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,8 +49,6 @@ 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";
@@ -60,8 +58,6 @@ 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 = "";

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

@@ -93,19 +93,20 @@
         from cm_svip_history cs
         LEFT JOIN club cb ON cs.userId = cb.userId
         left join user u on cs.userId = u.userID
+        left join cm_svip_package cp on cp.id = cs.packageId
         where cs.userId = #{userId}
         AND cs.payStatus = '1'
         <if test="startPayTime != null and startPayTime != '' and endPayTime != null and endPayTime != ''">
-            and (payTime between #{startPayTime} and #{endPayTime})
+            and (cs.payTime between #{startPayTime} and #{endPayTime})
         </if>
         <if test="startEndTime != null and startEndTime != '' and endEndTime != null and endEndTime != ''">
-            and (endTime between #{startEndTime} and #{endEndTime})
+            and (cs.endTime between #{startEndTime} and #{endEndTime})
         </if>
         <if test="packageId != null">
-            and packageId = #{packageId}
+            and cp.duration = #{packageId}
         </if>
         <if test='status == "1"'>
-            and NOW() between cs.beginTime and cs.endTime
+            and (NOW() between cs.beginTime and cs.endTime)
         </if>
         <if test='status == "2"'>
             and NOW() > cs.endTime
@@ -131,6 +132,7 @@
         LEFT JOIN club cb ON cs.userId = cb.userId
         LEFT JOIN cm_svip_user cu ON cs.userId = cu.userId
         left join user u on cs.userId = u.userID
+        left join cm_svip_package cp on cp.id = cs.packageId
         <where>
             AND cs.payStatus = '1'
             <if test="clubName != null and clubName != ''">
@@ -143,13 +145,13 @@
                 and u.bindMobile LIKE concat('%',#{mobile},'%')
             </if>
             <if test="startPayTime !=null and startPayTime != '' and endPayTime !=null and endPayTime!=''">
-                and (payTime between #{startPayTime} and #{endPayTime})
+                and (cs.payTime between #{startPayTime} and #{endPayTime})
             </if>
             <if test="startEndTime !=null and startEndTime!='' and endEndTime!=null and endEndTime!=''">
                 and (cu.endTime between #{startEndTime} and #{endEndTime})
             </if>
-            <if test="packageId !=null and packageId!=''">
-                and packageId=#{packageId}
+            <if test="packageId !=null and packageId != ''">
+                and cp.duration = #{packageId}
             </if>
             <if test='status == "1"'>
                 and cu.endTime > NOW()

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

@@ -53,7 +53,7 @@
     <div class="ul-form">
         <label>购买套餐：</label>
         <form:select path="packageId" class="input-medium ">
-            <form:option value="99" label="全部"/>
+            <form:option value="" label="全部"/>
             <form:option value="1" label="1个月"/>
             <form:option value="3" label="3个月"/>
             <form:option value="12" label="12个月"/>

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

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