佣金为0置为已收款已付款

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -41,6 +41,12 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
 
     int updatePromotionsRecord(CmPromotion promotion);
 
+    /**
+     * 置为已收款已付款
+     * @param orderId
+     */
+    void updatePayAndReceipt(Integer orderId);
+
     /**
      * 删除此订单下订单促销
      *

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

@@ -2268,5 +2268,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         cmCouponDao.updateClubCoupon(clubCouponId, orderId);
         return true;
     }
+
+    @Transactional(readOnly = false)
+    public void changePay(Integer orderId) {
+        newOrderDao.updatePayAndReceipt(orderId);
+    }
 }
 

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -1400,6 +1400,18 @@ public class NewOrderController extends BaseController {
         return "modules/order/orderClause";
     }
 
+    /**
+     * 置为已收款已付款
+     * @param orderId
+     * @return
+     */
+    @RequiresPermissions("order:order:edit")
+    @RequestMapping("toChangePay")
+    public String changePay(Integer orderId){
+        newOrderService.changePay(orderId);
+        return "modules/order/newOrderList";
+    }
+
     @RequestMapping(value = "saveClause")
     public String saveClause(NewOrder order, RedirectAttributes redirectAttributes, HttpServletRequest request) {
         String clauseContent = request.getParameter("clauseContent");

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -796,6 +796,10 @@
 		where id = #{id}
 	</update>
 
+	<update id="updatePayAndReceipt">
+		update cm_order set payStatus=3, receiptStatus=3 where orderID=#{orderID}
+	</update>
+	
 	<update id="updateOrderStatus">
 		update cm_order set payStatus = #{payStatus} ,zeroCostFlag = #{zeroCostFlag} where orderID = #{orderID}
 	</update>

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

@@ -1112,10 +1112,12 @@
 
 
                     <shiro:hasPermission name="order:order:edit">
-
+                        <%--brokerage佣金等于0判断，这里佣金是虚拟字段--%>
                         <c:if test="${(order.rebateOrder == 1 )}">
-                            <a href="javascript:void(0);"
-                               onclick="money('${order.orderID}')">置为已收款已付款</a>
+                            <c:if test="${(order.brokerage eq 0)}">
+                                <a href="${ctx}/order/toChangePay?id=${order.orderID}"
+                                   onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>
+                            </c:if>
                         </c:if>