商户更改服务

订单管理相关改动
服务过期定时任务

src/main/java/com/ssj/dao/weixin/library/dao/ILibVipDao.java

@@ -140,7 +140,7 @@ public interface ILibVipDao extends JpaRepository<LibVip, String> {
 	
 	int countByLibId(String libId);
 	
-	 @Query(nativeQuery = true, value = "update tb_lib_vip set lib_id = null where lib_id = ?1 ")
+	 @Query(nativeQuery = true, value = "update tb_lib_vip set lib_id = null where lib_id = ?1 and not exists (select 1 from tb_lib_vip_service a join tb_lib_order_details b on a.order_details_id = b.id where a.stat=1 and a.species='S003' and a.vip_id = tb_lib_vip.id)")
 	 @Modifying
 	 public void updateLibId(String libId);
 	 

src/main/java/com/ssj/dao/weixin/sales/dao/LibVipServiceDao.java

@@ -337,7 +337,13 @@ public interface LibVipServiceDao extends JpaRepository<LibVipService, String> {
     
     @Query(nativeQuery = true, value = "SELECT * from tb_lib_vip_service t WHERE t.stat=1 AND t.lib_id=?1 AND TO_DAYS(t.create_time)=TO_DAYS(?2) ORDER BY t.create_time DESC ")
     List<LibVipService> findVipServiceByLibAndFrontTime(String libId,Date date);
-      
 
-    
+
+	@Query(nativeQuery = true, value = "update tb_lib_vip_service set stat = 2 where lib_id = ?1 and species='S003' and stat=1 and not exists (select 1 from tb_lib_order_details where tb_lib_order_details.id =tb_lib_vip_service.order_details_id )")
+	@Modifying
+    void updateStatByLibId(String libId);
+
+	@Query(nativeQuery = true, value = "update tb_lib_vip_service set end_time = ?2 where lib_id = ?1 and species='S003' and stat=1 and not exists (select 1 from tb_lib_order_details where tb_lib_order_details.id =tb_lib_vip_service.order_details_id )")
+	@Modifying
+	void updateServiceEndTime(String libId, String endTime);
 }

src/main/java/com/ssj/dao/weixin/sales/dao/impl/LibOrderDetailsQueryDaoImpl.java

@@ -28,11 +28,13 @@ public class LibOrderDetailsQueryDaoImpl  implements LibOrderDetailsQueryDao {
 		
 			 StringBuilder selSQL = new StringBuilder();
 		        List<Object> queryParams = new ArrayList<Object>();
-		        selSQL.append(" SELECT  d.* ,o.transaction_id , t.league_name ,s.type as s_type ,s.`name` ,s.telephone  ,v.parent_name ,v.child_name,v.flow_id    ");
+		selSQL.append(" SELECT    o.transaction_id,d.price ,d.book_price ,d.order_no, d.know ,d.create_time,d.order_status  ,d.details , t.league_name ,    ");
+		selSQL.append(" s.type as s_type ,s.`name` ,s.telephone  ,v.parent_name ,v.child_name ,v.phone  ,v.school ,v.grade ,d.end_time,d.start_time,p.price as p_price,d.number,p.`describe`,p.price*d.number as t_pirce  ");
 		        selSQL.append("  from   tb_lib_order_details d LEFT JOIN tb_orders o ON d.order_id=o.id  join  tb_lib_join  t  on d.lib_id = t.id   ");
 		        selSQL.append("  ");
 		        selSQL.append(" left join  tb_lib_staffing  s  on s.lib_id  =  d.lib_id and  s.user_id =  d.sales_user_id   and  d.staffing_type = s.type and s.stat =1 ");
 		        selSQL.append(" left  join  tb_lib_vip v  on v.id  =  d.vip_id   ");
+				selSQL.append("  left join  tb_lib_sales_price p  on p.id  =  d.sales_price_id   ");
 		        selSQL.append("  where   1=1  ");
 		        
 		        if (searchParams.get("orgCode") != null && !searchParams.get("orgCode").equals("")) {
@@ -69,27 +71,13 @@ public class LibOrderDetailsQueryDaoImpl  implements LibOrderDetailsQueryDao {
 	public List<Map<String, Object>> getOrderDetailByOrgCode(Map<String, Object> searchParams) {
 		StringBuilder selSQL = new StringBuilder();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSQL.append(" SELECT    o.transaction_id,d.price ,d.book_price ,d.order_no, d.know ,date_format(d.create_time, '%Y-%m-%d %H:%i:%s')as create_time  ,d.details , t.league_name ,    ");
-		 selSQL.append(" s.type as s_type ,s.`name` ,s.telephone  ,v.parent_name ,v.child_name ,v.phone  ,v.school ,v.grade ,  date_format(d.end_time, '%Y-%m-%d %H:%i:%s')as end_time  , ");
-		 selSQL.append(" case d.type  WHEN '1' THEN 	'新签' ELSE '续签' END  as d_type ,   ");
-		 selSQL.append("   CASE d.price_species WHEN 'S001' THEN (CASE d.vip_status WHEN '4' THEN '联名卡' WHEN '5' THEN '特色课程'  ELSE '外借书及阅读指导' END)  ");
-		 selSQL.append("  WHEN 'S002' THEN	'荣誉馆长' WHEN 'S003' THEN	'同伴作业督导' WHEN 'S004' THEN	'特色课程' WHEN 'S005' THEN	'注册教师' WHEN 'S005' THEN	'明星教师' ELSE '其他' END  as species ,  ");
-		 selSQL.append("  CASE d.price_type WHEN 'C001' THEN 	'会员卡标准卡年卡' WHEN 'C002' THEN	'会员卡标准卡半年卡'     ");
-		 selSQL.append("   WHEN 'C003' THEN	'会员卡标准卡月卡' WHEN 'C004' THEN	'作业吧月卡'     ");
-		 selSQL.append("  WHEN 'C005' THEN	'VIP专席卡半年卡' WHEN 'C006' THEN	'作业吧年卡'     ");
-		 selSQL.append("  WHEN 'C007' THEN '会员卡周末卡' WHEN 'C008' THEN '长假卡寒假卡'     ");
-		 selSQL.append("  WHEN 'C009' THEN '自然拼读课程L1' WHEN 'C010' THEN '励登幼升小拼音识字班'      ");
-		 selSQL.append("  WHEN 'C011' THEN '励登幼升小数学思维班' WHEN 'C012' THEN '励登幼升小课程全天班'     ");
-		 selSQL.append("  WHEN 'C015' THEN '作业吧季度卡'     ");
-		 selSQL.append("  WHEN 'C016' THEN '自然拼读课程L2'     ");
-		 selSQL.append("  WHEN 'C017' THEN '自然拼读课程L3'     ");
-		 selSQL.append("  WHEN 'C020' THEN '阅读产品收费'     ");
-		 selSQL.append("  ELSE '其他' END  as type  ,       ");
-		 selSQL.append(" case d.libtype  WHEN '1' THEN 	'家庭图书馆' WHEN '2' THEN 	'共享图书馆A' ELSE '共享图书馆B' END  as d_libtype       ");
+		selSQL.append(" SELECT    o.transaction_id,d.price ,d.book_price ,d.order_no, d.know ,d.create_time,d.order_status  ,d.details , t.league_name ,    ");
+		 selSQL.append(" s.type as s_type ,s.`name` ,s.telephone  ,v.parent_name ,v.child_name ,v.phone  ,v.school ,v.grade ,d.end_time,d.start_time,p.price as p_price,d.number,p.`describe`,p.price*d.number as t_pirce  ");
 	        selSQL.append("  from   tb_lib_order_details d LEFT JOIN tb_orders o on d.order_id=o.id  left join  tb_lib_join  t   ");
 	        selSQL.append("  on d.lib_id = t.id  ");
 	        selSQL.append("  left join  tb_lib_staffing  s  on s.lib_id  =  d.lib_id    AND  s.user_id =  d.sales_user_id  and  d.staffing_type = s.type  ");
 	        selSQL.append("  left join  tb_lib_vip v  on v.id  =  d.vip_id   ");
+	        selSQL.append("  left join  tb_lib_sales_price p  on p.id  =  d.sales_price_id   ");
 	        selSQL.append("  where    d.order_status = 1 ");
 	        
 	        if (searchParams.get("orgCode") != null && !searchParams.get("orgCode").equals("")) {

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

@@ -7,6 +7,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
+import com.ssj.service.weixin.library.service.ILibJoinService;
+import com.ssj.service.weixin.library.service.ILibVipService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,10 +53,16 @@ public class MerchantMealServiceImpl extends BaseServiceImpl<MerchantMeal, Strin
 	
 	@Autowired
 	private LibVipServiceService libVipServiceService;
+
+	@Autowired
+	private ILibVipService  vipService;
 	
     @Autowired
     private FxQueryDao queryDao;
 
+    @Autowired
+	private ILibJoinService joinService;
+
 	@Override
 	public PagingAndSortingRepository<MerchantMeal, String> getDao() {
 		return dao;
@@ -364,40 +373,30 @@ public class MerchantMealServiceImpl extends BaseServiceImpl<MerchantMeal, Strin
 				merchantService.save(merchant);
 				
 				//调用openApi接口
+				//20210419 改为这边处理，不调openApi接口处理
 				if(StringUtils.isNotEmpty(merchant.getLibId())) {
 					DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-					libVipServiceService.openApiServiceCRM(
-							3,
-							merchant.getLibId(), 
-							merchant.getSignType(),
-							merchant.getMealType(),
-							merchant.getLibService(),
-							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
-							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
-							merchant.getEndActiveTime()!=null ? format.format(merchant.getEndActiveTime()) : ""
-							);
-				}
-			}
-			break;
-//		case 3://2021-03-16号改为和端口商户一样处理。
-//			
-//			MerchantMealOrder merchantMealOrder=mrchantMealOrderService.getMerchantMealOrderByCurTime(merchantId);
-//
-//			if(merchantMealOrder!=null) {
-//				merchant.setStartActiveTime(merchantMealOrder.getSignTime());
-//				merchant.setActiveTime(merchantMealOrder.getSignTime());
-//				merchant.setEndActiveTime(merchantMealOrder.getEndSignTime());
-//				merchant.setSignType(merchantMealOrder.getSignType());
-//				merchant.setPortNum(merchantMealOrder.getPortNum());
-//				merchant.setLibService(merchantMealOrder.getLibService()+merchantSignService.getMerchantSignByCurLibService(merchantId));
-//				merchantService.save(merchant);
-//				
-//				//调用openApi接口
-//				if(StringUtils.isNotEmpty(merchant.getLibId())) {
-//					DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+					//更新join表
+					TbLibJoin join = joinService.getById(merchant.getLibId());
+					join.setLibService(merchant.getLibService());
+					join.setSignType(merchant.getSignType());
+					join.setSignTime(merchant.getStartActiveTime());
+					join.setEndSignTime(merchant.getEndActiveTime());
+					joinService.save(join);
+					//查询现在馆有学生人数
+					int studentNum = vipService.countByLibId(merchant.getLibId());
+					if(merchant.getLibService()<studentNum){
+						//服务失效 家长自助购买的另外处理
+						libVipServiceService.updateStatByLibId(merchant.getLibId());
+						//解绑馆下所有学生
+						vipService.updateLibId(merchant.getLibId());
+					}else{
+						//更新服务时间
+						libVipServiceService.updateServiceEndTime(merchant.getLibId(),format.format(merchant.getEndActiveTime()));
+					}
 //					libVipServiceService.openApiServiceCRM(
 //							3,
-//							merchant.getLibId(), 
+//							merchant.getLibId(),
 //							merchant.getSignType(),
 //							merchant.getMealType(),
 //							merchant.getLibService(),
@@ -405,14 +404,16 @@ public class MerchantMealServiceImpl extends BaseServiceImpl<MerchantMeal, Strin
 //							merchant.getStartActiveTime()!=null ? format.format(merchant.getStartActiveTime()) : "",
 //							merchant.getEndActiveTime()!=null ? format.format(merchant.getEndActiveTime()) : ""
 //							);
-//				}
-//			}
-//			break;
+				}
+			}
+			break;
+
 		default:
 			break;
 		}
 		
 	}
+
 	
 	//在激活期间，有自动激活的，处理服务包明细数据，删除不需要的激活明细数据，更新所有的服务包明细数据。
 	@Override
@@ -498,7 +499,6 @@ public class MerchantMealServiceImpl extends BaseServiceImpl<MerchantMeal, Strin
 			}
 			this.save(serviceMerchantMeals);
 		}
