售后

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

@@ -126,7 +126,7 @@ public class GicOrderController {
         // 配送方式 -1：所有 2：门店自提 1：快递发货
         qdto.setDeliveryType(1);
         // 库存 - 门店库存2
-        // qdto.setDeliveryMode(2);
+        qdto.setDeliveryMode(2);
         if (StringUtils.isNotEmpty(search)) {
             qdto.setSearchOrderType(SearchOrderTypeEnum.GOODS_NAME_OR_ORDER_NUMBER.getType());
             qdto.setSearchOrderParam(search);

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

@@ -99,12 +99,16 @@ public class GicOrderRefundController {
         OrderRefundDetailDTO dto = resp.getResult();
         OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, dto);
         this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
-        // 判断好办端能否审批售后canAduitFlag
+        // 判断好办端能否审批(确认收货) 只有收货门店能确认
+        // 退货地址类型 0归属门店 1发货门店 2平台地址
+        int sellerAddressType = dto.getSellerAddressType();
+        boolean canAduitFlag = false;
         String refundStoreId = dto.getRefundStoreId();
-        logger.info("退货收货门店={},{}", storeId, refundStoreId);
-        if (StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
-            vo.setCanAduitFlag(false);
+        logger.info("退货收货门店={},{},{}", storeId, refundStoreId, sellerAddressType);
+        if (sellerAddressType != 2 && StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+            canAduitFlag = true;
         }
+        vo.setCanAduitFlag(canAduitFlag);
         return RestResponse.successResult(vo);
     }
 
@@ -130,11 +134,14 @@ public class GicOrderRefundController {
         }
         this.fillMemberInfo(enterpriseId, vo.getMemberId(), null, vo);
         // 判断好办端能否审批售后canAduitFlag
+        int sellerAddressType = dto.getSellerAddressType();
+        boolean canAduitFlag = false;
         String exchangeStoreId = dto.getExchangeStoreId();
-        logger.info("换货收货门店={},{}", storeId, exchangeStoreId);
-        if (StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
-            vo.setCanAduitFlag(false);
+        logger.info("换货收货门店={},{}", storeId, exchangeStoreId, sellerAddressType);
+        if (sellerAddressType != 2 && StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
+            canAduitFlag = true;
         }
+        vo.setCanAduitFlag(canAduitFlag);
         return RestResponse.successResult(vo);
     }