佣金为0置为已收已付修改

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

@@ -1007,7 +1007,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         List<Integer> l = new ArrayList<>();
         l.add(newOrder.getOrderID());
         List<Integer> orderIds = cmDiscernReceiptDao.findRebateOrderID(l);
-        if (orderIds.contains(newOrder.getOrderID()))
+        if (orderIds.contains(newOrder.getOrderID()) || "1".equals(newOrder.getRebateFlag()))
             newOrder.setRebateOrder("1");
         else
             newOrder.setRebateOrder("0");

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

@@ -368,7 +368,7 @@
                 </shiro:hasPermission>
 
                 <shiro:hasPermission name="order:order:edit">
-                    <c:if test="${(order.rebateOrder == 1 ) && (order.brokerage == 0) && (order.status != 0)}">
+                    <c:if test="${(order.rebateOrder == '1' ) && (brokerage == 0) && (order.status != 0)}">
                         <a href="${ctx}/order/toChangePay?orderId=${order.orderID}"
                            onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>
                     </c:if>