bugfix

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

@@ -384,7 +384,6 @@ public class    CmDiscernReceipt extends DataEntity<CmDiscernReceipt> {
         this.problem = problem;
     }
 
-    @Length(min = 0, max = 100, message = "非订单款说明(适用协销确认的时候区分订单和非订单款)长度必须介于 0 和 100 之间")
     public String getNoOrderReason() {
         return noOrderReason;
     }

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

@@ -233,7 +233,7 @@
         ,bou.shouHuoRen as receiver,
         bou.mobile,
         bou.name as buyer,
-        co.orderSeen,
+        ifnull(co.orderSeen,1) as orderSeen,
         co.orderSource,
         co.rebateFlag as rebateOrder,
         co.clauseID,

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

@@ -309,7 +309,7 @@
                     <font color="red">待确认</font>
                 </c:if>
                 <c:if test="${order.shopStatus == 1}">
-                    <font color="green">已确认</font>
+                    <font color="green">交易中</font>
                 </c:if>
                 <c:if test="${order.shopStatus == 2}">
                     <font color="green">交易完成</font>