-		
 		//5:更新商户的结束日期为昨天。
 		merchant.setActiveTime(frontDate);
 		merchantService.save(merchant);

src/main/java/com/ssj/service/weixin/sales/service/LibVipServiceService.java

@@ -647,5 +647,8 @@ public interface LibVipServiceService extends BaseService<LibVipService, String>
 	void insertLibCorrectService(String vipId, String libId);
 	
 	List<LibVipService> findVipServiceByLibAndFrontTime(String libId,Date date);
-	
+
+	void updateStatByLibId(String libId);
+
+	void updateServiceEndTime(String libId, String format);
 }

src/main/java/com/ssj/service/weixin/sales/service/impl/LibVipServiceServiceImpl.java

@@ -1778,6 +1778,7 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 			libVipService.setCreateTime(now);
 			//为校区服务
 			libVipService.setCorrectType(2);
+			libVipService.setOrderDetailsId("2");
 			//排所有服务优先级第3
 			libVipService.setServiceSort(3);
 		}
@@ -1833,9 +1834,11 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 			libVipService.setCorrectType(100);
 			//排所有服务优先级第4
 			libVipService.setServiceSort(1);
+			libVipService.setOrderDetailsId("2");
 			this.save(libVipService);
 		} else {
 			libVipService.setStat(1);
+			libVipService.setOrderDetailsId("2");
 			this.save(libVipService);
 		}
 	}
