商户

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantServiceImpl.java

@@ -1640,6 +1640,9 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				}
 				if(StringUtils.isNotEmpty(activeTimeStr)) {
 					merchant.setActiveTime(DateHelper.parseDate(activeTimeStr, "yyyy-MM-dd"));
+					
+					merchant.setCurSummaryTime(DateHelper.parseDate(activeTimeStr, "yyyy-MM-dd"));
+					merchant.setNextSummaryTime(DateHelper.getMonthDate(merchant.getCurSummaryTime(),1));
 				}
 				if(StringUtils.isNotEmpty(computeTimeStr)) {
 					merchant.setComputeTime(DateHelper.parseDate(computeTimeStr, "yyyy-MM-dd"));

src/main/resources/templates/sys/fx/merchantAllList.html

@@ -190,7 +190,7 @@
 		    	<th >商户模式 </th>
 		    	<th style="width: 60px;">签约端口数量</th>
 		    	<th style="width: 60px;">服务人数/塾币</th>
-		    	<th style="width: 60px;">旧转新余币</th>
+<!-- 		    	<th style="width: 60px;">旧转新余币</th> -->
 		    	<th style="width: 60px;">平台塾币</th>
 		    	<th style="max-width: 160px;" >合同日期</th>
 		    	<th>充值/已结算(月份)</th>
@@ -240,7 +240,7 @@
 					
 					<td  th:text="${item.portNum}"></td>
 					<td  th:text="${item.libService}"></td>
-					<td  th:text="${item.libServiceOdd}"></td>
+<!-- 					<td  th:text="${item.libServiceOdd}"></td> -->
 					<td  th:text="${item.platformService}"></td>