重构

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

@@ -509,7 +509,32 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
 
 	@Override
 	public Page<Map<String, Object>> balanceConsumeDetailList_New2(Map<String, Object> params, Pageable pageable) {
-		return null;
+		 StringBuilder selSql = new StringBuilder();
+         List<Object> queryParams = new ArrayList<Object>();
+         selSql.append(" SELECT tmp.id,tmp.pos_code,tmp.unit_name,tmp.meal_type,tmp.count_2,tmp.moid,IFNULL(tmo.price,0) as price,tmo.sign_type,? as balance_month  from ( ");
+         selSql.append(" SELECT t.id,t.pos_code,t.unit_name,t.meal_type,  ");
+         selSql.append(" ( ");
+	         selSql.append(" SELECT mo.id from fx_merchant_meal me LEFT JOIN fx_merchant_meal_order mo ON me.order_id=mo.id  ");
+	         selSql.append(" WHERE me.merchant_id=t.id AND me.type>1 AND DATE_FORMAT(me.sign_time,'%Y-%m')=?  ");
+	         selSql.append(" ORDER BY mo.price DESC LIMIT 1 ");
+         selSql.append(" ) as moid,  ");
+         selSql.append(" ( ");
+         selSql.append(" SELECT count(1) from fx_merchant_sign ms WHERE ms.merchant_id=t.id AND DATE_FORMAT(ms.sign_time,'%Y-%m')=? ");
+         selSql.append(" ) as count_2 ");
+         queryParams.add(params.get("startMonth"));
+         queryParams.add(params.get("startMonth"));
+         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)  ");
+         if(!StringUtil.isEmpty(params.get("unitName"))){
+             selSql.append(" AND t.unit_name LIKE concat('%',?,'%') ");
+             queryParams.add(params.get("unitName"));
+         }
+         selSql.append(" ORDER BY FIELD(t.`type`,1,2),t.create_time asc  ");
+         selSql.append(" ) as tmp ");
+         selSql.append(" LEFT JOIN fx_merchant_meal_order tmo ON tmp.moid=tmo.id ");
+         return dao.findPage(selSql.toString(),queryParams.toArray(),pageable);
 	}
 
 	@Override

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

@@ -748,7 +748,7 @@ public class FxQueryDaoImpl implements FxQueryDao {
 	public Page<Map<String, Object>> findMerchantSignOrderByPage(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSql = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSql.append(" SELECT t.*,(t.unit_price * t.num) as price,m.unit_name from fx_merchant_sign_order t  ");
+        selSql.append(" SELECT t.*,(t.unit_price * t.num) as price,m.unit_name,m.type as merchant_type from fx_merchant_sign_order t  ");
         selSql.append(" LEFT JOIN fx_merchant m ON t.merchant_id=m.id  ");
         selSql.append(" where 1=1 ");
         if(!"".equals(params.get("merchantId"))){
@@ -759,6 +759,10 @@ public class FxQueryDaoImpl implements FxQueryDao {
             selSql.append(" and t.type=? ");
             queryParams.add(params.get("type"));
         }
+        if(!"".equals(params.get("merchantType"))){
+            selSql.append(" and m.type=? ");
+            queryParams.add(params.get("merchantType"));
+        }
         if(!"".equals(params.get("endSignTime"))){
             selSql.append(" and TO_DAYS(t.create_time)<=TO_DAYS(?) ");
             queryParams.add(params.get("endSignTime"));
@@ -778,13 +782,17 @@ public class FxQueryDaoImpl implements FxQueryDao {
 	public Page<Map<String, Object>> findMerchantMealOrderPage(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSql = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSql.append(" SELECT t.*,m.unit_name from fx_merchant_meal_order t  ");
+        selSql.append(" SELECT t.*,m.unit_name,m.type as merchant_type from fx_merchant_meal_order t  ");
         selSql.append(" LEFT JOIN fx_merchant m ON t.merchant_id=m.id  ");
         selSql.append(" where 1=1 ");
         if(!"".equals(params.get("merchantId"))){
             selSql.append(" and t.merchant_id=? ");
             queryParams.add(params.get("merchantId"));
         }
+        if(!"".equals(params.get("merchantType"))){
+            selSql.append(" and m.type=? ");
+            queryParams.add(params.get("merchantType"));
+        }
         if(!"".equals(params.get("signType"))){
             selSql.append(" and t.sign_type=? ");
             queryParams.add(params.get("signType"));
@@ -810,7 +818,7 @@ public class FxQueryDaoImpl implements FxQueryDao {
         selSql.append(" SELECT t.*,m.unit_name,o.unit_price from fx_merchant_meal t    ");
         selSql.append(" LEFT JOIN fx_merchant_meal_order o on t.order_id=o.id ");
         selSql.append(" LEFT JOIN fx_merchant m ON t.merchant_id=m.id  ");
-        selSql.append(" where t.status=1 ");
+        selSql.append(" where t.status=1 and t.type>1 ");
         if(!"".equals(params.get("type"))){
             selSql.append(" and t.type=? ");
             queryParams.add(params.get("type"));
@@ -866,18 +874,21 @@ public class FxQueryDaoImpl implements FxQueryDao {
 	public Page<Map<String, Object>> findMerchantPlatOrderByPage(Map<String, Object> params, Pageable initPage) {
 		StringBuilder selSql = new StringBuilder();
         List<Object> queryParams = new ArrayList<Object>();
-        selSql.append(" SELECT t.*,m.unit_name from fx_merchant_plat_order t  ");
+        selSql.append(" SELECT t.*,m.unit_name,m.type as merchant_type from fx_merchant_plat_order t  ");
         selSql.append(" LEFT JOIN fx_merchant m ON t.merchant_id=m.id  ");
         selSql.append(" where 1=1 ");
         if(!"".equals(params.get("merchantId"))){
             selSql.append(" and t.merchant_id=? ");
             queryParams.add(params.get("merchantId"));
         }
+        if(!"".equals(params.get("merchantType"))){
+            selSql.append(" and m.type=? ");
+            queryParams.add(params.get("merchantType"));
+        }
         if(!"".equals(params.get("endSignTime"))){
             selSql.append(" and TO_DAYS(t.create_time)<=TO_DAYS(?) ");
             queryParams.add(params.get("endSignTime"));
         }
-        
         if(!"".equals(params.get("signTime"))){
             selSql.append(" and TO_DAYS(t.create_time)>=TO_DAYS(?) ");
             queryParams.add(params.get("signTime"));
@@ -893,20 +904,20 @@ public class FxQueryDaoImpl implements FxQueryDao {
         selSql.append(" SELECT * from (  ");
         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("  UNION ALL");
         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 where t.status=1 and t.type>1 ");//激活期的流水，不统计到资金流水表
-        selSql.append("  UNION ");
+        selSql.append("  UNION ALL");
         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("  UNION ALL");
         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("  UNION	ALL");
         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("  UNION	ALL");
         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 ");
@@ -928,7 +939,7 @@ public class FxQueryDaoImpl implements FxQueryDao {
             selSql.append(" and TO_DAYS(tmp.time)>=TO_DAYS(?) ");
             queryParams.add(params.get("signTime"));
         }
-        selSql.append(" ORDER BY tmp.time DESC ");
+        selSql.append(" ORDER BY tmp.time DESC,FIELD(tmp.cap_type, 6, 5, 4, 3, 2, 1) ");
         return dao.findPage(selSql.toString(),queryParams.toArray(), initPage);
 	}
 	
@@ -941,20 +952,20 @@ public class FxQueryDaoImpl implements FxQueryDao {
         selSql.append(" 	SELECT t.to_merchant_id as merchant_id,m.pos_code,m.type as merchant_type,m.unit_name,t.lib_service,m.price,t.create_time,1 as cap_type from tb_lib_join_consume t    ");
         selSql.append("  	LEFT JOIN fx_merchant m ON t.to_merchant_id=m.id ");
         selSql.append("  	WHERE m.parent_pos_code='ssj001' AND t.type=1  ");
-        selSql.append("  UNION ");
+        selSql.append("  UNION ALL ");
         selSql.append(" 	SELECT t.from_merchant_id as merchant_id,m.pos_code,m.type as merchant_type,m.unit_name,t.lib_service,m.price,t.create_time,2 as cap_type from tb_lib_join_consume t ");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id ");
         selSql.append(" 	WHERE m.parent_pos_code='ssj001' AND t.type=2 ");
-        selSql.append("	 UNION ");
+        selSql.append("	 UNION ALL ");
         selSql.append(" 	SELECT t.from_merchant_id as merchant_id,pm.pos_code,pm.type as merchant_type,pm.unit_name,t.lib_service,pm.price,t.create_time,3 as cap_type from tb_lib_join_consume t ");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id ");
         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=2 ");
-        selSql.append(" UNION ");
+        selSql.append(" UNION ALL ");
         selSql.append(" 	SELECT t.from_merchant_id as merchant_id,m.pos_code,m.type as merchant_type,m.unit_name,t.lib_service,m.price,t.create_time,4 as cap_type from tb_lib_join_consume t ");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id ");
         selSql.append(" 	WHERE m.parent_pos_code='ssj001' AND t.type=3 ");
-        selSql.append(" UNION ");
+        selSql.append(" UNION ALL ");
         selSql.append(" 	SELECT t.from_merchant_id as merchant_id,pm.pos_code,pm.type as merchant_type,pm.unit_name,t.lib_service,pm.price,t.create_time,5 as cap_type from tb_lib_join_consume t ");
         selSql.append(" 	LEFT JOIN fx_merchant m ON t.from_merchant_id=m.id ");
         selSql.append(" 	LEFT JOIN fx_merchant pm ON m.parent_pos_code=pm.pos_code ");
@@ -990,7 +1001,7 @@ public class FxQueryDaoImpl implements FxQueryDao {
         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,1 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 where t.status=1 and t.type=1 ");//激活期的流水
-        selSql.append("  UNION ");
+        selSql.append("  UNION ALL ");
         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.end_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 where t.status=1 and t.type=1 ");//激活期的流水

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

@@ -1358,6 +1358,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				merchant.setHardwarePrice((double)0);
 				merchant.setOutPrice((double)0);
 				merchant.setCurIsSummary(0);
+				merchant.setStatus(3);
 				
 				merchant.setContractTime(startTime!=null ? DateHelper.parseDate(contractTimeStr, "yyyy-MM-dd") : null);
 				merchant.setSignTime(startTime!=null ? DateHelper.parseDate(startTime, "yyyy-MM-dd"): null);
@@ -1559,6 +1560,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				merchant.setCreateTime(new Date());
 				merchant.setSaleLoginName(curadmin.getLoginName());
 				merchant.setCurIsSummary(0);
+				merchant.setStatus(3);
 				
 				//合同签约时间
 				if(StringUtils.isNotEmpty(contractTimeStr)) {
@@ -1749,6 +1751,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				merchant.setCurIsSummary(0);
 				merchant.setPrice((double) 0);
 				merchant.setOutPrice((double) 0);
+				merchant.setStatus(3);
 				
 				
 				if(StringUtils.isNotEmpty(contractTimeStr)) {

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

@@ -517,18 +517,11 @@ public class FinanceReportController extends BaseController {
         	map.put("sum_price_2", "0");
         	map.put("sum_price_3", "0");
         	
-        	if(map.containsKey("type")) {
-        		if(map.get("type")==null || Integer.parseInt(map.get("type").toString())!=5){
-        			map.put("external_unit_name", map.get("unit_name"));
-        			map.put("unit_name", "");
-        		}
-        	}
-        	
         	map.put("count_1_m", "");
         	map.put("count_2_m", "");
         	
-        	if(map.containsKey("count_1")) {
-        		if(Integer.parseInt(map.get("count_1").toString())>0) {
+        	if(map.containsKey("moid")) {
+        		if(map.get("moid")!=null) {
         			map.put("count_1_m", map.get("balance_month") );
         			map.put("sum_price_1", map.get("price")!=null && StringUtils.isNotEmpty(map.get("price").toString()) ? 
         					new BigDecimal(map.get("price").toString()).doubleValue()*

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

@@ -2976,7 +2976,7 @@ public class FxController  extends BaseController {
 						String str="";
 						switch (value!=null ?value.toString():"") {
 						case "1":
-							str="正常";
+							str="冻结";
 							break;
 						case "2":
 							str="正常";
@@ -2985,7 +2985,7 @@ public class FxController  extends BaseController {
 							str="正常";
 							break;
 						case "4":
-							str="冻结";
+							str="删除";
 							break;
 						default:
 							str="--";
@@ -3293,7 +3293,7 @@ public class FxController  extends BaseController {
 					String str="";
 					switch (value!=null ?value.toString():"") {
 					case "1":
-						str="正常";
+						str="冻结";
 						break;
 					case "2":
 						str="正常";
@@ -3302,7 +3302,7 @@ public class FxController  extends BaseController {
 						str="正常";
 						break;
 					case "4":
-						str="冻结";
+						str="删除";
 						break;
 					default:
 						str="--";
@@ -3479,6 +3479,7 @@ public class FxController  extends BaseController {
 	        params.put("signType", request.getParameter("signType")==null?"":request.getParameter("signType"));
 	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
 	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantMealOrderService.findMerchantMealOrderByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
 	        List<Map<String, Object>> list=page.getContent();
@@ -3518,11 +3519,31 @@ public class FxController  extends BaseController {
 				default:
 					break;
 				}
+				switch (map.get("merchant_type").toString()) {
+				case "1":
+					map.put("merchant_type","直接签约（塾币模式）");
+					break;
+				case "2":
+					map.put("merchant_type","内部消耗");
+					break;
+				case "3":
+					map.put("merchant_type","外部签约");
+					break;
+				case "4":
+					map.put("merchant_type","内部不结算（财务）");
+					break;
+				case "5":
+					map.put("merchant_type","直接签约（端口模式）");
+					break;
+				default:
+					break;
+				}
 			}
 	        
 	        List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
     		myColumns3.add(new ExcelColumn("订单编号", "id", 20));
     		myColumns3.add(new ExcelColumn("商户名称", "unit_name", 20));
+    		myColumns3.add(new ExcelColumn("商户类型", "merchant_type", 20));
     		myColumns3.add(new ExcelColumn("服务包类型", "sign_type", 20));
     		myColumns3.add(new ExcelColumn("服务包人数", "lib_service", 20));
     		myColumns3.add(new ExcelColumn("购买月份", "buy_month", 40));
@@ -3570,10 +3591,11 @@ public class FxController  extends BaseController {
 	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
 	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
 	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantSignOrderService.findMerchantSignOrderByPage(params, initPage(1, 10000));
-	        List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-	        for (Map<String, Object> map : page.getContent()) {
+	        List<Map<String, Object>> list=page.getContent();
+	        for (Map<String, Object> map : list) {
 	        	switch (map.get("type").toString()) {
 				case "1":
 					map.put("type","加油包-月包");
@@ -3584,10 +3606,31 @@ public class FxController  extends BaseController {
 				default:
 					break;
 				}
+	        	
+				switch (map.get("merchant_type").toString()) {
+				case "1":
+					map.put("merchant_type","直接签约（塾币模式）");
+					break;
+				case "2":
+					map.put("merchant_type","内部消耗");
+					break;
+				case "3":
+					map.put("merchant_type","外部签约");
+					break;
+				case "4":
+					map.put("merchant_type","内部不结算（财务）");
+					break;
+				case "5":
+					map.put("merchant_type","直接签约（端口模式）");
+					break;
+				default:
+					break;
+				}
 	     	}
     		List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
     		myColumns3.add(new ExcelColumn("订单号", "id", 20));
     		myColumns3.add(new ExcelColumn("商户名称", "unit_name", 20));
+    		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));
@@ -3634,10 +3677,11 @@ public class FxController  extends BaseController {
 	        params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
 	        params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
 	        params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+	        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
 	        
 	        Page<Map<String, Object>> page = merchantPlatOrderService.findMerchantPlatOrderByPage(params, initPage(1, 10000));
-	        List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-	        for (Map<String, Object> map : page.getContent()) {
+	        List<Map<String, Object>> list=page.getContent();
+	        for (Map<String, Object> map : list) {
 	        	switch (map.get("meal_type").toString()) {
 				case "1":
 					map.put("meal_type","优选套餐");
@@ -3655,10 +3699,31 @@ public class FxController  extends BaseController {
 					map.put("meal_type","--");
 					break;
 				}
+	        	
+				switch (map.get("merchant_type").toString()) {
+				case "1":
+					map.put("merchant_type","直接签约（塾币模式）");
+					break;
+				case "2":
+					map.put("merchant_type","内部消耗");
+					break;
+				case "3":
+					map.put("merchant_type","外部签约");
+					break;
+				case "4":
+					map.put("merchant_type","内部不结算（财务）");
+					break;
+				case "5":
+					map.put("merchant_type","直接签约（端口模式）");
+					break;
+				default:
+					break;
+				}
 	     	}
     		List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
     		myColumns3.add(new ExcelColumn("订单号", "id", 20));
     		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("购买时间", "create_time", 20));
@@ -4123,7 +4188,8 @@ public class FxController  extends BaseController {
 	        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"));
-
+	        params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
+	        
 	        Page<Map<String, Object>> page = merchantMealService.findMerchantMealByPage(params, initPage(1, 10000, Direction.DESC, new String[]{"createTime"}));
 
 	        List<Map<String, Object>> mapList=page.getContent();
@@ -4423,6 +4489,7 @@ public class FxController  extends BaseController {
         params.put("signType", request.getParameter("signType")==null?"":request.getParameter("signType"));
         params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
         params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
         
         SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());
@@ -4529,6 +4596,7 @@ public class FxController  extends BaseController {
         params.put("type", request.getParameter("type")==null?"":request.getParameter("type"));
         params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
         params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
         
         SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());
@@ -4557,6 +4625,7 @@ public class FxController  extends BaseController {
         params.put("merchantId", request.getParameter("merchantId")==null?"":request.getParameter("merchantId"));
         params.put("signTime", request.getParameter("signTime")==null?"":request.getParameter("signTime"));
         params.put("endSignTime", request.getParameter("endSignTime")==null?"":request.getParameter("endSignTime"));
+        params.put("merchantType", request.getParameter("merchantType")==null?"":request.getParameter("merchantType"));
         
         SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());

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

@@ -37,7 +37,7 @@
 	</ul>
 </div>
 <div class="rightinfo">
-	<form id="seachform" th:action="@{/sys/finance/balanceConsumeDetailList_New.html}" method="post">
+	<form id="seachform" th:action="@{/sys/finance/balanceConsumeDetailList_New2.html}" method="post">
 	<ul class="seachform">
 		<li>
 			<label>日期</label>
@@ -45,8 +45,8 @@
 		</li>
 		
 		<li>
-			<label>机构名称</label>
-			<input type="text" id="unitName" name="unitName"   th:value="${search.unitName }" class="scinput " placeholder="输入商户/机构关键字">
+			<label>商户名称</label>
+			<input type="text" id="unitName" name="unitName"   th:value="${search.unitName }" class="scinput " placeholder="输入商户关键字">
 		</li>
 		
 			<li>
@@ -67,15 +67,10 @@
 		    	<th>服务包名称</th>
 		    	
 		    	<th>服务包/月金额</th>
-<!-- 		    	<th>总有效服务数</th> -->
-<!-- 		    	<th>总结束服务数</th> -->
 		    	<th>结算月份</th>
 		    	<th>服务包结算金额</th>
 		    	
-
 		    	<th style="color: red">加油包/月金额</th>
-<!-- 		    	<th style="color: red">加油包/有效服务数</th> -->
-<!-- 		    	<th style="color: red">加油包/结束服务数</th> -->
 		    	<th style="color: red">加油包/结算月份</th>
 		    	<th style="color: red">加油包/结算数</th>
 		    	<th style="color: red">加油包结算金额</th>
@@ -100,18 +95,15 @@
 					   <span th:case="4" >服务包4</span>
 					   <span th:case="5" >服务包5</span>
 					</td>
-					<td th:text="${item.get('count_1')>0 ? item.get('price') : '0' }"></td>
-<!-- 					<td th:text="${item.get('sum_1')}"></td> -->
-<!-- 					<td th:text="${item.get('sum_2')}"></td> -->
-					<td th:text="${item.get('count_1')>0 ? item.get('balance_month') : ''   }"></td>
+					<td th:text="${item.get('price') }"></td>
+					<td th:text="${item.get('moid')!=null ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('sum_price_1')}"></td>
 	
 					<td th:text="${item.get('price_1')}"></td>
-<!-- 					<td th:text="${item.get('sum_3')}"></td> -->
-<!-- 					<td th:text="${item.get('sum_4')}"></td> -->
 					<td th:text="${item.get('count_2')>0 ? item.get('balance_month') : ''   }"></td>
 					<td th:text="${item.get('count_2')>0 ? item.get('count_2') : ''   }"></td>
 					<td th:text="${item.get('sum_price_2')}"></td>
+					
 					<td th:text="${item.get('sum_price_3')}"></td>
 			</tr>
 		</tbody>
@@ -190,7 +182,7 @@
 		document.getElementById("seachform").action = "[[${sysUrl}]]/sys/finance/export6";
 		$("#seachform").submit();
 		window.setTimeout(function(){
-			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/finance/balanceConsumeDetailList_New.html";
+			document.getElementById("seachform").action = "[[${sysUrl}]]/sys/finance/balanceConsumeDetailList_New2.html";
 		},3000);
 	});
 </script>

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

@@ -351,10 +351,10 @@
 					<td  th:text="${item.posType>1 ? #calendars.format(item.computeTime,'yyyy-MM-dd'): '--'}" ></td> 
 					<td  th:text="${item.posType>1 ? #calendars.format(item.endActiveTime,'yyyy-MM-dd'): '--'}" ></td> 
 					<td  th:switch="${item.status}">
-					   <span th:case="1" >正常&nbsp;</span>
+					   <span th:case="1" >冻结&nbsp;</span>
 					   <span th:case="2" >正常&nbsp;</span>
 					   <span th:case="3" >正常&nbsp;</span>
-					   <span th:case="4" >冻结&nbsp;</span>
+					   <span th:case="4" >删除&nbsp;</span>
 					</td>
 					<td  >   
 						<di th:if="
@@ -364,21 +364,21 @@
 							#lists.contains(#httpSession.getAttribute('admin').authorities,'超级管理员角色')  
 						)  }
 						">
-							<a href="javascript:;" th:if="${item.posType==1 && 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.posType==2 && 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.posType==3 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceScAdd(\''+${item.id}+'\')'" class="tablelink">服务包</a>
+							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'platServiceAdd(\''+${item.id}+'\')'" class="tablelink">管理费</a>
+						
+							<a href="javascript:;" th:if="${item.posType==1 && item.status!=1 && (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.posType==2 && item.status!=1 && (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.posType==3 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'libServiceScAdd(\''+${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="'signServiceAdd(\''+${item.id}+'\')'" class="tablelink">加油包</a>
+							<a href="javascript:;" th:if="${item.signType!=0 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'signServiceAdd(\''+${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="'platServiceAdd(\''+${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>
+							<a href="javascript:;" th:if="${item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'updatemerchant(\''+${item.id}+'\',\'1\')'"   class="tablelink">冻结</a>
 							
-							<a href="javascript:;" th:if="${item.posType==1 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchantold(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
-							<a href="javascript:;" th:if="${item.posType==2 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchant(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
-							<a href="javascript:;" th:if="${item.posType==3 && item.status!=4 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchantsc(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
+							<a href="javascript:;" th:if="${item.posType==1 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchantold(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
+							<a href="javascript:;" th:if="${item.posType==2 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchant(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
+							<a href="javascript:;" th:if="${item.posType==3 && item.status!=1 && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'savemerchantsc(\''+${item.id}+'\')'"  	class="tablelink">修改</a>
 						
-							<a href="javascript:;" th:if="${item.status!=4 && item.libId!='' && item.libId!=null && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'untyingmerchant(\''+${item.id}+'\')'"  	class="tablelink">解绑</a>
+							<a href="javascript:;" th:if="${item.libId!='' && item.libId!=null && (curMerchant.orgCode eq 'SSJ-FX' || #strings.contains(item.orgCode,curMerchant.orgCode) ) }"  th:onclick="'untyingmerchant(\''+${item.id}+'\')'"  	class="tablelink">解绑</a>
 						</di>
 						
 					 </td>  
@@ -990,7 +990,7 @@ function joinServiceEdit(id){
 
 		function updatemerchant(id,status){  
 			
-			if(status==4){
+			if(status==1){
 				parent.layer.confirm("确定操作冻结此商户？", {
 					icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 				}, function(){

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

@@ -58,6 +58,18 @@
 		 <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="查询" />
@@ -76,6 +88,7 @@
 		    <tr>
 		        <th>订单编号</th>
 		        <th>商户名称</th>
+		        <th>商户类型</th>
 		    	<th>服务包类型</th>
 		    	<th>服务包人数</th>
 		    	<th>开始激活日期</th>
@@ -94,6 +107,13 @@
 			<tr th:each="item:${list}" >
 					<td th:text="${item.id}"></td>
 					<td th:text="${item.unit_name}"></td>
+					<td th:switch="${item.merchant_type}">
+					   <span th:case="1" >直接签约（塾币模式）</span>
+					   <span th:case="2" >内部消耗</span>
+					   <span th:case="3" >外部签约</span>
+					   <span th:case="4" >内部不结算（财务）</span>
+					   <span th:case="5" >直接签约（端口模式）</span>
+					</td>
 					<td  th:switch="${item.sign_type}">
 					   <span th:case="1" style="color:red">服务包1</span>
 					   <span th:case="2" style="color:red">服务包2</span>

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

@@ -246,11 +246,11 @@
 		      </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>
-			              <input name="price" id="price" type="text" th:value="${merchant.outPrice!=null ? merchant.outPrice : '0' }" 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>
@@ -277,7 +277,7 @@
 	<thead>
 	    <tr>
 	    	<th >订单号</th>
-	    	<th >管理金额</th>
+	    	<th >总价（收入）</th>
 	    	<th >购买时间</th>
 	    </tr> 
 	</thead>

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

@@ -49,6 +49,18 @@
 	    </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>
 	</ul>
@@ -65,8 +77,9 @@
 		    <tr>
 		    	<th>订单号</th>
 		        <th>商户名称</th>
+		        <th>商户类型</th>
 		        <th>套餐类型</th>
-		    	<th>费用金额</th>
+		    	<th>总价（收入）</th>
 		        <th>购买时间</th> 
 		    </tr>
 		</thead>
@@ -74,6 +87,13 @@
 			<tr th:each="item:${list}" >
 					<td th:text="${item.id}"></td>
 					<td th:text="${item.unit_name}"></td>
+					<td th:switch="${item.merchant_type}">
+					   <span th:case="1" >直接签约（塾币模式）</span>
+					   <span th:case="2" >内部消耗</span>
+					   <span th:case="3" >外部签约</span>
+					   <span th:case="4" >内部不结算（财务）</span>
+					   <span th:case="5" >直接签约（端口模式）</span>
+					</td>
 					<td  th:switch="${item.meal_type}">
 					   <span th:case="1" >优选套餐</span>
 					   <span th:case="2" >VIP套餐</span>

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

@@ -55,6 +55,18 @@
 		 <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>
@@ -74,6 +86,7 @@
 		    <tr>
 		    	<th>订单号</th>
 		        <th>商户名称</th>
+		        <th>商户类型</th>
 		    	<th>加油包类型</th>
 		    	<th>购买数量</th>
 		    	<th>加油包单价</th>
@@ -88,6 +101,13 @@
 			<tr th:each="item:${list}" >
 					<td th:text="${item.id}"></td>
 					<td th:text="${item.unit_name}"></td>
+					<td th:switch="${item.merchant_type}">
+					   <span th:case="1" >直接签约（塾币模式）</span>
+					   <span th:case="2" >内部消耗</span>
+					   <span th:case="3" >外部签约</span>
+					   <span th:case="4" >内部不结算（财务）</span>
+					   <span th:case="5" >直接签约（端口模式）</span>
+					</td>
 					<td  th:switch="${item.type}">
 					   <span th:case="1">加油包-月包</span>
 					   <span th:case="2">加油包-量包</span>