结算页功能调整

src/main/java/com/uas/platform/b2c/logistics/model/UsableRuleInfo.java

@@ -25,6 +25,10 @@ public class UsableRuleInfo {
 	 * 卖家enuu
 	 */
 	private Long enuu;
+	/**
+	 * 卖家店铺uuid
+	 */
+	private String uuid;
 	/**
 	 * 配送规则币别
 	 */
@@ -85,4 +89,12 @@ public class UsableRuleInfo {
 	public void setCurrencyName(String currencyName) {
 		this.currencyName = currencyName;
 	}
+
+	public String getUuid() {
+		return uuid;
+	}
+
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/DistributionRuleServiceImpl.java

@@ -311,6 +311,7 @@ public class DistributionRuleServiceImpl implements DistributionRuleService{
 					UsableRuleInfo info = new UsableRuleInfo(rule);
 					Double fare = getFareOfRule(rule, price);
 					info.setFare(fare);
+					info.setUuid(uuid);
 					ruleInfoList.add(info);
 				}
 			}

src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -350,7 +350,7 @@ public class Order extends Document implements Serializable {
 	private Double importExtraCharges;
 
 	/**
-	 * 金额合计
+	 * 金额合计，店铺商品明细金额总计
 	 */
 	@Column(name = "or_price")
 	private Double price;
@@ -374,13 +374,13 @@ public class Order extends Document implements Serializable {
 	private String inid;
 
 	/**
-	 * 确认金额（考虑商城打折的情况）
+	 * 确认金额（考虑商城打折的情况）包括运费
 	 */
 	@Column(name = "ensure_price")
 	private Double ensurePrice;
 
 	/**
-	 * 实际成交金额（考虑退货）
+	 * 实际成交金额（考虑退货）包括运费
 	 */
 	@Column(name = "transation_price")
 	private Double transationPrice;

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

@@ -439,8 +439,8 @@ define(['app/app'], function(app) {
 			orderInfo.currency = $scope.order.currency; // 币别
 			orderInfo.orderRemark = angular.toJson($scope.remarkList);//订单备注
 			orderInfo.splitInfo = {
-				methodList : angular.toJson($scope.deliveryList),
-				fareList : angular.toJson($scope.fareList)
+				ruleList : angular.toJson($scope.deliveryList)
+				// fareList : angular.toJson($scope.fareList)
 			};
 
 			orderInfo.paytype =  $scope.order.paytype;