Commit 6692f2ea by 徐高华

退款

parent c4c082a7
...@@ -103,11 +103,15 @@ public class GicOrderRefundController { ...@@ -103,11 +103,15 @@ public class GicOrderRefundController {
// 退货地址类型 0归属门店 1发货门店 2平台地址 // 退货地址类型 0归属门店 1发货门店 2平台地址
int sellerAddressType = dto.getSellerAddressType(); int sellerAddressType = dto.getSellerAddressType();
boolean canAduitFlag = false; boolean canAduitFlag = false;
if (vo.getRefundStatus() == 1) {
canAduitFlag = true;
} else {
String refundStoreId = dto.getRefundStoreId(); String refundStoreId = dto.getRefundStoreId();
logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType); logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) { if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
canAduitFlag = true; canAduitFlag = true;
} }
}
vo.setCanAduitFlag(canAduitFlag); vo.setCanAduitFlag(canAduitFlag);
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
} }
...@@ -136,11 +140,15 @@ public class GicOrderRefundController { ...@@ -136,11 +140,15 @@ public class GicOrderRefundController {
// 判断好办端能否审批售后canAduitFlag // 判断好办端能否审批售后canAduitFlag
int sellerAddressType = dto.getSellerAddressType(); int sellerAddressType = dto.getSellerAddressType();
boolean canAduitFlag = false; boolean canAduitFlag = false;
if (vo.getExchangeStatus() == 1) {
canAduitFlag = true;
} else {
String exchangeStoreId = dto.getExchangeStoreId(); String exchangeStoreId = dto.getExchangeStoreId();
logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType); logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) { if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
canAduitFlag = true; canAduitFlag = true;
} }
}
vo.setCanAduitFlag(canAduitFlag); vo.setCanAduitFlag(canAduitFlag);
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment