统一下订单的配送方式

src/main/java/com/uas/platform/b2c/core/constant/Type.java

@@ -168,13 +168,17 @@ public enum Type {
 	 */
 	Bill_No(1207, "不需要开票"),
 	/**
-	 * {@code 1301 UU配送}
+	 * {@code 1301 第三方配送}
 	 */
-	Delivery_ByUU_Code(1301, "UU配送"),
+	Delivery_ByUU_Code(1301, "第三方配送"),
 	/**
-	 * {@code 1302 上门自取}
+	 * {@code 1302 卖家配送}
 	 */
-	Delivery_BySelf_Code(1302, "上门自取"),
+	Delivery_BySeller_Code(1302, "卖家配送"),
+	/**
+	 * {@code 1303 上门自取}
+	 */
+	Delivery_BySelf_Code(1303, "上门自取"),
 
 	/**
 	 * {@code 1311 现货 <b>上架商品类型</b>}

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

@@ -1436,4 +1436,9 @@ public class PurchaseServiceImpl implements PurchaseService {
 	public Logistics findByLgtId(Long lgtId) {
 		return logisticsDao.findOne(lgtId);
 	}
+
+	@Override
+	public Logistics modifyPurchaseLogistics(Long id) {
+		return null;
+	}
 }

src/main/webapp/resources/js/common/services.js

@@ -581,8 +581,9 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 			"1202":"17%增值税不可抵扣，累计开票,8%税点",
 			"1203":"17%增值税可抵扣，随元器件一起发货,10%税点",
 			"1204":"17%增值税不可抵扣，，随元器件一起发货,10%税点",
-			"1301":"UU配送",
-			"1302":"上门自取"
+			"1301":"第三方配送",
+            "1302":"卖家配送",
+			"1303":"上门自取"
 			};
 		return function(data) {
 			return statusConfig[data];

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

@@ -176,6 +176,9 @@ define(['app/app'], function(app) {
 				}
 				$scope.order = data;
 				$scope.order.orderHistory = angular.fromJson($scope.order.statushistory);
+				if ($scope.order.orderRemark){
+					$scope.remarkList = angular.fromJson($scope.order.orderRemark);
+				}
 				// 设置状态样式
 				$scope.stepStyle($scope.order.status);
 				// 获取物流信息

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

@@ -221,6 +221,12 @@ define(['app/app'], function(app) {
 			$scope.calculateTotal();
 		};
 
+		$scope.deliveryMethod = {
+			1301 : '第三方配送',
+			1302 : '卖家配送',
+			1303 : '上门自提'
+		};
+
 		/**
 		 * 是否失效- +
 		 */

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

@@ -146,7 +146,7 @@ define(['app/app'], function(app) {
 			// }else {
 			//     if(!$scope.order.invoicetype) $scope.order.invoicetype = 1205;
 			// }
-			// 默认选择UU配送  --1301UU配送  --1302上门自提
+			// 默认选择UU配送  --1301第三方配送  --1302卖家配送 --1303上门自提
 			if(!$scope.order.deliverytype) $scope.order.deliverytype = 1301;
 		};
 

src/main/webapp/resources/view/prod/order_ensure.html

@@ -775,8 +775,9 @@ table .before-blank, .table-bordered>tbody>tr>td.before-blank, .table-bordered>t
                             <td><div ng-bind="order.buyer"></div></td>
                             <td>
                                 <div ng-switch="order.deliverytype">
-                                    <div ng-switch-when="1301">UU配送</div>
-                                    <div ng-switch-when="1302">上门自提</div>
+                                    <div ng-switch-when="1301">第三方配送</div>
+                                    <div ng-switch-when="1302">卖家配送</div>
+									<div ng-switch-when="1303">上门自提</div>
                                 </div>
                             </td>
                             <td>/</td>

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

@@ -409,7 +409,7 @@
 					<dd class="oder-remark" ng-class="{'length3': order.orderDetails.length > 3}">
 						<span style="width: 100%;">
 							<em>订单备注：</em>
-							<i class="fl" ng-bind="order.orderRemark || '无'">用便宜的物流最好！</i>
+							<i class="fl" ng-bind="remarkList[order.storeid] || '无'">用便宜的物流最好！</i>
 							<!--<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="order.orderRemark"/>-->
 						</span>
 					</dd>

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

@@ -630,13 +630,13 @@
 						</dd>
 						<dd class="line60">
 							<span class="style01" style="width: 60%; padding-left: 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 ng-if="order.status == 501" class="select" ng-model="order.deliverytype" style="opacity: 1;" >
+									<!--<option ng-switch-when="1301">第三方配送</option>-->
+									<option value="1301">第三方配送</option>
+						  			<option value="1302">卖家配送</option>
+									<option value="1303">上门自提</option>
 								</select>
-								<em ng-if="order.status != 501" class="color333">物流配送</em>
+								<em ng-if="order.status != 501" class="color333" ng-bind="deliveryMethod[order.deliverytype]">物流配送</em>
 								<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
 							</span>
 							<span class="total-price">
@@ -647,7 +647,7 @@
 								</p>
 							</span>
 						</dd>
-						<div class="self-list">
+						<div class="self-list" ng-if="order.deliverytype == 1303">
 							<!--自提点列表-->
 								<ul class="self-advice">
 									<li>

src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -267,7 +267,7 @@
         background: #f1f6ff;
     }
     .oder_xq_list dl .line60{
-        height: 50px;
+        /*height: 50px;*/
         border-bottom: #5078cb 1px solid;
     }
     .oder-remark .form-control {
@@ -452,6 +452,7 @@
         position: relative;
         top: -15px;
         height: 80px;
+        margin-top: -10px;
     }
     #oder-detail .line60.logistic-input span{
         height: 30px;