修改订单限制

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -54,15 +54,11 @@ public class NewOrder extends DataEntity<NewOrder> {
     private Integer buyUserID;//            下单人
     private String orderType;//      char(2) comment '订单类型 协销订单0 普通订单1',
     private List<NewShopOrder> newShopOrders;
-    //    private List<OrderStages> orderStages = Lists.newArrayList();//分期信息
     private OrderUserInfo bpOrderUserinfo; //订单用户信息表
     private OrderInvoice orderInvoice;
-    //    private String stagesFlag;// 是否是分期订单 分期标志0否 1是
-//    private String stagesRemarks;// 分期备注
     private Integer productCount;        // 商品总数
     private Integer presentCount;        // 赠送总数
     private Integer promotionalGiftsCount; // INT(11) NULL   COMMENT '促销赠品总数' AFTER `presentCount
-    //    private String contractId;		// 采购ID
     private String payTime; //订单支付时间
     private String payFlag;//是否已支付 未支付0 已支付1
     private String onlinePayFlag;//能否显示支付 ：0 能线上 1 线下
@@ -132,6 +128,7 @@ public class NewOrder extends DataEntity<NewOrder> {
     private String affirmPaymentFlag;// 二手订单确认付款供应商标识 0未确认，1已确认
     private String rebateFlag;//返佣订单标识，0非返佣订单，1返佣订单
     private String associationType;//订单关联方式: 1手动 2自动
+    private Double ableUserMoney; //当前下单用户可用余额
 
     public List<CmPromotion> getPromotions() {
         return promotions;
@@ -987,5 +984,13 @@ public class NewOrder extends DataEntity<NewOrder> {
     public void setProductName(String productName) {
         this.productName = productName;
     }
+
+    public Double getAbleUserMoney() {
+        return ableUserMoney;
+    }
+
+    public void setAbleUserMoney(Double ableUserMoney) {
+        this.ableUserMoney = ableUserMoney;
+    }
 }
 

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

@@ -1527,6 +1527,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             orderIdsInApplyReturn = cmReturnedPurchaseDao.findOrderIDsInApplyReturnFlag(oId);
         }
         for (NewOrder order : results) {
+            CmUser user = cmUserDao.get(order.getUserID().toString());
+            Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
+            order.setAbleUserMoney(ableUserMoney);
             if ((orderIds != null && orderIds.contains(order.getOrderID())) || "1".equals(order.getRebateFlag())) {
                 order.setRebateOrder("1");
             } else {
@@ -1917,6 +1920,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
 
     /**
      * 获取上线协销人员，排除采美默认协销经理
+     *
      * @return NewCmSp
      */
     public List<NewCmSp> findServiceProviderList() {

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

@@ -92,6 +92,7 @@
         co.orderID AS orderID,
         co.orderNo AS orderNo,
 		co.organizeID AS organizeID,
+		co.userID AS userID,
         co.orderType AS orderType,
         co.secondHandOrderFlag AS secondHandOrderFlag,
 		co.onlinePayFlag AS onlinePayFlag,

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

@@ -1051,9 +1051,9 @@
                             </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="${!order.rechargeGoods || 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>
+                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单${order.rechargeGoods}</a>
                                     </c:if>
                                     <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
                                         <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>