订单

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

@@ -51,7 +51,6 @@ import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderProductRequest;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderVerificationRecordDTO;
 import com.gic.haoban.app.aggregation.api.service.evaluation.OrderVerificationRecordApiService;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.order.integral.ClerkQo;
 import com.gic.haoban.manage.web.vo.order.MemberInfoVO;
@@ -77,7 +76,7 @@ import com.gic.store.goods.service.ProductStockApiService;
 @RequestMapping("/order")
 public class GicOrderController {
 
-    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(MemberMarketingController.class);
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(GicOrderController.class);
 
     @Autowired
     private WebOrderManageApiService webOrderManageApiService;
@@ -245,6 +244,10 @@ public class GicOrderController {
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getAddressInfo());
         orderDetailVO.setMember(member);
+        // 判断能否发货
+        boolean canDeliverFlag = true;
+        
+        orderDetailVO.setCanDeliverFlag(canDeliverFlag);
         return orderDetailVO;
     }
 
@@ -408,7 +411,7 @@ public class GicOrderController {
      * 核销订单
      */
     @RequestMapping("/verification")
-    public RestResponse<Object> verification(String enterpriseId, String clerkId, String writeOffCode , String orderId) {
+    public RestResponse<Object> verification(String enterpriseId, String clerkId, String writeOffCode, String orderId) {
         if (StringUtils.isEmpty(writeOffCode)) {
             return RestResponse.failure("9999", "核销码为空");
         }
@@ -418,7 +421,7 @@ public class GicOrderController {
         }
         // 微商城核销
         if (writeOffCode.startsWith("M")) {
-            if(StringUtils.isEmpty(orderId)) {
+            if (StringUtils.isEmpty(orderId)) {
                 return RestResponse.failure("9999", "订单ID为空");
             }
             SelfPickOffQDTO qdto = new SelfPickOffQDTO();

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller.order;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +34,6 @@ import com.gic.business.order.service.ordermanage.MallSellerAddressApiService;
 import com.gic.business.order.service.ordermanage.OrderRefundApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.haoban.manage.web.controller.marketing.MemberMarketingController;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeConsultVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderExchangeDetailVO;
 import com.gic.haoban.manage.web.vo.order.refund.OrderRefundConsultVO;
@@ -48,7 +48,7 @@ import com.gic.store.goods.service.ProductStockApiService;
 @RequestMapping("/refund")
 public class GicOrderRefundController {
 
-    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(MemberMarketingController.class);
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(GicOrderRefundController.class);
 
     @Autowired
     private OrderRefundApiService orderRefundApiService;
@@ -81,10 +81,17 @@ public class GicOrderRefundController {
     // 退款-详情
     @RequestMapping(value = "order-refund-detail")
     @ResponseBody
-    public RestResponse<Object> refundDetail(String enterpriseId, String orderRefundId) {
+    public RestResponse<Object> refundDetail(String enterpriseId, String storeId, String orderRefundId) {
         ServiceResponse<OrderRefundDetailDTO> resp = this.orderRefundApiService.refundDetail(orderRefundId);
-        OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, resp.getResult());
+        OrderRefundDetailDTO dto = resp.getResult();
+        OrderRefundDetailVO vo = EntityUtil.changeEntityNew(OrderRefundDetailVO.class, dto);
         this.fillMemberInfo(enterpriseId, vo.getMemberId(), vo, null);
+        // 判断好办端能否审批售后canAduitFlag
+        String refundStoreId = dto.getRefundStoreId();
+        logger.info("退货收货门店={},{}", storeId, refundStoreId);
+        if (StringUtils.isNotEmpty(refundStoreId) && storeId.equals(refundStoreId)) {
+            vo.setCanAduitFlag(false);
+        }
         return RestResponse.successResult(vo);
     }
 
@@ -93,7 +100,8 @@ public class GicOrderRefundController {
     @ResponseBody
     public RestResponse<Object> exchangeDetail(String enterpriseId, String storeId, String orderExchangeId) {
         ServiceResponse<OrderExchangeDetailDTO> resp = this.orderRefundApiService.exchangeDetail(orderExchangeId);
-        OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, resp.getResult());
+        OrderExchangeDetailDTO dto = resp.getResult();
+        OrderExchangeDetailVO vo = EntityUtil.changeEntityNew(OrderExchangeDetailVO.class, dto);
         String targetProSkuId = resp.getResult().getTargetProSkuId();
         // 查询库存
         vo.setTargetProStock(1);
@@ -108,6 +116,12 @@ public class GicOrderRefundController {
             vo.setTargetProStock(stockResp.getResult());
         }
         this.fillMemberInfo(enterpriseId, vo.getMemberId(), null, vo);
+        // 判断好办端能否审批售后canAduitFlag
+        String exchangeStoreId = dto.getExchangeStoreId();
+        logger.info("换货收货门店={},{}", storeId, exchangeStoreId);
+        if (StringUtils.isNotEmpty(exchangeStoreId) && storeId.equals(exchangeStoreId)) {
+            vo.setCanAduitFlag(false);
+        }
         return RestResponse.successResult(vo);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeDetailVO.java

@@ -42,8 +42,8 @@ public class OrderExchangeDetailVO implements Serializable {
     private String memberImage;
     private String mainClerkName;
     private String mainStoreName;
-    private String openClerkName ;
-    private String openStoreName ;
+    private String openClerkName;
+    private String openStoreName;
 
     /**
      * 换货商品件数（或单位 贵金属-重量等）
@@ -216,19 +216,29 @@ public class OrderExchangeDetailVO implements Serializable {
     private String exchangeImgUrl;
 
     private String exchangeDescribe;
-    
+
     // 1 电商发货 2门店发货
     private Integer deliveryMode = 1;
     private String amountPayableInfo;
     private Double orderItemFreight;
+
+    private String buyerLogisticsCompanyId;
+    private String sellerLogisticsCompanyId;
+    private String sellerLogisticsCompanyCode;
+
+    // 好办端能否审批售后
+    private boolean canAduitFlag = true;
+    // 退款的门店id
+    private String exchangeStoreId;
     
-    private String buyerLogisticsCompanyId ;
-    private String sellerLogisticsCompanyId ;
-    private String sellerLogisticsCompanyCode ;
-    
-//  好办端能否审批售后
-    private boolean canAduitFlag = true ;
-    
+    public String getExchangeStoreId() {
+        return exchangeStoreId;
+    }
+
+    public void setExchangeStoreId(String exchangeStoreId) {
+        this.exchangeStoreId = exchangeStoreId;
+    }
+
     public boolean isCanAduitFlag() {
         return canAduitFlag;
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundDetailVO.java

@@ -101,7 +101,17 @@ public class OrderRefundDetailVO implements Serializable {
     //  好办端能否审批售后
     private boolean canAduitFlag = true ;
     
+    // 退款的门店id
+    private String refundStoreId ;
     
+    public String getRefundStoreId() {
+        return refundStoreId;
+    }
+
+    public void setRefundStoreId(String refundStoreId) {
+        this.refundStoreId = refundStoreId;
+    }
+
     public boolean isCanAduitFlag() {
         return canAduitFlag;
     }