重构

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

@@ -526,7 +526,7 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
          queryParams.add(params.get("startMonth"));
     
          selSql.append(" from fx_merchant t ");
-         selSql.append(" WHERE t.`status`!=4 and t.sign_type>=1 and t.type in (1,2,5)   ");
+         selSql.append(" WHERE t.`status`!=4 and t.sign_type>=1 and t.type in (5)   ");
          if(!StringUtil.isEmpty(params.get("merchantId"))){
              selSql.append(" AND t.id=? ");
              queryParams.add(params.get("merchantId"));

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

@@ -922,15 +922,11 @@ public class FxQueryDaoImpl implements FxQueryDao {
         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  ");
-        selSql.append("  WHERE tmp.time<=NOW()  ");
+        selSql.append("  WHERE tmp.time<=NOW() and tmp.merchant_type=5  ");
         if(!"".equals(params.get("merchantId"))){
             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"));
@@ -971,15 +967,12 @@ public class FxQueryDaoImpl implements FxQueryDao {
         selSql.append(" 	LEFT JOIN fx_merchant pm ON m.parent_pos_code=pm.pos_code ");
         selSql.append(" 	WHERE pm.parent_pos_code='ssj001' AND t.type=3 ");
         selSql.append("  )as tmp  ");
-        selSql.append("  WHERE  1=1 ");
+        selSql.append("  WHERE  1=1 and tmp.merchant_type=1 ");
         if(!"".equals(params.get("merchantId"))){
             selSql.append(" and tmp.merchant_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("endCreateTime"))){
             selSql.append(" and TO_DAYS(tmp.create_time)<=TO_DAYS(?) ");
             queryParams.add(params.get("endCreateTime"));

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

@@ -3633,8 +3633,8 @@ public class FxController  extends BaseController {
     		myColumns3.add(new ExcelColumn("商户类型", "merchant_type", 20));
     		myColumns3.add(new ExcelColumn("加油包类型", "type", 20));
     		myColumns3.add(new ExcelColumn("购买数量", "num", 20));
-    		myColumns3.add(new ExcelColumn("加油包单价", "unit_price", 20));
-    		myColumns3.add(new ExcelColumn("购买总价", "price", 20));
+    		myColumns3.add(new ExcelColumn("成本价", "unit_price", 20));
+    		myColumns3.add(new ExcelColumn("收入总价", "price", 20));
     		myColumns3.add(new ExcelColumn("服务总人数", "lib_service", 20));
     		myColumns3.add(new ExcelColumn("激活时间", "sign_time", 20));
     		myColumns3.add(new ExcelColumn("购买时间", "create_time", 20));
@@ -3725,7 +3725,7 @@ public class FxController  extends BaseController {
     		myColumns3.add(new ExcelColumn("商户名称", "unit_name", 20));
     		myColumns3.add(new ExcelColumn("商户类型", "merchant_type", 20));
     		myColumns3.add(new ExcelColumn("套餐类型", "meal_type", 20));
-    		myColumns3.add(new ExcelColumn("费用金额", "price", 20));
+    		myColumns3.add(new ExcelColumn("总价（收入）", "price", 20));
     		myColumns3.add(new ExcelColumn("购买时间", "create_time", 20));
     		
 			CustomizeToExcel.downFile(myColumns3, list, os);

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

@@ -101,7 +101,7 @@
 					   <span th:case="4" >服务包4</span>
 					   <span th:case="5" >服务包5</span>
 					</td>
-					<td th:text="${item.get('price') }"></td>
+					<td th:text="${item.get('moid')!=null ? item.get('price') : '0' }"></td>
 					<td th:text="${item.get('moid')!=null ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('sum_price_1')}"></td>
 	

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

@@ -48,17 +48,17 @@
 		  <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> -->
+<!-- 		 <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="查询" />

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

@@ -48,17 +48,17 @@
 		  <input style="width: 150px;" name="endCreateTime" type="text" class="scinput"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" th:value="${search.get('endCreateTime')}" 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> -->
+<!-- 		 <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="查询" />

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

@@ -281,7 +281,7 @@
 		      </tr>
 		      
 		     <tr valign="top">
-	  			<td align="right" width="70" style="line-height: 30px;font-weight: 700">加油包单价：</td>
+	  			<td align="right" width="70" style="line-height: 30px;font-weight: 700">成本价：</td>
 	  	        <td>
 		        	<ul class="nmb_jj">
 			            <li>
@@ -316,7 +316,7 @@
 	    	<th >购买数量</th>
 	    	<th >服务人数</th>
 	    	<th >激活日期 </th>
-	    	<th >服务包单价</th>
+	    	<th >成本价</th>
 	    	<th >购买时间</th>
 	    </tr> 
 	</thead>

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

@@ -89,8 +89,8 @@
 		        <th>商户类型</th>
 		    	<th>加油包类型</th>
 		    	<th>购买数量</th>
-		    	<th>加油包单价</th>
-		    	<th>购买总价</th>
+		    	<th>成本价</th>
+		    	<th>收入总价</th>
 		        <th>服务总人数</th>
 		        <th>激活时间</th>
 		        <th>购买时间</th>