@@ -1878,9 +1881,11 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
             libVipService.setCorrectType(5);
             //排所有服务优先级第4
             libVipService.setServiceSort(4);
+            libVipService.setOrderDetailsId("2");
             this.save(libVipService);
         } else {
             libVipService.setStat(1);
+			libVipService.setOrderDetailsId("2");
             this.save(libVipService);
         }
     }
@@ -1914,6 +1919,7 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
             libVipService.setCorrectType(2);
             //排所有服务优先级第3
             libVipService.setServiceSort(3);
+            libVipService.setOrderDetailsId("2");
             this.save(libVipService);
         }
         if (expired) {
@@ -1922,6 +1928,7 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
             this.save(libVipService);
         } else {
             libVipService.setStat(1);
+			libVipService.setOrderDetailsId("2");
             this.save(libVipService);
         }
 
@@ -1939,10 +1946,16 @@ public class LibVipServiceServiceImpl extends BaseServiceImpl<LibVipService, Str
 	public List<LibVipService> findVipServiceByLibAndFrontTime(String libId,Date date) {
 		return libVipServiceDao.findVipServiceByLibAndFrontTime(libId,date);
 	}
-	
-	
-	
-	
+
+	@Override
+	public void updateStatByLibId(String libId) {
+		libVipServiceDao.updateStatByLibId(libId);
+	}
+
+	@Override
+	public void updateServiceEndTime(String libId, String endTime) {
+		libVipServiceDao.updateServiceEndTime(libId,endTime);
+	}
 
 
 }

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

@@ -1,5 +1,9 @@
 package com.ssj.sys.controller;
 
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.basic.utils.DateHelper;
@@ -22,6 +26,7 @@ import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.util.HSSFColor;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -210,27 +215,38 @@ public class ReportController extends BaseController {
         		searchParams.put("libId", request.getParameter("libId")==null?"":request.getParameter("libId"));
         		searchParams.put("order_no", request.getParameter("order_no")==null?"":request.getParameter("order_no"));
         		List<Map<String, Object>> list = libOrderDetailsService.getOrderDetailByOrgCode(searchParams); //数据源
-        		List<ExcelColumn> myColumns3 = new ArrayList<ExcelColumn>();
-        		
-           		myColumns3.add(new ExcelColumn("图书馆", "league_name", 20));
-           		myColumns3.add(new ExcelColumn("订单编号", "order_no", 20));
-           		myColumns3.add(new ExcelColumn("微信支付业务单号", "transaction_id", 20));
-           		myColumns3.add(new ExcelColumn("家长姓名", "parent_name", 20));
-           		myColumns3.add(new ExcelColumn("宝宝姓名", "child_name", 20));
-           		myColumns3.add(new ExcelColumn("联系方式", "phone", 20));
-           		myColumns3.add(new ExcelColumn("就读学校", "school", 20));
-           		myColumns3.add(new ExcelColumn("就读年级", "grade", 20));
-           		myColumns3.add(new ExcelColumn("支付时间", "create_time", 20));
-           		myColumns3.add(new ExcelColumn("结束时间", "end_time", 20));
-           		myColumns3.add(new ExcelColumn("产品类型", "species", 20));
-           		myColumns3.add(new ExcelColumn("产品明细", "type", 20));
-//           		myColumns3.add(new ExcelColumn("新签/续费", "d_type", 20));
-           		myColumns3.add(new ExcelColumn("金额", "price", 20));
-//           		myColumns3.add(new ExcelColumn("销售人员姓名", "name", 20));
-           		myColumns3.add(new ExcelColumn("订单来源", "know", 20));
-//           		myColumns3.add(new ExcelColumn("订单模式", "d_libtype", 20));
-           		
-	       		CustomizeToExcel.downFile(myColumns3, list, os);
+        		List<ExcelExportEntity> myColumns3 = new ArrayList<>();
+				myColumns3.add(new ExcelExportEntity("机构", "league_name", 20));
+				myColumns3.add(new ExcelExportEntity("订单编号", "order_no", 20));
+				myColumns3.add(new ExcelExportEntity("微信支付业务单号", "transaction_id", 20));
+				myColumns3.add(new ExcelExportEntity("家长姓名", "parent_name", 20));
+				myColumns3.add(new ExcelExportEntity("宝宝姓名", "child_name", 20));
+				myColumns3.add(new ExcelExportEntity("联系方式", "phone", 20));
+				myColumns3.add(new ExcelExportEntity("就读学校", "school", 20));
+				myColumns3.add(new ExcelExportEntity("就读年级", "grade", 20));
+				ExcelExportEntity ee2 = new ExcelExportEntity("支付时间", "create_time", 20);
+				ee2.setFormat("yyyy-MM-dd HH:mm");
+				myColumns3.add(ee2);
+				myColumns3.add(new ExcelExportEntity("产品类型", "describe", 20));
+				myColumns3.add(new ExcelExportEntity("产品明细", "details", 20));
+				myColumns3.add(new ExcelExportEntity("金额", "price", 20));
+				myColumns3.add(new ExcelExportEntity("订单来源", "know", 20));
+				ExcelExportEntity ee1 = new ExcelExportEntity("订单状态", "order_status", 20);
+				ee1.setReplace(new String[]{"已支付_1","已退款_2","财务手动_3","其他_4"});
+				myColumns3.add(ee1);
+				ExcelExportEntity ee3 = new ExcelExportEntity("产品使用开始日", "start_time", 20);
+				ee3.setFormat("yyyy-MM-dd HH:mm");
+				myColumns3.add(ee3);
+				ExcelExportEntity ee4 = new ExcelExportEntity("产品使用结束日", "end_time", 20);
+				ee4.setFormat("yyyy-MM-dd HH:mm");
+				myColumns3.add(ee4);
+				myColumns3.add(new ExcelExportEntity("产品购买单价", "p_price", 20));
+				myColumns3.add(new ExcelExportEntity("产品购买数量（月份）", "number", 20));
+				myColumns3.add(new ExcelExportEntity("产品总金额", "t_pirce", 20));
+           		//产品使用开始日	产品使用结束日	产品购买单价	产品购买数量（月份）	产品总金额
+				Workbook workbook2 = ExcelExportUtil.exportExcel(new ExportParams("", "", ExcelType.XSSF), myColumns3,
+						list);
+				workbook2.write(os);
            }else{
                    XSSFSheet sheet = workbook.getSheetAt(0);   //读取第一个工作簿  
                    XSSFRow row;  

src/main/java/com/ssj/task/ValidVipCheckTask.java

@@ -0,0 +1,37 @@
+package com.ssj.task;
+
+import com.ssj.framework.core.util.SystemResourceLocator;
+import com.ssj.service.weixin.problem.service.ValidVipService;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+
+@DisallowConcurrentExecution
+@Component
+public class ValidVipCheckTask implements Job {
+
+    private static Logger logger = LoggerFactory.getLogger(ValidVipCheckTask.class);
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) {
+        ValidVipService validVipService =  SystemResourceLocator.getBean(ValidVipService.class);
+        try {
+            logger.info("2c用户服务检测是否失效任务开始");
+            validVipService.checkVipEndTime();
+
+        } catch (Exception e) {
+            logger.error("插入各馆有效会员数量任务异常-->"+e.getMessage());
+        }finally{
+            logger.info("插入各馆有效会员数量开始任务结束");
+        }
+
+
+
+
+    }
+
+}

