Explorar o código

处理分期付款的bug.

yujia %!s(int64=7) %!d(string=hai) anos
pai
achega
7730a0246a

+ 1 - 1
src/main/java/com/uas/platform/b2c/core/config/MessageConf.java

@@ -60,7 +60,7 @@ public class MessageConf {
 	 *
 	 * @return
 	 */
-	@Value("#{message.tplAfterBeAddedtoB2C}")
+	@Value("${message.tplAfterBeAddedtoB2C}")
 	private String tplAfterBeAddedtoB2C;
 
 	/**

+ 9 - 2
src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -1382,8 +1382,15 @@ public class OrderServiceImpl implements OrderService {
             throw new IllegalOperatorException("此订单不存在,请重新确认订单信息");
 
         // 分期付款目前只支持直接付款给卖家
-        if ((order.getInstallmentId() != null)&&(order.getInstallment().getStatus().intValue() != Status.TOBEPAID.value()))
-            throw new IllegalOperatorException("此订单为直接付款给卖家,平台不可确认收款,请重新确认订单信息");
+        if (order.getInstallmentId() != null) {
+            Installment installment = installmentDao.findOne(order.getInstallmentId());
+            if (installment != null) {
+                if(installment.getStatus() != Status.TOBEPAID.value()) {
+                    throw new IllegalOperatorException("此订单为直接付款给卖家,平台不可确认收款,请重新确认订单信息");
+                }
+            }
+        }
+
 
         if (order.getStatus().intValue() != Status.PAID.value()
                 && order.getStatus().intValue() != Status.TOBEPAID.value()) {

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -933,14 +933,14 @@
 						</span>
 						<span class="oder_deal" ng-class="{'order-border-bottom-solid' : $index == order.orderDetails.length -1 || $index==2}">
                             <div ng-if="$index == 0">
-								<a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null && !order.installmentId" style="display: block;">
+								<a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && !order.installmentId" style="display: block;">
                                 <a ng-if="(order.status == 405 || order.status == 520) && !order.rateStatus" class="operate-height" target="_blank" href="user#/rate/firstRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">评价</em>
                               	</a>
 								<a ng-if="order.rateStatus == 523" class="operate-height" target="_blank" href="user#/rate/addRate/{{order.orderid | EncryptionFilter}}" style="display: block;">
                                   <em class="order-operation">追加评价</em>
                               	</a>
-                              <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="!order.installmentId&&(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">
+                              <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="!order.installmentId&&(order.status == 503 || order.status == 501)" style="display: block;">
                                   <em class="order-operation">立即付款</em>
 								</a>
 								<a ng-click="requestCancel(order, order.orderid)" ng-if="order.status == 525" class="operate-height">