校园服务

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

@@ -449,7 +449,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
     //加油的数量
     private static int signLibService=5;
     
-	//套餐模式 【1优选套餐 2VIP套餐 3尊享套餐】 4加油包月包+月 5加油包量包+量。
+	//套餐模式 【1优选套餐 2VIP套餐 3尊享套餐 4校园服务】 4加油包月包+月 5加油包量包+量。
 	//现在暂时只记录加油的记录。
 	@Override
 	public void insertMerchantSignAndSync(String merchantId, Integer signType,Integer num) {

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -599,6 +599,8 @@ public class FinanceReportController extends BaseController {
             				map.put("meal_type", "VIP套餐");
             			}else if(Integer.parseInt(map.get("meal_type").toString())==3){
             				map.put("meal_type", "尊享套餐");
+            			}else if(Integer.parseInt(map.get("meal_type").toString())==4){
+            				map.put("meal_type", "校园服务");
             			}else {
             				map.put("meal_type", "");
             			}

src/main/java/com/ssj/sys/controller/FxController.java

@@ -2207,6 +2207,9 @@ public class FxController  extends BaseController {
 					case "3":
 						str="尊享套餐";
 						break;
+					case "4":
+						str="校园服务";
+						break;
 					default:
 						str="";
 						break;
@@ -2428,6 +2431,9 @@ public class FxController  extends BaseController {
 					case "3":
 						str="尊享套餐";
 						break;
+					case "4":
+						str="校园服务";
+						break;
 					default:
 						str="";
 						break;

src/main/resources/templates/sys/finance/allList6.html

@@ -91,6 +91,7 @@
 					   <span th:case="1" >优选套餐</span>
 					   <span th:case="2" >VIP套餐</span>
 					   <span th:case="3" >尊享套餐</span>
+					   <span th:case="4" >校园服务</span>
 					</td>
 					<td  th:switch="${item.sign_type}">
 					   <span th:case="1" >服务包1</span>

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

@@ -137,6 +137,7 @@ dtext{
 						<option value="1" th:selected="${merchant.mealType==1 ? true : false}">优选套餐</option>
 						<option value="2" th:selected="${merchant.mealType==2 ? true : false}">VIP套餐</option>
 						<option value="3" th:selected="${merchant.mealType==3 ? true : false}">尊享套餐</option>
+						<option value="4" th:selected="${merchant.mealType==4 ? true : false}">校园服务</option>
 					</select>
 				</div>
 			</li>

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

@@ -137,6 +137,7 @@ dtext{
 						<option value="1" th:selected="${merchant.mealType==1 ? true : false}">优选套餐</option>
 						<option value="2" th:selected="${merchant.mealType==2 ? true : false}">VIP套餐</option>
 						<option value="3" th:selected="${merchant.mealType==3 ? true : false}">尊享套餐</option>
+						<option value="4" th:selected="${merchant.mealType==4 ? true : false}">校园服务</option>
 					</select>
 				</div>
 			</li>

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

@@ -224,6 +224,7 @@
 					   <span th:case="1" >优选套餐</span>
 					   <span th:case="2" >VIP套餐</span>
 					   <span th:case="3" >尊享套餐</span>
+					   <span th:case="4" >校园服务</span>
 					   <span th:case="*" style="color:red">旧兼容模式</span>
 					</td>
 					
@@ -565,6 +566,9 @@ function mealServiceAdd(id){
 					case 3:
 						meal_merchant_li1="尊享套餐";
 						break;
+					case 4:
+						meal_merchant_li1="校园服务";
+						break;
 					default:
 						break;
 					}

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

@@ -125,6 +125,7 @@ dtext{
 						<option value="1" th:selected="${merchant.mealType==1 ? true : false}">优选套餐</option>
 						<option value="2" th:selected="${merchant.mealType==2 ? true : false}">VIP套餐</option>
 						<option value="3" th:selected="${merchant.mealType==3 ? true : false}">尊享套餐</option>
+						<option value="4" th:selected="${merchant.mealType==4 ? true : false}">校园服务</option>
 					</select>
 				</div>
 			</li>

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

@@ -202,6 +202,7 @@
 					   <span th:case="1" >优选套餐</span>
 					   <span th:case="2" >VIP套餐</span>
 					   <span th:case="3" >尊享套餐</span>
+					   <span th:case="4" >校园服务</span>
 					   <span th:case="*" style="color:red">旧兼容模式</span>
 					</td>
 					
@@ -374,6 +375,9 @@ function mealServiceAdd(id){
 					case 3:
 						meal_merchant_li1="尊享套餐";
 						break;
+					case 4:
+						meal_merchant_li1="校园服务";
+						break;
 					default:
 						break;
 					}

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

@@ -125,6 +125,7 @@ dtext{
 						<option value="1" th:selected="${merchant.mealType==1 ? true : false}">优选套餐</option>
 						<option value="2" th:selected="${merchant.mealType==2 ? true : false}">VIP套餐</option>
 						<option value="3" th:selected="${merchant.mealType==3 ? true : false}">尊享套餐</option>
+						<option value="4" th:selected="${merchant.mealType==4 ? true : false}">校园服务</option>
 					</select>
 				</div>
 			</li>

src/main/resources/templates/sys/lib/libJoinList.html

@@ -87,7 +87,7 @@
 					<td>
 					  <div>
 						<a th:href="@{/sys/lib/libManagerList.html(libId=${item.id},orgCode=${item.orgCode},libtype=${item.libtype})}" class="tablelink" >图书馆管理员</a>
-						<a th:href="@{/sys/lib/libJoinAdd.html(id=${item.id})}" th:if="${ #httpSession.getAttribute('admin') !=null   && (#httpSession.getAttribute('admin').loginName eq 'admin' || #httpSession.getAttribute('admin').loginName eq 'manting')  } "  class="tablelink">修改</a>
+						<a th:href="@{/sys/lib/libJoinAdd.html(id=${item.id})}" th:if="${ #httpSession.getAttribute('admin') !=null   && (#httpSession.getAttribute('admin').loginName eq 'admin' || #httpSession.getAttribute('admin').loginName eq 'manting' || #httpSession.getAttribute('admin').loginName eq 'sishujia' )  } "  class="tablelink">修改</a>
 						<a href="javascript:;" th:onclick="'createQrById(\''+${item.id}+'\')'" class="tablelink"  th:if="${ #httpSession.getAttribute('admin') !=null  && #httpSession.getAttribute('admin').loginName eq 'admin'   } "  >生成二维码</a>
 						<a th:href="@{/sys/problem/checklist.html(libId=${item.id},type=1)}" th:if="${item.libtype eq 1}" class="tablelink">批量签到</a>
 						<a th:href="@{/sys/problem/checklist.html(libId=${item.id},type=2)}" th:if="${item.libtype eq 1}"  class="tablelink">批量签离</a>