src/main/java/com/ssj/task/ValidVipTask.java

@@ -25,9 +25,6 @@ public class ValidVipTask implements Job {
             validVipService.saveValidVip();
             validVipService.saveMonthValidVip();
 
-            logger.info("2c用户服务检测是否失效任务开始");
-            validVipService.checkVipEndTime();
-
         } catch (Exception e) {
             logger.error("插入各馆有效会员数量任务异常-->"+e.getMessage());
         }finally{

src/main/resources/templates/sys/error/activityList.html

@@ -41,16 +41,8 @@
 			<label>类型</label>
 			<select name="type" class="scinput select_width">
 				<option value="" th:selected="${ search.get('type')  eq '' }">全部</option>
-				<option value="1" th:selected="${ search.get('type')  eq '1' }">kol</option>
-				<option value="2" th:selected="${ search.get('type')  eq '2' }">电梯框架广告</option>
-				<option value="3" th:selected="${ search.get('type')  eq '3' }">公交车站台广告</option>
-				<option value="4" th:selected="${ search.get('type')  eq '4' }">公众号文章</option>
-				<option value="5" th:selected="${ search.get('type')  eq '5' }">广州线下地推</option>
-				<option value="6" th:selected="${ search.get('type')  eq '6' }">门禁广告</option>
-				<option value="7" th:selected="${ search.get('type')  eq '7' }">朋友圈广告</option>
-				<option value="8" th:selected="${ search.get('type')  eq '8' }">社群广告</option>
-				<option value="9" th:selected="${ search.get('type')  eq '9' }">书店</option>
-				<option value="10" th:selected="${ search.get('type')  eq '10' }">无锡线下地推</option>
+				<option value="1" th:selected="${ search.get('type')  eq '1' }">其他渠道</option>
+				<option value="2" th:selected="${ search.get('type')  eq '2' }">推广</option>
 			</select>
 		</li>
 
@@ -87,16 +79,8 @@
 					<td th:text="${item.get('phone_num')}"  th:title="${item.get('phone_num')}" ></td>
 					<td  th:text="${#calendars.format(item.get('create_time'),'yyyy-MM-dd HH:mm:ss')}" ></td>
 					<td  th:switch="${item.get('type')}" >
-						<span th:case="1">kol</span>
-						<span th:case="2">电梯框架广告</span>
-						<span th:case="3">公交车站台广告</span>
-						<span th:case="4">公众号文章</span>
-						<span th:case="5">广州线下地推</span>
-						<span th:case="6">门禁广告</span>
-						<span th:case="7">朋友圈广告</span>
-						<span th:case="8">社群广告</span>
-						<span th:case="9">书店</span>
-						<span th:case="10">无锡线下地推</span>
+						<span th:case="1">其他渠道</span>
+						<span th:case="2">推广</span>
 					</td>
 				    <td style="width: 60%;" class="c_table">
 						<table style="width: 100%;">

src/main/resources/templates/sys/order/vipOrderList.html

@@ -21,8 +21,8 @@
 <div class="place">
 	<span>位置：</span>
 	<ul class="placeul">
-		<li><a href="#">微信管理</a></li>
-		<li><a href="#">图书馆销售订单管理</a></li>
+		<li><a href="#">财务管理</a></li>
+		<li><a href="#">小塾系统服务费销售订单</a></li>
 	</ul>
 </div>
 <div class="rightinfo">
@@ -90,16 +90,25 @@
 		<thead>
 		    <tr>
 		        <th style="width: 50px;">序号</th>
-		        <th>图书馆</th>
+		        <th>机构</th>
 		        <th>订单编号</th>
 		        <th>微信支付业务单号</th>
 		        <th>家长姓名</th>
 		        <th>宝宝姓名</th>
+		        <th>联系方式</th>
+		        <th>就读学校</th>
+		        <th>就读年级</th>
 		        <th>产品类型</th>
+		        <th>产品明细</th>
 		        <th>金额</th>
-		        <th>购卡时间</th>
+		        <th>支付时间</th>
 		        <th>订单来源</th>
 		        <th>订单状态</th>
+		        <th>使用开始日</th>
+		        <th>使用结束日</th>
+		        <th>单价</th>
+		        <th>数量/月</th>
+		        <th>总金额</th>
 <!-- 		        <th>订单类型</th> -->
 <!-- 		        <th>订单模式</th> -->
 		    </tr>
@@ -112,6 +121,10 @@
 					<td th:text="${item.get('transaction_id')}"></td>
 					<td th:text="${item.get('parent_name')}"></td>
 					<td th:text="${item.get('child_name')}"></td>
+					<td th:text="${item.get('phone')}"></td>
+					<td th:text="${item.get('school')}"></td>
+					<td th:text="${item.get('grade')}"></td>
+					<td th:text="${item.get('describe')}"></td>
 					<td th:text="${item.get('details')}"></td>
 					<td th:text=" ${#strings.contains(item.get('price'),'.00')} ?  ${#numbers.formatDecimal(item.get('price'),1,0)} :  ${#numbers.formatDecimal(item.get('price'),1,2)} " style="color:  red;"></td>
 			        <td  th:text="${#calendars.format(item.get('create_time'),'yyyy-MM-dd HH:mm')}" ></td>
@@ -122,16 +135,11 @@
 					   <span th:case="3" style="color:  red;">财务手动</span>
 					   <span th:case="*">其他</span>
 					</td>
-<!-- 					<td  th:switch="${item.get('type')}"> -->
-<!-- 					   <span th:case="1">新签</span> -->
-<!-- 					   <span th:case="2" style="color:  red;">续签</span> -->
-<!-- 					</td> -->
-<!-- 					<td  th:switch="${item.get('libtype')}"> -->
-<!-- 					   <span th:case="1" style="color:red;">家庭图书馆</span> -->
-<!-- 					   <span th:case="2" style="color:blue;">共享图书馆A</span> -->
-<!-- 					   <span th:case="3" style="color:#750000;">共享图书馆B</span> -->
-<!-- 						<span th:case="4" style="color:#750000;">共享图书馆C</span> -->
-<!-- 					</td> -->
+				<td th:text="${#calendars.format(item.get('start_time'),'yyyy-MM-dd HH:mm')}"></td>
+				<td th:text="${#calendars.format(item.get('end_time'),'yyyy-MM-dd HH:mm')}"></td>
+				<td th:text="${item.get('p_price')}"></td>
+				<td th:text="${item.get('number')}"></td>
+				<td th:text="${item.get('t_pirce')}"></td>
 			</tr>
 		</tbody>
 	</table>