优化crm

src/main/java/com/ssj/dao/sys/fx/dao/impl/FxQueryDaoImpl.java

@@ -887,23 +887,23 @@ public class FxQueryDaoImpl implements FxQueryDao {
 		StringBuilder selSql = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
         selSql.append(" SELECT * from (  ");
-        selSql.append(" 	SELECT m.id,m.pos_code,m.unit_name,t.unit_price,t.price,t.buy_month,t.give_month,t.sign_type,t.type,t.lib_service,t.create_time as time,'1' as cap_type from fx_merchant_meal_order t    ");
+        selSql.append(" 	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,t.unit_price,t.price,t.buy_month,t.give_month,t.sign_type,t.type,t.lib_service,t.create_time as time,'1' as cap_type from fx_merchant_meal_order t    ");
         selSql.append("  	LEFT JOIN fx_merchant m ON t.merchant_id=m.id ");
         selSql.append("  UNION ");
-        selSql.append("  	SELECT m.id,m.pos_code,m.unit_name,o.unit_price,o.price,o.buy_month,o.give_month,o.sign_type,o.type,t.lib_service,t.sign_time as time,2 as cap_type from fx_merchant_meal t  ");
+        selSql.append("  	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,o.unit_price,o.price,o.buy_month,o.give_month,o.sign_type,o.type,t.lib_service,t.sign_time as time,2 as cap_type from fx_merchant_meal t  ");
         selSql.append("  	LEFT JOIN fx_merchant m ON t.merchant_id=m.id ");
         selSql.append(" 	LEFT JOIN fx_merchant_meal_order o ON t.order_id=o.id  ");
         selSql.append("  UNION ");
-        selSql.append("  	SELECT m.id,m.pos_code,m.unit_name,0 as price,t.price,0 as buy_month,0 as give_month,0 as sign_type,0 as type,0 as lib_service,t.create_time as time,3 as cap_type from fx_merchant_plat_order t  ");
+        selSql.append("  	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,0 as price,t.price,0 as buy_month,0 as give_month,0 as sign_type,0 as type,0 as lib_service,t.create_time as time,3 as cap_type from fx_merchant_plat_order t  ");
         selSql.append("   	LEFT JOIN fx_merchant m ON t.merchant_id=m.id ");
         selSql.append("  UNION ");
-        selSql.append("   	SELECT m.id,m.pos_code,m.unit_name,0 as price,t.price,0 as buy_month,0 as give_month,0 as sign_type,0 as type,0 as lib_service,t.create_time as time,4 as cap_type from fx_merchant_plat_order t ");
+        selSql.append("   	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,0 as price,t.price,0 as buy_month,0 as give_month,0 as sign_type,0 as type,0 as lib_service,t.create_time as time,4 as cap_type from fx_merchant_plat_order t ");
         selSql.append("  	LEFT JOIN fx_merchant m ON t.merchant_id=m.id ");
         selSql.append("  UNION	");
-        selSql.append(" 	SELECT m.id,m.pos_code,m.unit_name,t.unit_price,0 as price,t.num as buy_month,0 as give_month,0 as sign_type,t.type,t.lib_service,t.create_time as time,'5' as cap_type from fx_merchant_sign_order t 	");
+        selSql.append(" 	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,t.unit_price,0 as price,t.num as buy_month,0 as give_month,0 as sign_type,t.type,t.lib_service,t.create_time as time,'5' as cap_type from fx_merchant_sign_order t 	");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.merchant_id=m.id	");
         selSql.append("  UNION	");
-        selSql.append(" 	SELECT m.id,m.pos_code,m.unit_name,o.unit_price,0 as price,o.num as buy_month,0 as give_month,0 as sign_type,o.type,t.lib_service,t.sign_time as time,'6' as cap_type from fx_merchant_sign t ");
+        selSql.append(" 	SELECT m.id,m.type as merchant_type,m.pos_code,m.unit_name,o.unit_price,0 as price,o.num as buy_month,0 as give_month,0 as sign_type,o.type,t.lib_service,t.sign_time as time,'6' as cap_type from fx_merchant_sign t ");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.merchant_id=m.id ");
         selSql.append(" 	LEFT JOIN fx_merchant_sign_order o ON t.order_id=o.id ");
         selSql.append("  )as tmp  ");
@@ -912,11 +912,14 @@ public class FxQueryDaoImpl implements FxQueryDao {
             selSql.append(" and tmp.id=? ");
             queryParams.add(params.get("merchantId"));
         }
+        if(!"".equals(params.get("merchantType"))){
+            selSql.append(" and tmp.merchant_type=? ");
+            queryParams.add(params.get("merchantType"));
+        }
         if(!"".equals(params.get("endSignTime"))){
             selSql.append(" and TO_DAYS(tmp.time)<=TO_DAYS(?) ");
             queryParams.add(params.get("endSignTime"));
         }
-        
         if(!"".equals(params.get("signTime"))){
             selSql.append(" and TO_DAYS(tmp.time)>=TO_DAYS(?) ");
             queryParams.add(params.get("signTime"));

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

@@ -2857,7 +2857,8 @@ public class FxController  extends BaseController {
 	    		myColumns3.add(new ExcelColumn("套餐单价：平台管理费", "outPrice", 20));
 	    		myColumns3.add(new ExcelColumn("关联机构", "joinName", 20));
 	    		myColumns3.add(new ExcelColumn("签约端口数量", "portNum", 20));
-	    		myColumns3.add(new ExcelColumn("机构塾币", "libService", 20));
+	    		myColumns3.add(new ExcelColumn("服务人数	", "libService_1", 20));
+	    		myColumns3.add(new ExcelColumn("剩余机构塾币", "libService_2", 20));
 	    		
 	    		myColumns3.add(new ExcelColumn("甲方签约人", "signerPerson", 20));
 	    		myColumns3.add(new ExcelColumn("合同编号", "contractNo", 20));
@@ -3083,6 +3084,27 @@ public class FxController  extends BaseController {
 							break;
 						}
 						map.put(key,  str);
+					}else if("posType".equals(key)){
+						String libService_1="";
+						String libService_2="";
+						switch (value!=null ?value.toString():"") {
+						case "1":
+							libService_1="";
+							libService_2=obj.getLibService()+"";
+							break;
+						case "2":
+							libService_1=obj.getLibService()+"";
+							libService_2="";
+							break;
+						case "3":
+							libService_1=obj.getLibService()+"";
+							libService_2="";
+							break;
+						default:
+							break;
+						}
+						map.put("libService_1",  libService_1);
+						map.put("libService_2",  libService_2);
 					}else if("signTime".equals(key)){
 						map.put("signTimeStr",DateHelper.format(obj.getSignTime(), "yyyy-MM-dd"));
 					}else if("endSignTime".equals(key)){
@@ -3153,7 +3175,8 @@ public class FxController  extends BaseController {
 	    		myColumns3.add(new ExcelColumn("套餐单价：平台管理费", "outPrice", 20));
 	    		myColumns3.add(new ExcelColumn("关联机构", "joinName", 20));
 	    		myColumns3.add(new ExcelColumn("签约端口数量", "portNum", 20));
-	    		myColumns3.add(new ExcelColumn("机构塾币", "libService", 20));
+	    		myColumns3.add(new ExcelColumn("服务人数", "libService_1", 20));
+	    		myColumns3.add(new ExcelColumn("剩余机构塾币", "libService_2", 20));
 	    		
 	    		myColumns3.add(new ExcelColumn("甲方签约人", "signerPerson", 20));
 	    		myColumns3.add(new ExcelColumn("合同编号", "contractNo", 20));
@@ -3378,6 +3401,27 @@ public class FxController  extends BaseController {
 						break;
 					}
 					map.put(key,  str);
+				}else if("posType".equals(key)){
+					String libService_1="";
+					String libService_2="";
+					switch (value!=null ?value.toString():"") {
+					case "1":
+						libService_1="";
+						libService_2=obj.getLibService()+"";
+						break;
+					case "2":
+						libService_1=obj.getLibService()+"";
+						libService_2="";
+						break;
+					case "3":
+						libService_1=obj.getLibService()+"";
+						libService_2="";
+						break;
+					default:
+						break;
+					}
+					map.put("libService_1",  libService_1);
+					map.put("libService_2",  libService_2);
 				}else if("signTime".equals(key)){
 					map.put(key,DateHelper.format(obj.getSignTime(), "yyyy-MM-dd"));
 				}else if("endSignTime".equals(key)){
@@ -3651,6 +3695,7 @@ public class FxController  extends BaseController {
 	        Map<String, Object> params = new HashMap<String, Object>();
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
+	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
 	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
 	        
@@ -3747,6 +3792,141 @@ public class FxController  extends BaseController {
  	
  	
  	
+	//服务包订单明细表
+ 	@RequestMapping(value = "/exportMerchantMealList", method = RequestMethod.POST)
+    @ResponseBody
+    public void exportMerchantMealList( HttpServletRequest request, HttpServletResponse response) {  
+    	ServletOutputStream os = null;
+    	try { 
+    		String libName="服务包订单明细列表";
+    		os = response.getOutputStream(); //获得输出流  
+    		response.reset();   //清空输出流  
+    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
+    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
+    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+    		response.setCharacterEncoding("utf-8");
+		
+	        Map<String, Object> params = new HashMap<String, Object>();
+	        params.put("orderId", request.getParameter("orderId")==null?"":request.getParameter("orderId"));
+	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
+
+	        Page<Map<String, Object>> page = merchantMealService.findMerchantMealByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
+
+	        List<Map<String, Object>> mapList=page.getContent();
+	        for (Map<String, Object> map : mapList) {
+	        	switch (map.get("sign_type").toString()) {
+				case "1":
+					map.put("sign_type","服务包1");
+					break;
+				case "2":
+					map.put("sign_type","服务包2");
+					break;
+				case "3":
+					map.put("sign_type","服务包3");
+					break;
+				case "4":
+					map.put("sign_type","服务包4");
+					break;
+				case "5":
+					map.put("sign_type","服务包5");
+					break;
+				default:
+					break;
+				}
+			}
+	        
+	        List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
+    		myColumns3.add(new ExcelColumn("订单编号", "order_id", 20));
+    		myColumns3.add(new ExcelColumn("单位名称", "unit_name", 20));
+    		myColumns3.add(new ExcelColumn("服务包类型", "sign_type", 20));
+    		myColumns3.add(new ExcelColumn("服务包人数", "lib_service", 20));
+    		myColumns3.add(new ExcelColumn("服务开始日期", "sign_time", 20));
+    		myColumns3.add(new ExcelColumn("服务结束日期", "end_sign_time", 20));
+    		myColumns3.add(new ExcelColumn("月单价（成本）", "unit_price", 20));
+    		myColumns3.add(new ExcelColumn("购买时间", "create_time", 20));
+    		
+			CustomizeToExcel.downFile(myColumns3, page.getContent(), os);
+    	}catch (IOException e) {  
+    		e.printStackTrace();  
+    	}catch (Exception e1){
+    		e1.printStackTrace();
+    	}finally{
+    		if(os != null){
+    			try {
+    				os.flush();
+    				os.close(); 
+    			} catch (IOException e) {
+    				e.printStackTrace();
+    			}  
+    		}
+    	}
+    }  
+ 	
+ 	
+ 	
+ 	
+	//服务包订单明细表
+ 	@RequestMapping(value = "/exportMerchantSignList", method = RequestMethod.POST)
+    @ResponseBody
+    public void exportMerchantSignList( HttpServletRequest request, HttpServletResponse response) {  
+    	ServletOutputStream os = null;
+    	try { 
+    		String libName="加油包订单明细列表";
+    		os = response.getOutputStream(); //获得输出流  
+    		response.reset();   //清空输出流  
+    		String fileName = new String(libName.getBytes("gb2312"), "ISO8859-1") +".xlsx";  
+    		response.setHeader("Content-disposition", "attachment; filename="+ fileName); //设定输出文件头  
+    		response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+    		response.setCharacterEncoding("utf-8");
+		
+    		Map<String, Object> params = new HashMap<String, Object>();
+    	    params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
+	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
+	        params.put("orderId", request.getParameter("orderId")==null?"":request.getParameter("orderId"));
+	        
+	        Page<Map<String, Object>> page = merchantSignService.findMerchantSignByPage(params, initPage(1, 10000));
+
+	        List<Map<String, Object>> mapList=page.getContent();
+	        for (Map<String, Object> map : mapList) {
+	        	switch (map.get("type").toString()) {
+				case "1":
+					map.put("type","加油包-月包");
+					break;
+				case "2":
+					map.put("type","加油包-量包");
+					break;
+				default:
+					break;
+				}
+			}
+	        
+	        List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
+    		myColumns3.add(new ExcelColumn("订单编号", "order_id", 20));
+    		myColumns3.add(new ExcelColumn("单位名称", "unit_name", 20));
+    		myColumns3.add(new ExcelColumn("加油包类型", "type", 20));
+    		myColumns3.add(new ExcelColumn("服务包人数", "lib_service", 20));
+    		myColumns3.add(new ExcelColumn("开始日期", "sign_time", 20));
+    		myColumns3.add(new ExcelColumn("结束日期", "end_sign_time", 20));
+    		myColumns3.add(new ExcelColumn("购买时间", "create_time", 20));
+    		
+			CustomizeToExcel.downFile(myColumns3, page.getContent(), os);
+    	}catch (IOException e) {  
+    		e.printStackTrace();  
+    	}catch (Exception e1){
+    		e1.printStackTrace();
+    	}finally{
+    		if(os != null){
+    			try {
+    				os.flush();
+    				os.close(); 
+    			} catch (IOException e) {
+    				e.printStackTrace();
+    			}  
+    		}
+    	}
+    }  
+ 	
+ 	
 	/**
 	 * 
 	 * 
@@ -4091,9 +4271,11 @@ public class FxController  extends BaseController {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
         params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
+        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
         params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
         params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
         
+
         SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());
         sp.setPageNo(pageNo);

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

@@ -163,7 +163,7 @@ dtext{
 				<input type="text"  class="dfinput fl"  id="computeTime" name="computeTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" autocomplete="off" th:value="${#dates.format(merchant.computeTime, 'yyyy-MM-dd')}" placeholder="计费开始日期">
 			</li>
 			
-			<li style="display: none">
+			<li th:style="${ #httpSession.getAttribute('admin') !=null && #lists.contains(#httpSession.getAttribute('admin').authorities,'超级管理员角色')  ? ''   : 'display: none' }">
 				<label>上级渠道：<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" > 

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

@@ -293,8 +293,8 @@
 		    	<th >商户模式 </th>
 		    	<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 style="width: 60px;" >激活开始日期</th>
 		    	<th style="width: 60px;" >激活结束日期</th>
@@ -341,8 +341,8 @@
 					
 					<td  th:text="${item.posType>1 ? item.outPrice: '--' }"></td>
 					<td  th:text="${item.portNum}"></td>
-					<td  th:text="${item.libService}"></td>
-					<td  th:text="${item.platformService}"></td>
+					<td  th:text="${item.posType>1 ? item.libService : '--'}"></td>
+					<td  th:text="${item.posType<=1 ? item.libService  : '--' }"></td>
 					
 					
 					<td th:title="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"  th:text="${item.signTime!=null ?  #dates.format(item.signTime, 'yyyy-MM-dd')+'~'+#dates.format(item.endSignTime, 'yyyy-MM-dd') : '--' }"></td>

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

@@ -177,7 +177,8 @@
 		    	<th >套餐单价：平台管理费</th> 
 		        <th >关联机构</th> 
 		        <th >端口数量</th>
-		        <th >塾币数量</th>  
+		        <th >服务人数</th>  
+		        <th >剩余机构塾币</th>  
 		        <th >甲方签约人</th> 
 		        <th >合同编号</th> 
 		        <th >合同签约时间</th> 
@@ -223,7 +224,8 @@
 					<td th:title="${item.outPrice}" th:text="${item.outPrice}"></td>
 					<td th:title="${item.libJoin!=null ? item.libJoin.leagueName : '' }" th:text="${item.libJoin!=null ? item.libJoin.leagueName : ''}" ></td>
 					<td  th:text="${item.portNum}"></td>
-					<td  th:text="${item.libService}"></td>
+					<td  th:text="${item.posType>1 ? item.libService : '--'}"></td>
+					<td  th:text="${item.posType<=1 ? item.libService  : '--' }"></td>
 					
 					<td  th:text="${item.signerPerson}"></td>
 					<td  th:text="${item.contractNo}"></td>

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

@@ -45,6 +45,19 @@
 		 <label>结束日期：</label>
 		  <input style="width: 150px;" name="endSignTime" type="text" class="scinput"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" th:value="${search.get('endSignTime')}" autocomplete="off"  placeholder="结束日期" />
 	    </li>
+	    
+	     <li>
+		 <label>商户类型</label>
+		 	<select class="scinput select_width" name="merchantType" id="merchantType"   style="width: 150px;" >
+		 	 	<option value="" >全部</option>
+				<option value="5"  th:selected="${search.get('merchantType') eq '5' ? true : false}">直接签约（端口模式）</option>
+				<option value="1"  th:selected="${search.get('merchantType') eq '1' ? true : false}">直接签约（塾币模式）</option>
+				<option value="2"  th:selected="${search.get('merchantType') eq '2' ? true : false}">内部消耗</option>
+				<option value="3"  th:selected="${search.get('merchantType') eq '3' ? true : false}">外部签约</option>
+				<option value="4"  th:selected="${search.get('merchantType') eq '4' ? true : false}">内部不结算（财务）</option>
+			</select>
+	    </li>
+	    
 		<li>
 			<input type="button" class="scbtn" value="查询" />
 		</li>

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

@@ -233,7 +233,7 @@
 			        <td align="right" width="70" style="line-height: 50px;font-weight: 700">购买服务包：</td>
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==1 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="1" data-lib_service="30" data-unit_price="800"  >
+			           	<li  th:class="sign_type_select"  data-type="1" data-lib_service="30" data-unit_price="800"  >
 			              <p>服务包1</p>
 			              	30人<i>/1月</i>
 			           	</li>
@@ -242,7 +242,7 @@
 			        
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==2 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }" data-type="2" data-lib_service="50" data-unit_price="1200" >
+			           	<li th:class="sign_type_select" data-type="2" data-lib_service="50" data-unit_price="1200" >
 			              <p>服务包2</p>
 			              	50人<i>/1月</i>
 			           	</li>
@@ -251,7 +251,7 @@
 			        
 			         <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==3 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="3" data-lib_service="100" data-unit_price="2000" >
+			           	<li th:class="sign_type_select"  data-type="3" data-lib_service="100" data-unit_price="2000" >
 			              <p>服务包3</p>
 			            	100人<i>/1月</i>
 			           	</li>
@@ -265,7 +265,7 @@
 			        <td align="right" width="70" style="line-height: 50px;font-weight: 700"></td>
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==4 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="4" data-lib_service="20" data-unit_price="400" >
+			           	<li th:class="sign_type_select" data-type="4" data-lib_service="20" data-unit_price="400" >
 			              <p>服务包4</p>
 			              	20人<i>/1月</i>
 			           	</li>
@@ -274,7 +274,7 @@
 			        
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==5 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="5" th:data-lib_service="0" data-unit_price="0" >
+			           	<li th:class="sign_type_select"  data-type="5" th:data-lib_service="0" data-unit_price="0" >
 			              <p>服务包5</p>
 			              	自定义<i>/1月</i>
 			           	</li>
@@ -288,7 +288,7 @@
 			        	<ul class="nmb_jj">
 				            <li class="jian" id="1_reduce_num">-</li>
 				            <li>
-				              <input name="" id="1_service_num" type="text" value="" class="srkk" style="width: 50px;">
+				              <input name="" id="1_service_num" type="text" value="0" class="srkk" style="width: 50px;">
 				            </li>
 				            <li class="jia" id="1_add_num">+</li>  
 			          </ul>
@@ -356,7 +356,7 @@
 	  	        <td>
 		        	<ul class="nmb_jj">
 			            <li>
-			              <input name="price" id="price" type="text" th:value="${merchant.price}" class="srkk" style="width: 95px;"><i> 元</i>
+			              <input name="price" id="price" type="text" value="0" class="srkk" style="width: 95px;"><i> 元</i>
 			            </li>
 		          </ul>
 		        </td>
@@ -419,9 +419,7 @@
 <script type="text/javascript">
 	$(function () {
 		
-		$("#1_service_num").val($(".sign_type_select_on").data("lib_service"));
-		$("#unitPrice").val($(".sign_type_select_on").data("unit_price"));
-		
+	
 		$(".sign_type_select").click(function (){
 			$(".sign_type_select").removeClass("sign_type_select_on");
 			$(this).addClass("sign_type_select_on");
@@ -484,6 +482,10 @@
 		if(islock){
 			parent.layer.msg("正在下单中，请勿重复提交...",{icon:2});
 		}
+		if($(".sign_type_select_on").data("type")==undefined){
+			parent.layer.msg("请选择购买的服务包",{icon:11});
+			return;
+		}
 		parent.layer.confirm("确定为此商户购买服务包？", {
 			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 		}, function(){

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

@@ -45,6 +45,11 @@
 		</li>
 	</ul>
 	</form>
+	<ul class="seachform">
+		<li>
+			<input type="button" id="button" class="scbtn" value="导出明细" />
+		</li>
+	</ul>
 	
 	<table class="tablelist">
 		<thead>

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

@@ -233,7 +233,7 @@
 			        <td align="right" width="70" style="line-height: 50px;font-weight: 700">购买服务包：</td>
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==1 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="1" data-lib_service="30" data-unit_price="800" >
+			           	<li class="sign_type_select"   data-type="1" data-lib_service="30" data-unit_price="800" >
 			              <p>服务包1</p>
 			              	30人<i>/1月</i>
 			           	</li>
@@ -242,7 +242,7 @@
 			        
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==2 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }" data-type="2" data-lib_service="50" data-unit_price="1200" >
+			           	<li class="sign_type_select"  data-type="2" data-lib_service="50" data-unit_price="1200" >
 			              <p>服务包2</p>
 			              	50人<i>/1月</i>
 			           	</li>
@@ -251,7 +251,7 @@
 			        
 			         <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==3 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="3" data-lib_service="100" data-unit_price="2000" >
+			           	<li class="sign_type_select"  data-type="3" data-lib_service="100" data-unit_price="2000" >
 			              <p>服务包3</p>
 			            	100人<i>/1月</i>
 			           	</li>
@@ -265,7 +265,7 @@
 			        <td align="right" width="70" style="line-height: 50px;font-weight: 700"></td>
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==4 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="4" data-lib_service="20" data-unit_price="400" >
+			           	<li class="sign_type_select"  data-type="4" data-lib_service="20" data-unit_price="400" >
 			              <p>服务包4</p>
 			              	20人<i>/1月</i>
 			           	</li>
@@ -274,7 +274,7 @@
 			        
 			        <td style="width: 50px;">
 			        	<ul class="fwmc_xxk">
-			           	<li th:class="${merchant.signType==5 ? 'sign_type_select sign_type_select_on' : 'sign_type_select' }"  data-type="5" th:data-lib_service="0" data-unit_price="0">
+			           	<li class="sign_type_select"   data-type="5" th:data-lib_service="0" data-unit_price="0">
 			              <p>服务包5</p>
 			              	自定义<i>/1月</i>
 			           	</li>
@@ -305,7 +305,7 @@
 	  	        <td>
 		        	<ul class="nmb_jj">
 			            <li>
-			              <input style="width: 130px;font-size: 15px;"  id="startActiveTime" name="startActiveTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" th:value="${#dates.format(merchant.activeTime, 'yyyy-MM-dd')}" autocomplete="off"  placeholder="试用开始时间日期" type="text"  class="srkk">
+			              <input style="width: 130px;font-size: 15px;"  id="startActiveTime" name="startActiveTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})"  autocomplete="off"  placeholder="试用开始时间日期" type="text"  class="srkk">
 			            </li>
 		          </ul>
 		        </td>
@@ -320,7 +320,7 @@
 	  	        <td>
 		        	<ul class="nmb_jj">
 			            <li>
-			              <input style="width: 130px;font-size: 15px;" id="endActiveTime" name="endActiveTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" th:value="${#dates.format(merchant.endActiveTime, 'yyyy-MM-dd')}" autocomplete="off"  placeholder="试用开始时间日期" type="text" class="srkk" >
+			              <input style="width: 130px;font-size: 15px;" id="endActiveTime" name="endActiveTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})"  autocomplete="off"  placeholder="试用开始时间日期" type="text" class="srkk" >
 			            </li>
 		          </ul>
 		        </td>
@@ -351,7 +351,7 @@
 	  	        <td>
 		        	<ul class="nmb_jj">
 			            <li>
-			              <input name="price" id="price" type="text" th:value="${merchant.price}" class="srkk" style="width: 115px;"><i> 元</i>
+			              <input name="price" id="price" type="text" value="0" class="srkk" style="width: 115px;"><i> 元</i>
 			            </li>
 		          </ul>
 		        </td>
@@ -415,9 +415,7 @@
 <script type="text/javascript">
 	$(function () {
 			
-		$("#1_service_num").val($(".sign_type_select_on").data("lib_service"));
-		$("#unitPrice").val($(".sign_type_select_on").data("unit_price"));
-		
+
 		$(".sign_type_select").click(function (){
 			$(".sign_type_select").removeClass("sign_type_select_on");
 			$(this).addClass("sign_type_select_on");
@@ -452,6 +450,11 @@
 		if(islock){
 			parent.layer.msg("正在下单中，请勿重复提交...",{icon:2});
 		}
+		
+		if($(".sign_type_select_on").data("type")==undefined){
+			parent.layer.msg("请选择购买的服务包",{icon:11});
+			return;
+		}
 		parent.layer.confirm("确定为此商户购买服务包？", {
 			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 		}, function(){

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

@@ -53,6 +53,11 @@
 		</li>
 	</ul>
 	</form>
+	<ul class="seachform">
+		<li>
+			<input type="button" id="button" class="scbtn" value="导出明细" />
+		</li>
+	</ul>
 	
 	<table class="tablelist">
 		<thead>
@@ -68,7 +73,7 @@
 		</thead>
 		<tbody>
 			<tr th:each="item:${list}" >
-					<td th:text="${item.id}"></td>
+					<td th:text="${item.order_id}"></td>
 					<td th:text="${item.unit_name}"></td>
 					<td  th:switch="${item.type}">
 					   <span th:case="1" style="color:red">加油包-月包</span>