退款

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java

@@ -103,10 +103,14 @@ public class GicOrderRefundController {
         // 退货地址类型 0归属门店 1发货门店 2平台地址
         int sellerAddressType = dto.getSellerAddressType();
         boolean canAduitFlag = false;
-        String refundStoreId = dto.getRefundStoreId();
-        logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
-        if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+        if (vo.getRefundStatus() == 1) {
             canAduitFlag = true;
+        } else {
+            String refundStoreId = dto.getRefundStoreId();
+            logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
+            if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+                canAduitFlag = true;
+            }
         }
         vo.setCanAduitFlag(canAduitFlag);
         return RestResponse.successResult(vo);
@@ -136,10 +140,14 @@ public class GicOrderRefundController {
         // 判断好办端能否审批售后canAduitFlag
         int sellerAddressType = dto.getSellerAddressType();
         boolean canAduitFlag = false;
-        String exchangeStoreId = dto.getExchangeStoreId();
-        logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
-        if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
+        if (vo.getExchangeStatus() == 1) {
             canAduitFlag = true;
+        } else {
+            String exchangeStoreId = dto.getExchangeStoreId();
+            logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
+            if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
+                canAduitFlag = true;
+            }
         }
         vo.setCanAduitFlag(canAduitFlag);
         return RestResponse.successResult(vo);