转为返佣订单按钮增加限制条件

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

@@ -1225,10 +1225,16 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             //获取订单商品
             List<NewOrderProduct> list = new ArrayList<>();
             List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(newOrder.getOrderID());
+            if (shopOrders.size() > 1) {
+                newOrder.setRechargeGoods(3);
+            }
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
                     pList.forEach(orderProduct -> {
+                        if ("2".equals(orderProduct.getProductCategory())) {
+                            newOrder.setSecondHandOrderFlag("1");
+                        }
                         if (orderProduct.getLadderPriceFlag() == 1) {
                             // 查询订单商品阶梯价格
                             List<OrderProductLadderPrice> ladderPriceList = newOrderProductDao.findladderPriceList(orderProduct.getOrderProductID());

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

@@ -658,7 +658,7 @@
                         <a href="javascript:void(0);"
                            onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                     </c:if>
-                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
+                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">
                         <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
                            onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
                     </c:if>