商户

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -104,7 +104,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 			try {
 				if(StringUtils.isNotEmpty(tbLibImTeacherTemp.getSubject())) {
 					String subject=tbLibImTeacherTemp.getSubject();
-					if(StringUtils.isNotEmpty(subject.replaceAll("语文", "").replaceAll("数学", "").replaceAll("英语", "").replaceAll(",", ""))) {
+					if(StringUtils.isNotEmpty(subject.replaceFirst("语文", "").replaceFirst("数学", "").replaceFirst("英语", "").replaceAll(",", ""))) {
 						tbLibImTeacherTemp.setStatus(0);
 						tbLibImTeacherTemp.setErrorReason("填写科目不正确，科目只能包含语文,数学,英语与英文逗号分隔");
 						this.save(tbLibImTeacherTemp);
@@ -440,7 +440,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 				
 				if(StringUtils.isNotEmpty(tbLibImTeacherTemp.getSubject())) {
 					String subject=tbLibImTeacherTemp.getSubject();
-					if(StringUtils.isNotEmpty(subject.replaceAll("语文", "").replaceAll("数学", "").replaceAll("英语", "").replaceAll(",", ""))) {
+					if(StringUtils.isNotEmpty(subject.replaceFirst("语文", "").replaceFirst("数学", "").replaceFirst("英语", "").replaceAll(",", ""))) {
 						tbLibImTeacherTemp.setStatus(0);
 						tbLibImTeacherTemp.setErrorReason("填写科目不正确，科目只能包含语文,数学,英语与英文逗号分隔");
 						this.save(tbLibImTeacherTemp);
@@ -619,6 +619,4 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 		return 0;
 	}
 
-	
-	
 }

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

@@ -188,11 +188,21 @@ dtext{
 			</li>
 			
 			<li>
+				<label>月包数量:1月/5人：<b>*</b></label>
+				<input type="text"  class="dfinput fl" value="0"    autocomplete="off" placeholder=" " />
+			</li>
+			
+			<li>
 				<label>加油包/月包单价：<b>*</b></label>
 				<input type="number" id="plusAmountPrice" class="dfinput fl" name="plusAmountPrice" th:value="${merchant.plusAmountPrice==null ? 0 : merchant.plusAmountPrice}" autocomplete="off" placeholder=" 请输入服务包单价" />
 			</li>
 			
 			<li>
+				<label>数量包数量:5人/月：<b>*</b></label>
+				<input type="text"  class="dfinput fl" value="0"    autocomplete="off" placeholder=" " />
+			</li>
+			
+			<li>
 				<label>加油包/量包单价：<b>*</b></label>
 				<input type="number" id="plusMonthPrice" class="dfinput fl" name="plusMonthPrice" th:value="${merchant.plusMonthPrice==null ? 0 : merchant.plusMonthPrice}" autocomplete="off" placeholder=" 请输入服务包单价" />
 			</li>

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

@@ -161,7 +161,10 @@ dtext{
 				<label>服务包/套餐单价：平台管理费：<b>*</b></label>
 				<input type="number" id="outPrice" class="dfinput fl" name="outPrice" th:value="${merchant.outPrice==null ? 0 : merchant.outPrice}" autocomplete="off" placeholder=" 请输入平台管理费金额" />
 			</li>
-			
+			<li>
+				<label>月包数量:1月/5人：<b></b></label>
+				<input type="text"  class="dfinput fl" value="0"   autocomplete="off" placeholder=" " />
+			</li>
 			<li>
 				<label>服务包/总价（收入）：<b>*</b></label>
 				<input type="number" id="price" class="dfinput fl" name="price" th:value="${merchant.price==null ? 0 : merchant.price}" autocomplete="off" placeholder=" 请输入服务包总价"/>
@@ -173,11 +176,21 @@ dtext{
 			</li>
 			
 			<li>
+				<label>月包数量:1月/5人：<b>*</b></label>
+				<input type="text"  class="dfinput fl" value="0"    autocomplete="off" placeholder=" " />
+			</li>
+			
+			<li>
 				<label>加油包/月包单价：<b>*</b></label>
 				<input type="number" id="plusAmountPrice" class="dfinput fl" name="plusAmountPrice" th:value="${merchant.plusAmountPrice==null ? 0 : merchant.plusAmountPrice}" autocomplete="off" placeholder=" 请输入服务包单价" />
 			</li>
 			
 			<li>
+				<label>数量包数量:5人/月：<b>*</b></label>
+				<input type="text"  class="dfinput fl" value="0"    autocomplete="off" placeholder=" " />
+			</li>
+			
+			<li>
 				<label>加油包/量包单价：<b>*</b></label>
 				<input type="number" id="plusMonthPrice" class="dfinput fl" name="plusMonthPrice" th:value="${merchant.plusMonthPrice==null ? 0 : merchant.plusMonthPrice}" autocomplete="off" placeholder=" 请输入服务包单价" />
 			</li>

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

@@ -43,7 +43,7 @@
 	    color: #666;
 	    margin-right: 30px;
 	    text-align: center;
-	    margin-bottom: 25px;
+	    margin-bottom: 10px;
 	    overflow: hidden;
 	    cursor: pointer;
 	}
@@ -374,7 +374,7 @@
 						)  }
 						">
 							<a href="javascript:;" th:if="${item.signType==0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'joinServiceEdit(\''+${item.id}+'\')'" class="tablelink">塾&nbsp;&nbsp;&nbsp;币</a>
-<!-- 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a> -->
+							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
 							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'mealServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a>
 						
 							<a href="javascript:;" th:if="${item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'updatemerchant(\''+${item.id}+'\',\'4\')'"   class="tablelink">删除</a>
@@ -431,11 +431,60 @@
 	<input type="hidden" id="lib_merchant_id" value="" >
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" class="zwfb_shop_table">
 	      <tbody>
-	      	
+	      	<tr valign="top">
+		        <td align="right" width="70" style="line-height: 50px;font-weight: 700">续费服务包：</td>
+		        <td>
+		        	<ul class="fwmc_xxk">
+		           	<li class="sign_type_select sign_type_select_on"  data-type="5">
+		              <p>服务包1</p>
+		              30人<i>/1月/1000元</i>
+		           	</li>
+		          </ul>
+		        </td>
+	      </tr>
+	      
+	      <tr valign="top">
+  			<td align="right" width="70" style="line-height: 30px;font-weight: 700">总服务月数量：</td>
+  	        <td>
+	        	<ul class="nmb_jj">
+		            <li><i>6月</i></li>
+	          </ul>
+	        </td>
+	      </tr>
 	      <tr>
-	        <td height="20"></td>
+	        <td height="10"></td>
+	        <td></td>
+	      </tr>
+	      <tr valign="top">
+  			<td align="right" width="70" style="line-height: 30px;font-weight: 700">已赠送月数量：</td>
+  	        <td>
+	        	<ul class="nmb_jj">
+		            <li><i>1月</i></li>
+	          </ul>
+	        </td>
+	      </tr>
+	       <tr>
+	        <td height="10"></td>
+	        <td></td>
+	      </tr>
+	      
+	      <tr>
+	        <td height="10"></td>
+	        <td></td>
+	      </tr>
+	      <tr valign="top">
+  			<td align="right" width="70" style="line-height: 30px;font-weight: 700">已购买月数量：</td>
+  	        <td>
+	        	<ul class="nmb_jj">
+		            <li><i>5月</i></li>
+	          </ul>
+	        </td>
+	      </tr>
+	       <tr>
+	        <td height="10"></td>
 	        <td></td>
 	      </tr>
+	      
 	      <tr valign="top">
   			<td align="right" width="70" style="line-height: 30px;font-weight: 700">续费月数量：</td>
   	        <td>
@@ -448,6 +497,7 @@
 	          </ul>
 	        </td>
 	      </tr>
+	      
 	      <tr>
 	        <td height="20"></td>
 	        <td></td>
@@ -477,11 +527,11 @@
 		        	<ul class="fwmc_xxk">
 		            <li class="sign_type_select sign_type_select_on" data-type="4">
 		              <p>加油包-月包</p>
-		              1个月<i>/5人</i>
+		              1个月<i>/5人/1000元</i>
 		           	</li>
 		           	<li class="sign_type_select"  data-type="5">
 		              <p>加油包-数量包</p>
-		              5人<i>/1个月</i>
+		              5人<i>/1月/1000元</i>
 		           	</li>
 		          </ul>
 		        </td>
@@ -735,7 +785,7 @@ function libServiceAdd(id){
 	  			    closeBtn: 1, //不显示关闭按钮
 	  			    shift: 0.8,
 	  			    offset: '150px',
-	  			    area: ['40%', '40%'],
+	  			    area: ['40%', '50%'],
 	  			    content: $("#libServiceAdd")
 	  			 });
 	    	  }else{