发货

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

@@ -20,6 +20,7 @@ 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.api.service.order.AfterSalesManageApiService;
 import com.gic.business.order.dto.member.MemberStoreInfoDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderDTO;
 import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
@@ -28,6 +29,7 @@ import com.gic.business.order.dto.ordermanage.OrderInfoDTO;
 import com.gic.business.order.dto.ordermanage.OrderNodeDTO;
 import com.gic.business.order.dto.setting.MallOrderSettingDTO;
 import com.gic.business.order.enums.OrderEnum;
+import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
 import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
@@ -92,6 +94,8 @@ public class GicOrderController {
     private ProductStockApiService productStockApiService;
     @Autowired
     private OrderSettingApiService orderSettingApiService;
+    @Autowired
+    private AfterSalesManageApiService afterSalesManageApiService;
 
     // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
     @RequestMapping("list-order")
@@ -310,7 +314,7 @@ public class GicOrderController {
         return RestResponse.successResult(voList);
     }
 
-    // 发货
+    // 订单-可发货订单项列表查询
     @RequestMapping("order-logistics-deliver")
     public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId, String orderItemIds,
             String companyCode, String logisticsNo, String companyId, String companyName) {
@@ -369,10 +373,25 @@ public class GicOrderController {
     }
 
     // 修改物流
-    // type :   1: 下单发货  2：换货发货
+    // type : 1: 下单发货 2：换货发货
     @RequestMapping("modify-order-logistics")
-    public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,
-            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName , @RequestParam(defaultValue="1")int type) {
+    public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
+            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,
+            @RequestParam(defaultValue = "1") int type) {
+        if (type == 2) {
+            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());
+        }
         UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);

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

@@ -37,7 +37,6 @@ 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.MemberInfoVO;
 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;
@@ -116,7 +115,7 @@ public class GicOrderRefundController {
     }
 
     // 审批退款单
-    // 拒绝 1 , 同意2
+    // auditStatus 拒绝 1 , 同意2
     // 拒绝收货 1 同意收货2
     // step 1 申请 2收货
     @RequestMapping(value = "audit-refund-order")
@@ -127,6 +126,7 @@ public class GicOrderRefundController {
         // 拒绝
         if (auditStatus == 1) {
             RefundRefusedQDTO qdto = EntityUtil.changeEntityNew(RefundRefusedQDTO.class, baseQDTO);
+            qdto.setReason(remark);
             if (step == 1) {
                 this.afterSalesManageApiService.refundSellerRefusedApply(enterpriseId, memberId, qdto);
             }
@@ -163,6 +163,7 @@ public class GicOrderRefundController {
         // 拒绝
         if (auditStatus == 1) {
             ExchangeRefusedQDTO qdto = EntityUtil.changeEntityNew(ExchangeRefusedQDTO.class, baseQDTO);
+            qdto.setRemark(remark);
             if (step == 1) {
                 this.afterSalesManageApiService.exchangeSellerRefused(enterpriseId, memberId, qdto);
             }
@@ -185,25 +186,6 @@ public class GicOrderRefundController {
         return RestResponse.successResult();
     }
 
-    // 换货单发货
-    @RequestMapping(value = "exchange-order-deliver")
-    @ResponseBody
-    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());
-    }
-
     // 协商记录-退款
     @RequestMapping(value = "order-refund-consult")
     @ResponseBody