修改订单拆单前订单备注不准确的问题

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -84,6 +84,7 @@ import com.uas.search.model.BaseOrder;
 import com.uas.search.model.PageParams;
 import com.uas.search.model.SPage;
 import com.uas.search.service.OrderSearchService;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -753,7 +754,10 @@ public class OrderServiceImpl implements OrderService {
             or.setTransationPrice(NumberUtil.fractionNumCeil(transationPrice, 2));
             or.setCmpQty(uuids.size());
             or.setQty(qty);
-            or.setOrderRemark(remarkMap.getString(storeid));
+            Map<String, String> map = new HashedMap();
+            map.put(storeid, remarkMap.getString(storeid));
+            String orRemark = FastjsonUtils.toJson(map);
+            or.setOrderRemark(orRemark);
 
             StoreIn storeIn = storeInDao.findByUuid(storeid);
             if (storeIn == null) {

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -384,7 +384,8 @@ public class PurchaseServiceImpl implements PurchaseService {
 
 		Purchase purchase = new Purchase();
 		purchase.setCurrency(crName);
-		purchase.setPurchaseRemark(orderFromCust.getOrderRemark());//绑定评论
+		JSONObject object = FastjsonUtils.fromJson(orderFromCust.getOrderRemark(), JSONObject.class);
+		purchase.setPurchaseRemark(object.getString(orderFromCust.getStoreid()));//绑定评论
 		purchase.setSendType(orderFromCust.getDeliverytype());
 		purchase.setSellerenuu(enuu);
 		purchase.setStoreid(orderFromCust.getStoreid());

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -109,7 +109,9 @@ define(['app/app'], function(app) {
 				} else {
 					$scope.order = response;
 					$scope.$$orderDetailsMap = {};
-					$scope.remarkList = {};
+					if ($scope.order.orderRemark){
+						$scope.remarkList = angular.fromJson($scope.order.orderRemark);
+					}
 					if($scope.order.orderDetails.length == 0) {
 						$state.go('buyer_order');
 					}
@@ -118,7 +120,6 @@ define(['app/app'], function(app) {
 							$scope.$$orderDetailsMap[detail.storeName].push(detail);
 						}else {
 							$scope.$$orderDetailsMap[detail.storeName] = [];
-							$scope.remarkList[detail.storeid] = "";
 							$scope.$$orderDetailsMap[detail.storeName].push(detail);
 						}
 					});

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -600,14 +600,14 @@
 								</p>
 							</span>
 							<span style="line-height: 18px;">
-                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.goodsnumber"></textarea>
+                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.goodsnumber" maxlength="20"></textarea>
                         		<div class="text-area" ng-if="order.status!=501">
 									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
 								</div>
 								<!--<em ng-if="order.status!=501" ng-bind="detail.goodsnumber" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
 							</span>
 							<span style="line-height: 18px;">
-                            	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark"></textarea>
+                            	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark" maxlength="200"></textarea>
 								<div class="text-area" ng-if="order.status!=501">
 									<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
 								</div>
@@ -617,8 +617,8 @@
 						<dd class="oder-remark">
 							<span style="width: 100%;">
 								<em style="margin-left: 40px;">订单备注：</em>
-								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
-								<em ng-if="order.status!=501" style="margin-left: 0px">{{order.orderRemark}}</em>
+								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
+								<em ng-if="order.status!=501" style="margin-left: 0px" ng-bind="remarkList[details[0].storeid] || '无'"></em>
 							</span>
 						</dd>
 						<dd class="line60">