修复后台订单详情页付款方和收款方

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

@@ -648,6 +648,12 @@ public class Order extends Document implements Serializable {
 	@Transient
 	private Installment installment;
 
+	/**
+	 * 临时保存收款名
+	 */
+	@Transient
+	private String receiveName;
+
 	/**
 	 * Gets expiration time.
 	 *
@@ -2469,6 +2475,7 @@ public class Order extends Document implements Serializable {
 		this.buyeruu = user.getUserUU();
 		this.buyerenuu = user.getEnterprise() != null ? user.getEnterprise().getUu() : null;
 		this.buyername = user.getUserName();
+		this.buyerentername = user.getEnterprise() != null ? user.getEnterprise().getEnName() : null;
 		this.buyerTel = user.getUserTel();
 		this.setStatusToBeConfirmed(user.getUserUU());
 		buyNow = false; // 默认不是立即购买，是则手动设置
@@ -2881,4 +2888,12 @@ public class Order extends Document implements Serializable {
 	public void setSpId(Long spId) {
 		this.spId = spId;
 	}
+
+	public String getReceiveName() {
+		return receiveName;
+	}
+
+	public void setReceiveName(String receiveName) {
+		this.receiveName = receiveName;
+	}
 }

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

@@ -1668,7 +1668,15 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public Order findOrderDetail(String orderid) {
-        return orderDao.findOrderByOrderid(orderid);
+        Order order = orderDao.findOrderByOrderid(orderid);
+        if (order.getBuyerenuu() != null && order.getBuyerentername() == null) {
+            Enterprise enterprise = enterpriseDao.findByUu(order.getBuyerenuu());
+            if (enterprise != null) {
+                order.setBuyerentername(enterprise.getEnName());
+            }
+        }
+        order.setReceiveName(sysConf.getEnName());
+        return order;
     }
 
     @Override

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

@@ -298,7 +298,7 @@
 				<h4>银行信息:</h4>		
 			</div>
 			<div class="col-md-3">
-				<span>收款方：</span><span>优软测试二</span>
+				<span>收款方：</span><span ng-bind="orderDetailInfo.receiveName"></span>
 				<!--<span ng-bind="orderDetailInfo.sellername"></span>-->
 			</div>
 			<div class="col-md-3">
@@ -319,7 +319,7 @@
 				<span><a target="_blank"  href="{{imgUrl}}"><image alt="付款截图" ng-src="{{imgUrl}}" height="30px" width="60px"></image></a></span>
 			</div>
 			<div class="col-md-3">
-				<span>付款方：</span><span ng-bind="orderDetailInfo.buyer"></span>
+				<span>付款方：</span><span ng-bind="orderDetailInfo.buyername"></span><span ng-if="orderDetailInfo.buyerentername" ng-bind="' | '+orderDetailInfo.buyerentername"></span>
 			</div>
 			<div class="col-md-3">
 				<span>开户行名称：</span>