bugfix

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

@@ -66,7 +66,6 @@ public class CmSvipHistoryController extends BaseController {
             mobile = svipHistory.getMobile();
             linkMan = svipHistory.getLinkMan();
             clubName = svipHistory.getClubName();
-
         }
         page.setList(pageResult);
         model.addAttribute("page", page);

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -973,7 +973,6 @@
                                                                        AND op.productID != 999
                                                                      GROUP BY cso.orderID
                                                                  ), 0))
-                                        - IFNULL(co.couponAmount, 0)
                                         - (SELECT IFNULL(SUM(cso.shopOtherFee), 0)
                                            FROM cm_shop_order cso
                                            WHERE cso.orderID = co.orderID)

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

@@ -97,6 +97,7 @@
         <th>购买渠道</th>
         <th>会员状态</th>
         <th>购买时间</th>
+        <th>生效时间</th>
         <th>到期时间</th>
     </tr>
     </thead>
@@ -183,6 +184,7 @@
                 <c:if test="${cmSvipHistory.status eq '3'}"><font color="Orange">暂未生效</font> </c:if>
             </td>
             <td><fmt:formatDate value="${cmSvipHistory.payTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+            <td><fmt:formatDate value="${cmSvipHistory.beginTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
             <td><fmt:formatDate value="${cmSvipHistory.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
         </tr>
     </c:forEach>