修复超级后台显示问题和购物车排序问题

src/main/java/com/uas/platform/b2c/trade/presale/service/impl/CartServiceImpl.java

@@ -396,8 +396,9 @@ public class CartServiceImpl implements CartService {
 
 		Map<String, Object> map = new HashMap<String, Object>();
 		Map<String, List<Cart>> contentMap = new HashMap<>();
-		info.sorting("storeUuid", Sort.Direction.DESC);
-		info.sorting("id", Sort.Direction.DESC);
+//		info.sorting("storeUuid", Sort.Direction.DESC);
+//		info.sorting("id", Sort.Direction.DESC);
+		info.sorting(Sort.Direction.DESC, "storeUuid", "id");
 		// 获取当前页的购物车记录信息
 		Page<Cart> carts = cartDao.findAll(new Specification<Cart>() {
 			@Override

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -337,8 +337,9 @@
 		<div class="row-fluid" ng-if="orderDetailInfo.proofingid == null">
 			<div class="col-md-3">
 				<span>送货方式：</span>
-				<span ng-if="orderDetailInfo.deliverytype == '1301'">物流配送</span>
-				<span ng-if="orderDetailInfo.deliverytype == '1302'">上门自取</span>	
+				<span ng-if="orderDetailInfo.deliverytype == '1301'">第三方配送</span>
+				<span ng-if="orderDetailInfo.deliverytype == '1302'">卖家配送</span>
+				<span ng-if="orderDetailInfo.deliverytype == '1303'">上门自提</span>
 				<span ng-if="orderDetailInfo.deliverytype == null"><strong>未录入</strong></span>				
 			</div>
 		</div>