bugfix

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

@@ -35,4 +35,6 @@ public interface CmSvipHistoryDao extends CrudDao<CmSvipHistory> {
     void updateVip(CmSvipHistory cmSvipHistory);
 
     void insertHistory(CmSvipHistory cmSvipHistory);
+
+    String findMonth(String id);
 }

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

@@ -32,6 +32,7 @@ public class CmSvipHistory extends DataEntity<CmSvipHistory> {
     private Date payTime;        // 购买时间
     //jsp页面虚拟字段
     private String status;
+    private String giveMonth;  //赠送套餐的月份数
     private String clubName;
     private String linkMan;
     private String mobile;
@@ -44,6 +45,14 @@ public class CmSvipHistory extends DataEntity<CmSvipHistory> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endEndTime;
 
+    public String getGiveMonth() {
+        return giveMonth;
+    }
+
+    public void setGiveMonth(String giveMonth) {
+        this.giveMonth = giveMonth;
+    }
+
     public Date getUpdateTime() {
         return updateTime;
     }

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

@@ -48,6 +48,9 @@ public class CmSvipHistoryService extends CrudService<CmSvipHistoryDao, CmSvipHi
             if (null != duration && duration.equals(12)) {
                 svipHistory.setPackageId(12);
             }
+            if(0==packageID){
+                svipHistory.setGiveMonth(svipDao.findMonth(svipHistory.getId()));
+            }
             Date beginTime = svipHistory.getBeginTime();
             Date endTime = svipHistory.getEndTime();
             //开始时间<现在

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

@@ -95,6 +95,7 @@
 
     <select id="findHistory" resultType="com.caimei.modules.supervip.entity.CmSvipHistory">
         select
+        cs.id,
         cs.userId,
         cs.packageId,
         u.name as clubName,
@@ -210,5 +211,8 @@
         where userId = #{userId}
           and delflag = 0
     </select>
-
+    <select id="findMonth" resultType="java.lang.String">
+        SELECT TIMESTAMPDIFF(MONTH, cs.beginTime, cs.endTime) FROM cm_svip_history cs
+        where id = #{id}
+    </select>
 </mapper>

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

@@ -108,7 +108,7 @@
                     <c:if test="${cmSvipHistory.packageId eq '12'}">12个月</c:if>
                     <c:if test="${cmSvipHistory.packageId eq '3'}">3个月</c:if>
                     <c:if test="${cmSvipHistory.packageId eq '1'}">1个月</c:if>
-                    <c:if test="${cmSvipHistory.packageId eq '0'}">系统赠送</c:if>
+                    <c:if test="${cmSvipHistory.packageId eq '0'}">${cmSvipHistory.giveMonth}个月</c:if>
             </td>
             <td>
                 <c:if test="${cmSvipHistory.payWay eq '0'}">￥${cmSvipHistory.price}</c:if>
@@ -116,7 +116,7 @@
                 <c:if test="${cmSvipHistory.payWay eq '2'}">￥${cmSvipHistory.price}</c:if>
                 <c:if test="${cmSvipHistory.payWay eq '3'}">￥${cmSvipHistory.price}</c:if>
                 <c:if test="${cmSvipHistory.payWay eq '4'}"><fmt:formatNumber value="${cmSvipHistory.userBeans}" pattern="#" type="number"/>采美豆</c:if>
-                <c:if test="${cmSvipHistory.payWay eq '5'}">系统赠送</c:if>
+                <c:if test="${cmSvipHistory.payWay eq '5'}">-</c:if>
             </td>
             <td>
                 <c:if test="${cmSvipHistory.payWay eq '0'}">未知</c:if>