bugfix

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

@@ -267,6 +267,9 @@ public class NewOrderController extends BaseController {
             if (StringUtil.isEmpty(newOrder.getOrderTime())) {
                 newOrder.setOrderTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             }
+            if (null == newOrder.getOrderID()) {
+                newOrder.setOrderSource("4");
+            }
         }
         model.addAttribute("order", newOrder);
         return "modules/order/orderForm";

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

@@ -714,7 +714,7 @@
 		where promotionsId=#{promotionsId} and orderId=#{orderId}
 	</select>
 	<select id="findServiceProviderList" resultType="com.caimei.modules.user.entity.NewCmSp">
-		select serviceProviderID,linkMan1 from serviceprovider where status = 90 and serviceProviderID != 1342
+		select s.serviceProviderID,s.linkMan1 from serviceprovider s join user u on s.userID = u.userID where s.status = 90 and s.serviceProviderID != 1342
 	</select>
 	<insert id="insertPromotionsRecord" parameterType="com.caimei.modules.product.entity.CmPromotion" keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_promotions_order(

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

@@ -722,37 +722,38 @@
                 <form:input path="productName" class="input-large"/>
             </div>
             <div class="item">
-                <label>发货状态：</label>
-                <form:select path="sendOutStatus" class="select-ele input-medium required">
+                <label>订单状态：</label>
+                <form:select path="status" class="select-ele input-medium required">
                     <form:option value="" label="所有"/>
-                    <form:options items="${fns:getDictList('sendOutStatus')}" itemLabel="label" itemValue="value"
+                    <form:options items="${fns:getDictList('order_status')}" itemLabel="label" itemValue="value"
                                   htmlEscape="false"/>
                 </form:select>
             </div>
             <div class="item">
-                <label>付款状态：</label>
-                <form:select path="payStatus" class="select-ele input-medium required">
+                <label>收款状态：</label>
+                <form:select path="receiptStatus" class="select-ele input-medium required">
                     <form:option value="" label="所有"/>
-                    <form:options items="${fns:getDictList('payStatus')}" itemLabel="label" itemValue="value"
+                    <form:options items="${fns:getDictList('receiptStatus')}" itemLabel="label" itemValue="value"
                                   htmlEscape="false"/>
                 </form:select>
             </div>
             <div class="item">
-                <label>订单状态：</label>
-                <form:select path="status" class="select-ele input-medium required">
+                <label>发货状态：</label>
+                <form:select path="sendOutStatus" class="select-ele input-medium required">
                     <form:option value="" label="所有"/>
-                    <form:options items="${fns:getDictList('order_status')}" itemLabel="label" itemValue="value"
+                    <form:options items="${fns:getDictList('sendOutStatus')}" itemLabel="label" itemValue="value"
                                   htmlEscape="false"/>
                 </form:select>
             </div>
             <div class="item">
-                <label>收款状态：</label>
-                <form:select path="receiptStatus" class="select-ele input-medium required">
+                <label>付款状态：</label>
+                <form:select path="payStatus" class="select-ele input-medium required">
                     <form:option value="" label="所有"/>
-                    <form:options items="${fns:getDictList('receiptStatus')}" itemLabel="label" itemValue="value"
+                    <form:options items="${fns:getDictList('payStatus')}" itemLabel="label" itemValue="value"
                                   htmlEscape="false"/>
                 </form:select>
             </div>
+
             <div class="item">
                 <label>退款状态：</label>
                 <form:select path="refundType" class="select-ele input-medium required">

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

@@ -154,13 +154,8 @@
       <tr>
         <td>来源</td>
         <td colspan="3">
-          <form:select id="orderSource" path="orderSource" class="required" disabled="${empty order.orderID || order.status eq 0? false:true}">
-            <form:option value="4" label="客服" />
-            <form:option value="2" label="CRM" />
-            <form:option value="1" label="PC" />
-            <form:option value="5" label="外单" />
-            <form:option value="6" label="小程序" />
-          </form:select>
+          ${order.orderSource eq '4'?'客服':order.orderSource eq 2?'CRM':order.orderSource eq 1?'PC':order.orderSource eq 5?'外单':order.orderSource eq 6?'小程序':''}
+          <form:hidden path="orderSource" />
         </td>
       </tr>
     </table>

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

@@ -563,7 +563,7 @@
                     <td class="buy-num wei-num">${orderProduct.notOutStore}</td>
                     <td>
                         <c:if test="${orderProduct.notOutStore != 0}">
-                            <input  data-key="${orderProduct.orderProductID}" value="0"
+                            <input  data-key="${orderProduct.orderProductID}" value="${orderProduct.notOutStore}"
                                     oninput="this.value=this.value.replace(/\D/g,'').replace(/^0+(?=\d)/,1)" class="input fahuo"
                                     type="text" style="width:80px;margin:10px;"/></td>
                         </c:if>