卖家中心--卖家取消订单调整

src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseController.java

@@ -606,7 +606,7 @@ public class PurchaseController {
 	 * @return the string
 	 */
 	@RequestMapping(value = "simpleinfo/ones/{purchaseId}/release", method = RequestMethod.PUT)
-	public String release(@PathVariable String purchaseId, @RequestBody String reason) {
+	public String release(@PathVariable String purchaseId, String reason) {
 		logger.log("卖家订单管理", "取消订单", "根据订单号： " + purchaseId + "取消订单，释放库存");
 		return purchaseService.release(purchaseId, reason);
 	}

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

@@ -1605,9 +1605,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		if (SystemSession.getUser().getEnterprise() == null) {
 			throw new IllegalOperatorException("您的企业信息有误，请重新选择企业");
 		}
-		if (!SystemSession.getUser().getEnterprise().getUu().equals(purchase.getInstallment().getSellerenuu())) {
-			throw new IllegalOperatorException("该订单不属于当前企业，请重新确认信息");
-		}
+
 		if (purchase.getInstallmentId() == null) {
 			throw new IllegalOperatorException("此订单付款方式非直接付款给卖家，您无法取消，请重新确认订单信息");
 		}
@@ -1615,6 +1613,10 @@ public class PurchaseServiceImpl implements PurchaseService {
 		if (installment == null) {
 			throw new IllegalOperatorException("订单：" + order.getOrderid() + "分期信息有误，请重新确认或联系客服");
 		}
+		purchase.setInstallment(installment);
+        if (!SystemSession.getUser().getEnterprise().getUu().equals(purchase.getInstallment().getSellerenuu())) {
+            throw new IllegalOperatorException("该订单不属于当前企业，请重新确认信息");
+        }
 
 		Date sysDate = new Date();
 		Long uu = SystemSession.getUser().getUserUU();

src/main/webapp/resources/js/common/query/purchase.js

@@ -235,7 +235,7 @@ define([ 'ngResource' ], function() {
 			},
 			// 取消订单
 			sellerCancelOrder : {
-				url : rootPath +'/trade/purchase-simpleinfo/ones/:purchaseId/release',
+				url : rootPath +'/trade/purchase/simpleinfo/ones/:purchaseId/release',
 				method : 'PUT'
 			}
 		});