商户

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

@@ -1578,7 +1578,7 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 							consume.setType(6);
 							consume.setSignType(merchant.getSignType());
 							consume.setComputeNum(merchant.getCurIsSummary());
-							consume.setRemarks("服务包开通【服务包更改：第"+i+"月】");
+							consume.setRemarks("服务包开通【服务包开通：第"+i+"月】");
 							consume.setCreateTime(new Date());
 							libJoinConsumeService.save(consume);
 						}

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

@@ -150,7 +150,11 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 					consume.setType(10);
 					consume.setComputeNum(merchantSign.getNum());
 					consume.setSignType(merchant.getSignType());
-					consume.setRemarks("加油包激活【加油包激活】");
+					if(merchantSign.getSignType().equals(4)) {
+						consume.setRemarks("加油包开通【新模式月包】");
+					}else {
+						consume.setRemarks("加油包开通【新模式量包】");
+					}
 					consume.setCreateTime(new Date());
 					libJoinConsumeService.save(consume);
 					
@@ -404,7 +408,7 @@ public class MerchantSignServiceImpl extends BaseServiceImpl<MerchantSign, Strin
 			isGTDay=true;
 		}
 
-		String remarks="加油包开通【新模式】";
+		String remarks="加油包开通【新模式月包】";
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(computeTime);
 		switch (signType) {

src/main/java/com/ssj/service/sys/role/service/impl/AdminServiceImpl.java

@@ -198,7 +198,7 @@ public class AdminServiceImpl extends BaseServiceImpl<Admin, String> implements
 				consume.setPlatformService(0);
 				consume.setType(1);
 				consume.setSignType(merchant.getSignType());
-				consume.setRemarks("充值【套餐模式开通】");
+				consume.setRemarks("服务包开通【服务包开通】");
 				consume.setCreateTime(new Date());
 				libJoinConsumeService.save(consume);
 			}

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

@@ -434,7 +434,7 @@ public class FinanceReportController extends BaseController {
         List<Map<String,Object>> list=page.getContent();
         for (Map<String, Object> map : list) {
         	if(map.containsKey("type")) {
-        		if(map.get("type")==null || Integer.parseInt(map.get("type").toString())!=1){
+        		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", "");
         		}
@@ -552,7 +552,7 @@ public class FinanceReportController extends BaseController {
             	map.put("sum_price_3", "0");
             	
             	if(map.containsKey("type")) {
-            		if(map.get("type")==null || Integer.parseInt(map.get("type").toString())!=1){
+            		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", "");
             		}

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

@@ -2643,19 +2643,37 @@ public class FxController  extends BaseController {
 		 	        for (Map<String, Object> map : list) {
 						switch (map.get("type").toString()) {
 							case "1":
-								map.put("type", "充值");
+								map.put("type", "塾币充值【旧模式】");
 								break;
 							case "2":
-								map.put("type", "消费");
+								map.put("type", "塾币消费【旧模式】");
 								break;
 							case "3":
-								map.put("type", "服务扣除的");
+								map.put("type", "服务扣除【旧模式】");
 								break;
 							case "4":
-								map.put("type", "上级分配币");
+								map.put("type", "上级分配币【旧模式】 ");
 								break;
 							case "5":
-								map.put("type", "向下分配币");
+								map.put("type", "向下分配币【旧模式】");
+								break;
+							case "6":
+								map.put("type", "服务包开通【新模式】");
+								break;
+							case "7":
+								map.put("type", "服务包激活【新模式】");
+								break;
+							case "8":
+								map.put("type", "服务包结算【新模式】");
+								break;
+							case "9":
+								map.put("type", "加油包开通【新模式】");
+								break;
+							case "10":
+								map.put("type", "加油包激活【新模式】");
+								break;
+							case "11":
+								map.put("type", "加油包结算【新模式】");
 								break;
 							default:
 								map.put("type", "");