主干中的确认退货接口可以调用外联上的库存恢复接口

src/main/java/com/starcharge/wios/controller/RejectController.java

 package com.starcharge.wios.controller;
 package com.starcharge.wios.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.component.api.v2.BaseResponse;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.util.HttpClientUtils;
 import com.ihidea.core.util.HttpClientUtils;
+import com.ihidea.core.util.XMLUtilsEx;
 import com.starcharge.warehouse.query.MaterialsQuery;
 import com.starcharge.warehouse.query.MaterialsQuery;
 import com.starcharge.wios.auth.filter.LoginFilter;
 import com.starcharge.wios.auth.filter.LoginFilter;
 import com.starcharge.wios.auth.service.TokenService;
 import com.starcharge.wios.auth.service.TokenService;
@@ -33,6 +35,7 @@ import org.apache.http.Header;
 import org.apache.http.HeaderElement;
 import org.apache.http.HeaderElement;
 import org.apache.http.ParseException;
 import org.apache.http.ParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -66,6 +69,9 @@ public class RejectController {
     private SnowFlakeService snowFlakeService;
     private SnowFlakeService snowFlakeService;
     @Autowired
     @Autowired
     private DeliveryMapper deliveryMapper;
     private DeliveryMapper deliveryMapper;
+    @Value("${warehouseUrl.url}")
+    private String url;
+
 
 
    /* @PostMapping("/add")
    /* @PostMapping("/add")
     @ApiOperation(value = "申请退货")
     @ApiOperation(value = "申请退货")
@@ -120,23 +126,26 @@ public class RejectController {
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
     }
     }
-    /*@PostMapping("/confirmReject")
+    @PostMapping("/confirmReject")
     @ApiOperation("确认退货接口")
     @ApiOperation("确认退货接口")
     @ParamsValidate
     @ParamsValidate
     public BaseResponse<DeliveryUpdateDTO> confirmReject(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
     public BaseResponse<DeliveryUpdateDTO> confirmReject(@RequestBody @Validated(UpdateEntityGroup.class) DeliveryUpdateDTO deliveryUpdateDTO, BindingResult bindingResult){
-        //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);   HttpServletRequest
+        //var data=RejectConvert.INSTANCE.convertAddVo(rejectAddVo);
         Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
         Delivery before=this.deliveryMapper.selectByPrimaryKey(deliveryUpdateDTO.getId());
         Map<String, String> params = new HashMap<String, String>();
         Map<String, String> params = new HashMap<String, String>();
         params.put("warehouseId",before.getArrivalWarehouseId());
         params.put("warehouseId",before.getArrivalWarehouseId());
         params.put("materialsCode",before.getMaterialCode());
         params.put("materialsCode",before.getMaterialCode());
-        String token = SpringContextUtil.getToken();
-        org.springframework.http.HttpHeaders headers = new HttpHeaders();
-        headers.add("token",token);
-        String jsonStr = HttpClientUtils.post("http://192.168.1.106:9061/api/api/reject/restoreInventoryQuantity", params, "UTF-8","UTF-8", (Header) headers);
-        System.out.println("获取分支的数据"+jsonStr);
+        //String token = SpringContextUtil.getToken();
+        String jsonStr = HttpClientUtils.post(url, "<xml>" + XMLUtilsEx.serialize(params) + "</xml>", "UTF-8", "UTF-8");
+        JSONObject jsonObject=JSONObject.parseObject(jsonStr);
+        String code=jsonObject.getString("code");
+        if (StringUtil.isNullOrEmpty(code) || !"200".equals(code)){
+            throw new ServiceException("库存恢复失败");
+        }
+        deliveryUpdateDTO.setLogisticStatus("退货已申请");
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         this.commonUpdateService.UpdateColumns(deliveryUpdateDTO,false);
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
         return new BaseResponse(this.deliveryMapper.updateByPrimaryKeySelective(deliveryUpdateDTO));
-    }*/
+    }
 
 
     /*@PostMapping("/export")
     /*@PostMapping("/export")
     @ApiOperation(value = "导出退货单列表")
     @ApiOperation(value = "导出退货单列表")