liyg пре 2 година
родитељ
комит
7d248d87c0

+ 29 - 0
src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/23 8:46
+ * @Version:V2.0
+ */
+@FeignClient(value = "DIL-BMSTRUCK-API-DEV", url = "${openfeign.BmstruckFeign.url}")
+public interface BmstruckFeign {
+
+    @PostMapping("/api/v1/bmstruck/bmstruckdetailsorder/updateBatchDetailsOrder")
+    Map<String, Object> updateBatchDetailsOrder(Map<String, Object> map);
+
+
+}
+
+

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.java

@@ -57,6 +57,8 @@ public interface AmsSaleOrderMaterialMapper extends IBaseMapper<AmsSaleOrderMate
     Map<String, Object> getSaleMessage(BigDecimal saleOrderId);
     // 通过承运商id查询单价
     List<Map<String, Object>> getPriceList(BigDecimal carrierId);
+    //通过地址ID查询单价
+    BigDecimal getPriceByPlace(BigDecimal placeId);
     // 查询车序号中的物资
     List<Map<String, Object>> getMaterial(BigDecimal saleOrderMaterialId);
     //更新发站

+ 16 - 4
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -3,15 +3,13 @@ package com.steerinfo.dil.service.impl;
 import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.steerinfo.dil.feign.JoinFeign;
-import com.steerinfo.dil.feign.OtmsFeign;
-import com.steerinfo.dil.feign.RmsFeign;
-import com.steerinfo.dil.feign.TmsTruckFeign;
+import com.steerinfo.dil.feign.*;
 import com.steerinfo.dil.mapper.*;
 import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.*;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -109,6 +107,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     EASCapacityTestUtil easCapacityTestUtil;
 
+    @Autowired
+    BmstruckFeign bmstruckFeign;
+
     @Override
     public List<Map<String, Object>> getSaleOrderInfo(Map<String, Object> map) {
         return amsSaleOrderMapper.getSaleOrderInfo(map);
@@ -1686,6 +1687,17 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
             }
         }
+        try{
+            //修改单价
+            Map<String,Object> data=new HashMap<>();
+            List<Map<String,Object>> mapList = new ArrayList<>();
+            mapValue.put("priceId",DataChange.dataToBigDecimal(amsSaleOrderMaterialMapper.getPriceByPlace(addressid2)));
+            mapList.add(mapValue);
+            data.put("mapList",mapList);
+            bmstruckFeign.updateBatchDetailsOrder(data);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         String addressids="";
         addressids =addressid1+","+addressid2;
         amsSaleOrderMaterial.setShippingAddressIds(addressids);

+ 2 - 0
src/main/resources/application-prod.yml

@@ -24,6 +24,8 @@ openfeign:
      url: ${OTMSFEIGN_URL:172.16.33.166:8038}
    RmsFeign:
      url: ${RMSFEIGN_URL:172.16.33.166:8060}
+   BmstruckFeign:
+     url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
  #正式环境端口
 
 mvc:

+ 8 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMaterialMapper.xml

@@ -956,4 +956,12 @@
     delete from OMSTRUCK_ORDER OO
     where oo.ORDER_ID = #{orderId}
   </delete>
+  <select id="getPriceByPlace" resultType="java.math.BigDecimal">
+    SELECT ACTP.PRICE_ID    AS "priceId"
+    FROM AMS_CONTRACT_TRANSPORT_PRICE ACTP
+    WHERE ACTP.PLACE_ID = #{placeId}
+      AND ACTP.DELETED = 0
+    ORDER BY ACTP.PRICE_VALUE DESC
+      FETCH NEXT 1 ROWS ONLY
+  </select>
 </mapper>