首页 发现 帮助
登录
caimei365
/
caimei365-manager
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

bugfix

Duan_xu 3 年之前
父节点
79420fac68
当前提交
19fe89f599
共有 4 个文件被更改，包括 16 次插入 和 8 次删除
分列视图 显示文件统计
  1. 7 0
      src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java
  2. 1 1
      src/main/java/com/caimei/modules/order/service/NewShopOrderService.java
  3. 4 3
      src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorList.jsp
  4. 4 4
      src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp

+ 7 - 0
src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java
查看文件 

@@ -77,6 +77,13 @@ public class NewPageFloorController extends BaseController {
 
         return "modules/newhome/newPageFloorList";
 
     }
 
 
+    @RequestMapping(value = {"lists"})
 
+    public String lists(NewPageFloor newPageFloor, HttpServletRequest request, HttpServletResponse response, Model model) {
 
+        Page<NewPageFloor> page = newPageFloorService.findPage(new Page<NewPageFloor>(request, response), newPageFloor);
 
+        model.addAttribute("page", page);
 
+        return "modules/newhome/newPageFloorList";
 
+    }
 
+
 
     @RequiresPermissions("newhome:newPageFloor:view")
 
     @RequestMapping(value = "form")
 
     public String form(NewPageFloor newPageFloor, Model model) {

+ 1 - 1
src/main/java/com/caimei/modules/order/service/NewShopOrderService.java
查看文件 

@@ -292,7 +292,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
 
             } else {
 
                 so.setReceiptStatus("1");
 
             }
 
-            Double receiptTotalFee = cmReceiptOrderRelationDao.findPayFeeByOrderID(so.getOrderID().toString());
 
+            double receiptTotalFee = cmReceiptOrderRelationDao.findPayFeeByOrderID(so.getOrderID().toString());
 
             so.setReceiptTotalFee(receiptTotalFee);
 
 
             //第一次收款收款时间

+ 4 - 3
src/main/webapp/WEB-INF/views/modules/newhome/newPageFloorList.jsp
查看文件 

@@ -10,7 +10,7 @@
 
 	</style>
 
 	<script type="text/javascript">
 
 		$(document).ready(function() {
 
-			
+
 
 		});
 
 		function page(n,s){
 
 			$("#pageNo").val(n);
 
@@ -96,7 +96,8 @@
 
 </head>
 
 <body>
 
 	<ul class="nav nav-tabs">
 
-		<li class="active"><a href="${ctx}/newhome/newPageFloor/">楼层管理列表</a></li>
 
+		<li class="active"><a href="${ctx}/newhome/newPageFloor/">自由楼层管理列表</a></li>
 
+		<li class="active"><a href="${ctx}/newhome/newPageFloor/lists">固定楼层管理列表</a></li>
 
 	</ul>
 
 	<form:form action="" class="breadcrumb form-search">
 
 		<input class="btn btn-primary" style="width: 70px" onclick="batchSaveSort()" value="一键排序"/>&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -169,4 +170,4 @@
 
 	</table>
 
 	<div class="pagination">${page}</div>
 
 </body>
 
-</html>
 
+</html>

+ 4 - 4
src/main/webapp/WEB-INF/views/modules/order/cmPayShopList.jsp
查看文件 

@@ -595,10 +595,10 @@
 
                         <a onclick="applypayWay(${s.shopReceiptStatus},${s.payWay})"  href="${ctx}/shopOrder/toChangePayShopAmount?shopOrderID=${s.shopOrderID}">修改成本</a>
 
                     </shiro:hasPermission>
 
                 </c:if>
 
-                <c:if test="${s.shopReceiptStatus eq 2 && s.payWay eq 1}">
 
-                    <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>
 
-                </c:if>
 
-                <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2'}">
 
+<%--                <c:if test="${s.shopReceiptStatus eq 2 && s.payWay eq 1}">--%>
 
+<%--                    <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>--%>
 
+<%--                </c:if>--%>
 
+                <c:if test="${(s.modifyPayable and s.paying ne '1') || s.payStatus eq '2' || (s.shopReceiptStatus eq 2 && s.payWay eq 1)}">
 
                     <a href="${ctx}/order/cmPayShop/differencePriceForm?shopOrderId=${s.shopOrderID}">供应商差价</a>
 
                 </c:if>
 
                 <c:if test="${s.paying ne '1' and s.payStatus eq '2'}">