解决订单拆单前订单备注错误的问题

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.setSellerenuu(enuu);
 		purchase.setStoreid(orderFromCust.getStoreid());
 		//如果是优软代售的。

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

@@ -41,6 +41,11 @@ define(['app/app'], function(app) {
             });
         };
 
+        $scope.deliveryMethod = {
+			1301 : '第三方配送',
+			1302 : '卖家配送',
+			1303 : '上门自提'
+		};
 
         //选择相应的发票信息
 		$scope.selectBill = function(kind) {
@@ -109,7 +114,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 +125,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

@@ -514,18 +514,19 @@
 						<dd class="oder-remark">
 							<span style="width: 100%">
 								<em>订单备注：</em>
-								<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
+								<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" ng-bind="remarkList[details[0].storeid] || '无'" style="margin-left: 0;"></em>
 							</span>
 						</dd>
 						<dd class="line60">
-							<span class="style01" style="width: 60%;">配送方式：
+							<span class="style01" style="width: 60%; line-height: 40px;">配送方式：
 								<select ng-if="order.status == 501" class="select" ng-switch="order.deliverytype" style="opacity: 1;" >
 									<option ng-switch-when="1301">第三方配送</option>
 									<!--<option ng-switch-when="1301">卖家配送</option>-->
 									<!--<option ng-switch-when="1301">上门自提</option>-->
 									<!--<option ng-switch-when="1302">上门自提</option>-->
 								</select>
-								<em ng-if="order.status != 501">物流配送</em>
+								<em ng-if="order.status != 501" ng-bind="deliveryMethod[order.deliverytype]" style="color: #333;">物流配送</em>
 								<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
 							</span>
 								<span class="total-price">