修改申请退款userid取值

充值订单屏蔽修改订单

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -904,6 +904,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 orderProduct.setOrderProductLadderPriceList(ladderPriceList);
                             }
                         }
+                        //充值定金商品
+                        if (6060 == orderProduct.getProductID()) {
+                            newOrder.setRechargeGoods(1);
+                        }
                     });
                     list.addAll(pList);
                     shopOrder.setNewOrderProducts(pList);
@@ -1573,6 +1577,13 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 if (null != newShopOrder) {
                     shopOrder.setFee(newShopOrder.getFee());
                     shopOrder.setShouldPayProduct(newShopOrder.getShouldPayProduct());
+                    List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrderID);
+                    pList.forEach(orderProduct -> {
+                        //充值定金商品
+                        if (6060 == orderProduct.getProductID()) {
+                            order.setRechargeGoods(1);
+                        }
+                    });
                 } else {
                     shopOrder.setFee(0d);
                     shopOrder.setShouldPayProduct(0d);

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -189,7 +189,7 @@
            class="form-horizontal">
 
     <form:hidden path="orderID" value="${order.orderID}"/>
-    <form:hidden path="userID" value="${order.bpOrderUserinfo.userId}"/>
+    <form:hidden path="userID" value="${order.userID}"/>
     <form:hidden path="id" value="${cmReturnedPurchase.id}"/>
     <%--订单收款状态：1待收款，2部分收款，3已收款--%>
     <input type="hidden" id="receiptStatus" value="${order.receiptStatus}"/>

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -1052,7 +1052,7 @@
                             </c:if>
                             <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
-                                <c:if test="${(empty order.rechargeGoods && order.ableUserMoney > 0) || order.status eq 0}">
+                                <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
                                     <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
                                         <a href="${ctx}/order/form?id=${order.orderID}">修改订单${order.rechargeGoods}</a>
                                     </c:if>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -296,7 +296,7 @@
                         </c:if>
                     <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
-                        <c:if test="${(empty order.rechargeGoods && order.ableUserMoney > 0) || order.status eq 0}">
+                        <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
                             <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
                                 <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
                             </c:if>