换货发货

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

@@ -3,12 +3,14 @@ package com.gic.haoban.manage.web.controller.order;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.business.order.api.service.order.AfterSalesManageApiService;
@@ -19,6 +21,8 @@ import com.gic.business.order.dto.ordermanage.OrderRefundDetailDTO;
 import com.gic.business.order.dto.ordermanage.OrderRefundExchangeListDTO;
 import com.gic.business.order.dto.ordermanage.RefundAddressDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeAddressQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeBaseQDTO;
+import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeRefusedQDTO;
 import com.gic.business.order.qdto.aftersales.ExchangeSellerAgreeApplyQDTO;
 import com.gic.business.order.qdto.aftersales.RefundBaseQDTO;
@@ -29,6 +33,7 @@ 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;
@@ -40,6 +45,8 @@ import com.gic.haoban.manage.web.vo.order.refund.SellerAddressVO;
 @RequestMapping("/refund")
 public class GicOrderRefundController {
 
+    private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(MemberMarketingController.class);
+
     @Autowired
     private OrderRefundApiService orderRefundApiService;
     @Autowired
@@ -151,8 +158,20 @@ public class GicOrderRefundController {
     // 换货单发货
     @RequestMapping(value = "exchange-order-deliver")
     @ResponseBody
-    public RestResponse<Object> exchangeDeliver(String enterpriseId, String orderExchaneId) {
-        return RestResponse.successResult();
+    public RestResponse<Object> exchangeDeliver(String enterpriseId, String memberId, String companyCode,
+            String logisticsNo, String companyId, String companyName, ExchangeBaseQDTO baseQDTO) {
+        ExchangeDeliveryBackQDTO qdto = new ExchangeDeliveryBackQDTO();
+        qdto.setCourierNumber(logisticsNo);
+        qdto.setLogisticsCompanyCode(companyCode);
+        qdto.setLogisticsCompanyId(companyId);
+        qdto.setLogisticsCompanyName(companyName);
+        ServiceResponse<Void> resp = this.afterSalesManageApiService.exchangeSellerDeliveryGoods(enterpriseId, memberId,
+                qdto);
+        logger.info("换货单发货={}", JSON.toJSONString(resp));
+        if (resp.isSuccess()) {
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure("9999", resp.getMessage());
     }
 
     // 协商记录-退款

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

@@ -10,26 +10,16 @@ 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;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.business.order.dto.ordermanage.DispatchGoodsInfoDTO;
-import com.gic.business.order.dto.ordermanage.ListOrderDTO;
-import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
-import com.gic.business.order.dto.ordermanage.OrderDetailDTO;
-import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
-import com.gic.business.order.enums.OrderEnum;
-import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
+import com.gic.business.order.qdto.ordermanage.SelfPickOffQDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
-import com.gic.commons.util.EntityUtil;
-import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.CreateRecordRequest;
 import com.gic.haoban.app.aggregation.api.dto.evaluation.OrderProductRequest;
@@ -40,11 +30,6 @@ 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;
-import com.gic.haoban.manage.web.vo.order.OrderDetailItemVO;
-import com.gic.haoban.manage.web.vo.order.OrderDetailVO;
-import com.gic.haoban.manage.web.vo.order.OrderListItemVO;
-import com.gic.haoban.manage.web.vo.order.OrderListVO;
 import com.gic.haoban.manage.web.vo.order.integral.CheckVO;
 import com.gic.haoban.manage.web.vo.order.integral.OrderCountVO;
 import com.gic.haoban.manage.web.vo.order.integral.ProductSku;
@@ -93,7 +78,16 @@ public class GicOrderVerificationController {
         }
         // 微商城核销
         if (writeOffCode.startsWith("M")) {
-
+            SelfPickOffQDTO qdto = new SelfPickOffQDTO();
+            qdto.setEnterpriseId(enterpriseId);
+            qdto.setWriteOffClerkId(clerkId);
+            qdto.setWriteOffCode(writeOffCode);
+            qdto.setSource(1);
+            ServiceResponse<Boolean> response = webOrderManageApiService.selfPickOff(qdto);
+            if (!response.isSuccess()) {
+                return RestResponse.failure(response.getCode(), response.getMessage());
+            }
+            return RestResponse.successResult(response.getResult());
         } else {
             ClerkQo clerkQo = new ClerkQo();
             clerkQo.setClerkCode(clerkDTO.getClerkCode());
@@ -157,6 +151,7 @@ public class GicOrderVerificationController {
         }
         // 微商城
         if (writeOffCode.startsWith("M")) {
+            // 通过核销码查询
             return RestResponse.successResult();
         } else {
             // 积分商城