tijiao

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -968,17 +969,16 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
     })
     @PostMapping(value = "/updateCarAddress")
-    public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) {
-        int result = amsSaleOrderService.updateCarAddress(mapValue);
+    @Transactional
+    public RESTfulResult updateCarAddress(@RequestBody Map<String, Object> mapValue) throws Exception {
         // 如果返回结果为0，则认定是关闭了车辆
-        if (result == 0) {
-            BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
-            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderService.getSaleMaterialId(saleOrderMaterialId);
-            String wholeOrder = "0";
-            String status = "close";
-            String reason = "收货地址修改超过片区范围";
-            // 循环调用关闭金蝶分录接口
-            for (Map<String, Object> head : saleMaterialIdList) {
+        BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId"));
+        List<Map<String,Object>> saleMaterialIdList = amsSaleOrderService.getSaleMaterialId(saleOrderMaterialId);
+        String wholeOrder = "0";
+        String status = "close";
+        String reason = "收货地址修改超过片区范围";
+        // 循环调用关闭金蝶分录接口
+        for (Map<String, Object> head : saleMaterialIdList) {
                 head.put("wholeOrder",wholeOrder);
                 head.put("status",status);
                 head.put("reason",reason);
@@ -987,11 +987,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
                 totalMap.put("input",input);
                 String json = JSONUtils.toJSONString(totalMap);
+                System.out.println("--------------------------------------------");
                 System.out.println(json);
+                System.out.println("--------------------------------------------");
                 Map<String, Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
+                System.out.println("--------------------------------------------");
                 System.out.println(resultMap);
-            }
         }
+        int result = amsSaleOrderService.updateCarAddress(mapValue);
         return success(result);
     }
 

src/main/resources/application-prod.yml

@@ -13,13 +13,13 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:
-     url: ${JOINFEIGN_URL:172.16.33.166:8066}
+     url: ${JOINFEIGN_URL:localhost:8066}
 
  #正式环境端口
 

src/main/resources/bootstrap.yml

@@ -17,11 +17,11 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
-    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
+    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
   instance:
-    prefer-ip-address: true
+    prefer-ip-address: false
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
     instance-id: ${spring.cloud.client.ip-address}:${server.port}