Merge remote-tracking branch 'origin/master'

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

@@ -28,9 +28,9 @@ public class LibOrderDetailsQueryDaoImpl  implements LibOrderDetailsQueryDao {
 		
 			 StringBuilder selSQL = new StringBuilder();
 		        List<Object> queryParams = new ArrayList<Object>();
-		        selSQL.append(" SELECT  d.* , t.league_name ,s.type as s_type ,s.`name` ,s.telephone  ,v.parent_name ,v.child_name,v.flow_id    ");
-		        selSQL.append("  from   tb_lib_order_details d  join  tb_lib_join  t   ");
-		        selSQL.append("  on d.lib_id = t.id  ");
+		        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("  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("  where   1=1  ");

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

@@ -214,20 +214,21 @@ public class ReportController extends BaseController {
         		
            		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("其他服务", "other_service", 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("新签/续费", "d_type", 20));
            		myColumns3.add(new ExcelColumn("金额", "price", 20));
-           		myColumns3.add(new ExcelColumn("销售人员姓名", "name", 20));
-           		myColumns3.add(new ExcelColumn("订单模式", "d_libtype", 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);
            }else{

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

@@ -33,20 +33,18 @@
 				<label>开始时间</label>
 				<input type="text" id="beginDate" name="beginDate"  onclick="WdatePicker({readOnly:true,maxDate:'#F{$dp.$D(\'endDate\')}'})" th:value="${search.beginDate }" class="scinput date_width " placeholder="开始时间">
 			</li>
-			
-			
 			<li>
 				<label>结束时间</label>
 				<input type="text" id="endDate" name="endDate"  onclick="WdatePicker({minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'%y-%M-%d'})" th:value="${search.endDate }" class="scinput date_width" placeholder="结束时间">
 			</li>
 			<li>
-			 <label>订单编号</label>
+			<label>订单编号</label>
 			  <input name="order_no" type="text" class="scinput" th:value="${search.get('order_no')}"/>
 		    </li>
-			<li>
+			<li style="display: none">
 				<label>订单模式</label>
 					<select class="scinput select_width"  name="libtype"   style="width: 160px;" >
-						<option value=""   >全部</option>
+						<option value="" >全部</option>
 						<option value="1">家庭图书馆</option>
 						<option value="2">共享图书馆A</option>
 						<option value="3">共享图书馆B</option>
@@ -69,23 +67,23 @@
 	</ul>
 	<ul class="seachform" style="margin-left:60px;">
 	  <li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }">
-			<input type="button" id="button" style="width: 100px;" class="scbtnbution" value="订单明细" />
+			<input type="button" id="button" style="width: 100px;" class="scbtnbution" value="导出订单明细" />
 		</li>
 		<!-- <li th:if="${ #httpSession.getAttribute('admin') !=null  &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW') }">
 			<input type="button" id="detailbutton" style="width: 120px;" class="scbtnbution" value="各馆月度销售" />
 		</li> -->
-		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }">
-			<input type="button" id="ybbutton" style="width: 120px;" class="scbtnbution" value="财务月报" />
-		</li>
-		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }">
-			<input type="button" id="gxbuttonA" style="width: 120px;" class="scbtnbution" value="共享模式A" />
-		</li>
-		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }">
-			<input type="button" id="gxbuttonB" style="width: 120px;" class="scbtnbution" value="共享模式B" />
-		</li>
-		<li th:if="${ #httpSession.getAttribute('admin') !=null    &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW') }">
-			<input type="button" id="zbbutton" style="width: 120px;" class="scbtnbution" value="人员月度销售" />
-		</li>
+<!-- 		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }"> -->
+<!-- 			<input type="button" id="ybbutton" style="width: 120px;" class="scbtnbution" value="财务月报" /> -->
+<!-- 		</li> -->
+<!-- 		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }"> -->
+<!-- 			<input type="button" id="gxbuttonA" style="width: 120px;" class="scbtnbution" value="共享模式A" /> -->
+<!-- 		</li> -->
+<!-- 		<li th:if="${ #httpSession.getAttribute('admin') !=null   &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW')  }"> -->
+<!-- 			<input type="button" id="gxbuttonB" style="width: 120px;" class="scbtnbution" value="共享模式B" /> -->
+<!-- 		</li> -->
+<!-- 		<li th:if="${ #httpSession.getAttribute('admin') !=null    &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW') }"> -->
+<!-- 			<input type="button" id="zbbutton" style="width: 120px;" class="scbtnbution" value="人员月度销售" /> -->
+<!-- 		</li> -->
 	</ul>
 	</form>
 	<table class="tablelist">
@@ -94,6 +92,7 @@
 		        <th style="width: 50px;">序号</th>
 		        <th>图书馆</th>
 		        <th>订单编号</th>
+		        <th>微信支付业务单号</th>
 		        <th>家长姓名</th>
 		        <th>宝宝姓名</th>
 		        <th>产品类型</th>
@@ -101,8 +100,8 @@
 		        <th>购卡时间</th>
 		        <th>订单来源</th>
 		        <th>订单状态</th>
-		        <th>订单类型</th>
-		        <th>订单模式</th>
+<!-- 		        <th>订单类型</th> -->
+<!-- 		        <th>订单模式</th> -->
 		    </tr>
 		</thead>
 		<tbody>
@@ -110,6 +109,7 @@
 				<td th:text="${itemStat.count}" ></td>
 					<td th:text="${item.get('league_name')}"></td>
 					<td th:text="${item.get('order_no')}"></td>
+					<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('details')}"></td>
@@ -122,16 +122,16 @@
 					   <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: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> -->
 			</tr>
 		</tbody>
 	</table>