修复结算页和卖家发货功能的bug问题

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

@@ -265,6 +265,12 @@ public class DistributionRuleServiceImpl implements DistributionRuleService{
 		return distributionRuleDao.findShippingMethodByEnuuAndActive(enuu, ShortConstant.YES_SHORT);
 	}
 
+	/**
+	 * 更新配送规则的运费
+	 * @param ruleList
+	 * @param price
+	 * @return
+	 */
 	@Override
 	public List<UsableRuleInfo> findFareOfRule(List<UsableRuleInfo> ruleList, Double price) {
 		if (CollectionUtils.isEmpty(ruleList)){

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

@@ -1376,9 +1376,11 @@ public class PurchaseServiceImpl implements PurchaseService {
 			countPurchaseTaxes += NumberUtil.mul(CountPurchaseDetailPrice, 0.17);
 			countPurchasePrice += CountPurchaseDetailPrice;
 			double countFractionPurchasePrice = NumberUtil.fractionNumCeil(countPurchasePrice,2);
-			purchase.setEnsurePrice(countFractionPurchasePrice);
+			//加入运费
+			double priceAddFara = NumberUtil.add(countFractionPurchasePrice, purchase.getFare());
+			purchase.setEnsurePrice(priceAddFara);
 			purchase.setPrice(countFractionPurchasePrice);
-			purchase.setTransationPrice(countFractionPurchasePrice);
+			purchase.setTransationPrice(priceAddFara);
 			purchase.setTaxes(countPurchaseTaxes);
 			purchaseDao.save(purchase);
 			// 修改订单明细单价，不含税单价，价税合计（三个字段），税金
@@ -1409,10 +1411,11 @@ public class PurchaseServiceImpl implements PurchaseService {
 			}
 			countOrderPrice += CountPurchaseDetailPrice;
 			double countFractionOrderPrice = NumberUtil.fractionNumCeil(countOrderPrice,2);
+			double orderPriceAddFare = NumberUtil.add(countFractionOrderPrice, order.getFare());
 			countOrderTaxes += NumberUtil.mul(CountPurchaseDetailPrice, 0.17);
-			order.setEnsurePrice(countFractionOrderPrice);
+			order.setEnsurePrice(orderPriceAddFare);
 			order.setPrice(countFractionOrderPrice);
-			order.setTransationPrice(countFractionOrderPrice);
+			order.setTransationPrice(orderPriceAddFare);
 			order.setTaxes(countOrderTaxes);
 			orderDao.save(order);
 			// 保存卖家采购单修改单价的记录

src/main/webapp/resources/js/vendor/controllers/forstore/purchase_detail.js

@@ -230,6 +230,7 @@ define(['app/app'], function(app) {
 			angular.forEach($scope.purchase.purchaseDetails, function (detail) {
 				detail.currentTaxUnitPrice = detail.taxUnitPrice;
 			});
+			$scope.purchase.currentTotal = $scope.purchase.ensurePrice;
         };
 
         // 取消

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

@@ -414,6 +414,7 @@
 		padding-left: 40px;
 		font-size: 14px;
 		line-height: 20px;
+		width: 100%;
 	}
 	.oder_xq_list dl .self-advice li strong{
 		font-weight: normal;

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

@@ -407,13 +407,13 @@
 						<span class="wd02">
 							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
 							<p class="style01" style="margin-top: 10px;">类目：
-								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
+								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号：
 								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌：
-								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
+								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
 						</span>
 							<span class="wd01">交期：

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

@@ -531,7 +531,7 @@
                     <li>
                         <!--<h4 ng-bind="checkinvoice.jsonSpAddress.company || '空'"></h4>-->
                         <p class="" title=""><em ng-bind="::checkinvoice.jsonSpAddress.area"></em> <em ng-bind="::checkinvoice.jsonSpAddress.detailAddress"></em></p>
-                        <span class="adderss-name"><em ng-bind="checkinvoice.jsonSpAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="checkinvoice.buyerentername"></em></span>
+                        <span class="adderss-name"><em ng-bind="checkinvoice.jsonSpAddress.tel"></em>&nbsp;&nbsp;<em ng-bind="checkinvoice.jsonSpAddress.name"></em></span>
                     </li>
                     <li class="log_line">发货人信息：</li>
                     <li ng-if="jsonSdAddress.area">
@@ -583,13 +583,13 @@
 						<span class="wd02">
 							<a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
 							<p class="style01" style="margin-top: 10px;">类目：
-								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
+								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号：
 								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌：
-								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
+								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
 						</span>
                             <span class="wd01">交期：