Commit f8c2d43b by 徐高华

修改物流

parent 0b1ea29f
...@@ -23,7 +23,6 @@ import com.alibaba.fastjson.JSONArray; ...@@ -23,7 +23,6 @@ import com.alibaba.fastjson.JSONArray;
import com.gic.api.base.commons.BasePageInfo; import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; 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.member.MemberStoreInfoDTO;
import com.gic.business.order.dto.ordermanage.ListOrderDTO; import com.gic.business.order.dto.ordermanage.ListOrderDTO;
import com.gic.business.order.dto.ordermanage.ListOrderItemDTO; import com.gic.business.order.dto.ordermanage.ListOrderItemDTO;
...@@ -35,7 +34,6 @@ import com.gic.business.order.dto.setting.MallOrderSettingDTO; ...@@ -35,7 +34,6 @@ import com.gic.business.order.dto.setting.MallOrderSettingDTO;
import com.gic.business.order.enums.OrderEnum; import com.gic.business.order.enums.OrderEnum;
import com.gic.business.order.enums.OrderEnum.DeliveryOptTypeEnum; import com.gic.business.order.enums.OrderEnum.DeliveryOptTypeEnum;
import com.gic.business.order.enums.OrderEnum.SearchOrderTypeEnum; import com.gic.business.order.enums.OrderEnum.SearchOrderTypeEnum;
import com.gic.business.order.qdto.aftersales.ExchangeDeliveryBackQDTO;
import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO; import com.gic.business.order.qdto.ordermanage.CountOrderStatusQDTO;
import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO; import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO; import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
...@@ -103,8 +101,6 @@ public class GicOrderController { ...@@ -103,8 +101,6 @@ public class GicOrderController {
@Autowired @Autowired
private OrderSettingApiService orderSettingApiService; private OrderSettingApiService orderSettingApiService;
@Autowired @Autowired
private AfterSalesManageApiService afterSalesManageApiService;
@Autowired
private EvaluateDataApiService evaluateDataApiService; private EvaluateDataApiService evaluateDataApiService;
// 发货订单列表 (0全部,待发货2+待收货3,部分发货7) // 发货订单列表 (0全部,待发货2+待收货3,部分发货7)
...@@ -378,25 +374,12 @@ public class GicOrderController { ...@@ -378,25 +374,12 @@ public class GicOrderController {
} }
// 修改物流 // 修改物流
// type : 1: 下单发货 2:换货发 // type : 1: 下单 2:换
@RequestMapping("modify-order-logistics") @RequestMapping("modify-order-logistics")
public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId, public RestResponse<Object> modifyOrderDeliver(String memberId, String enterpriseId, String orderId, String storeId,
String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName, String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName,
@RequestParam(defaultValue = "1") int type) { @RequestParam(defaultValue = "1") int type) {
logger.info("换货单修改物流={}", orderId, type); logger.info("修改物流={},{}", orderId, 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);
if (resp.isSuccess()) {
return RestResponse.successResult();
}
return RestResponse.failure("9999", resp.getMessage());
}
UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO(); UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
qdto.setEnterpriseId(enterpriseId); qdto.setEnterpriseId(enterpriseId);
qdto.setLogisticsCompanyCode(companyCode); qdto.setLogisticsCompanyCode(companyCode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment