'合并火运'

pom.xml

@@ -105,13 +105,13 @@
                 <artifactId>generator-maven-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
-                    <user>DIL0901</user>
-                    <password>st#0901</password>
+                    <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
+                    <user>dil</user>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>BMSTRAIN_SETTLEMENT</param><!--运力-->
+<!--                        <param>BMSTRAIN_SETTLEMENT</param>&lt;!&ndash;运力&ndash;&gt;-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -115,7 +115,7 @@ public class BmstrainSettlementController extends BaseRESTfulController {
     })
     @PostMapping("/selectTrainSettlement/{settlementId}")
     public RESTfulResult selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
-        BmstrainSettlement bmstrainSettlement = bmstrainSettlementService.selectTrainSettlement(settlementId);
+        List<Map<String,Object>> bmstrainSettlement = bmstrainSettlementService.selectTrainSettlement(settlementId);
         return success(bmstrainSettlement);
     }
 

src/main/java/com/steerinfo/dil/feign/JoinApiFeign.java

@@ -0,0 +1,35 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/10 9:02
+ * @Version:V2.0
+ */
+@FeignClient(value = "DAL-DAZHOU-JOIN-API",url = "https://172.16.33.161:8066")
+public interface JoinApiFeign {
+    /**
+     * 采购火运详单接口
+     * @param statementId
+     * @return
+     */
+    @PostMapping("api/v1/join/bmstraindetailsorder/getPurchaseTrainDetailsOrder")
+    List<Map<String,Object>> getPurchaseTrainDetailsOrder(@RequestParam("statementId") Integer statementId);
+
+    /**
+     * 采购火运账单接口
+     * @param statementId
+     * @return
+     */
+    @PostMapping("api/v1/join/bmstrainstatement/getTrainStatement")
+    Map<String,Object> getTrainStatement(@RequestParam("statementId") Integer statementId);
+
+
+}

src/main/java/com/steerinfo/dil/mapper/BmstrainSettlementMapper.java

@@ -27,5 +27,5 @@ public interface BmstrainSettlementMapper extends IBaseMapper<BmstrainSettlement
      * @param settlementId
      * @return
      */
-    BmstrainSettlement selectTrainSettlement(BigDecimal settlementId);
+    List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId);
 }

src/main/java/com/steerinfo/dil/service/IBmstrainSettlementService.java

@@ -25,7 +25,7 @@ public interface IBmstrainSettlementService {
      * @param settlementId
      * @return
      */
-    BmstrainSettlement selectTrainSettlement(BigDecimal settlementId);
+    List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId);
 
     /**
      * 修改火运结算

src/main/java/com/steerinfo/dil/service/impl/BmstrainSettlementServiceImpl.java

@@ -37,7 +37,7 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
      * @return
      */
     @Override
-    public BmstrainSettlement selectTrainSettlement(BigDecimal settlementId) {
+    public List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId) {
         return bmstrainSettlementMapper.selectTrainSettlement(settlementId);
     }
 
@@ -78,6 +78,7 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
         bmstrainSettlement.setInsertUsername("admin");
         bmstrainSettlement.setUpdateUsername("admin");
         bmstrainSettlement.setInsertUpdateRemark("无");
+        bmstrainSettlement.setDeleted(new BigDecimal(0));
         return bmstrainSettlementMapper.insertSelective(bmstrainSettlement);
     }
 

src/main/java/com/steerinfo/dil/service/impl/BmstrainStatementServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.JoinApiFeign;
 import com.steerinfo.dil.mapper.BmstrainStatementMapper;
 import com.steerinfo.dil.model.BmstrainDetailsOrder;
 import com.steerinfo.dil.model.BmstrainDetailsStatement;
@@ -8,6 +9,7 @@ import com.steerinfo.dil.service.IBmstrainStatementService;
 import com.steerinfo.dil.util.NoUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -32,9 +34,12 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
     BmstrainDetailsStatementServiceImpl bmstrainDetailsStatementService;
     @Autowired
     NoUtil noUtil;
+    @Autowired
+    JoinApiFeign joinApiFeign;
 
     /**
      * 查询最大id
+     *
      * @return
      */
     @Override
@@ -44,6 +49,7 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
 
     /**
      * 展示账单列表
+     *
      * @param mapValue
      * @return
      */
@@ -51,41 +57,43 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
     public List<Map<String, Object>> getTrainStatementList(Map<String, Object> mapValue) {
         List<Map<String, Object>> listMap = bmstrainStatementMapper.getTrainStatementList(mapValue);
         // 将下浮后金额及保证金存入进map
-        for (Map<String,Object> map : listMap) {
+        for (Map<String, Object> map : listMap) {
             BigDecimal statementTotalAmount = (BigDecimal) map.get("statementTotalAmount");
             Double floatAmount = statementTotalAmount.doubleValue() * 0.8;
             Double maginAmount = statementTotalAmount.doubleValue() * 0.2;
             DecimalFormat df = new DecimalFormat("0.00");
             String statementFloatAmount = df.format(floatAmount);
             String statementMaginAmount = df.format(maginAmount);
-            map.put("statementFloatAmount",statementFloatAmount);
-            map.put("statementMaginAmount",statementMaginAmount);
+            map.put("statementFloatAmount", statementFloatAmount);
+            map.put("statementMaginAmount", statementMaginAmount);
         }
         return listMap;
     }
 
     /**
      * 生成账单
-     * @param mapList
+     *
+     * @param mapLists
      * @return
      */
+    @Transactional
     @Override
-    public int insertSelective(List<Map<String,Object>> mapList) {
+    public int insertSelective(List<Map<String, Object>> mapLists) {
         BmstrainStatement bmstrainStatement = new BmstrainStatement();
-            // 设置主键
-            BigDecimal statementId = selectMaxId();
-            bmstrainStatement.setStatementId(statementId);
-            // 设置账单编号
-            String statementNo = noUtil.setResultNo("HYZD", statementId);
-            bmstrainStatement.setStatementNo(statementNo);
-            bmstrainStatement.setStatementShipperId(new BigDecimal(1));
-            Double totalAmount = new Double(0);
-            for (int i = 0;i < mapList.size();i++) {
-                Map<String,Object> map = mapList.get(i);
-                Double detailsAmount = (Double) map.get("detailsAmount");
-                totalAmount += detailsAmount;
-                // 新增关系
-                BmstrainDetailsStatement bmstrainDetailsStatement = new BmstrainDetailsStatement();
+        // 设置主键
+        BigDecimal statementId = selectMaxId();
+        bmstrainStatement.setStatementId(statementId);
+        // 设置账单编号
+        String statementNo = noUtil.setResultNo("HYZD", statementId);
+        bmstrainStatement.setStatementNo(statementNo);
+        bmstrainStatement.setStatementShipperId(new BigDecimal(1));
+        Double totalAmount = new Double(0);
+        for (int i = 0; i < mapLists.size(); i++) {
+            Map<String, Object> map = mapLists.get(i);
+            Double detailsAmount = (Double) map.get("detailsAmount");
+            totalAmount += detailsAmount;
+            // 新增关系
+            BmstrainDetailsStatement bmstrainDetailsStatement = new BmstrainDetailsStatement();
             bmstrainDetailsStatement.setDetailsStatementId(bmstrainDetailsStatementService.selectMaxId());
             BigDecimal detailsId = new BigDecimal((Integer) map.get("detailsId"));
             bmstrainDetailsStatement.setDetailsId(detailsId);
@@ -110,11 +118,17 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
         bmstrainStatement.setUpdateTime(new Date());
         bmstrainStatement.setUpdateUsername("admin");
         bmstrainStatement.setInsertUpdateRemark("无");
-        return bmstrainStatementMapper.insertSelective(bmstrainStatement);
+        int code = bmstrainStatementMapper.insertSelective(bmstrainStatement);
+        // 调用金蝶接口
+        List<Map<String, Object>> mapList = joinApiFeign.getPurchaseTrainDetailsOrder(statementId.intValue());
+        Map<String, Object> mapValue = joinApiFeign.getTrainStatement(statementId.intValue());
+        mapValue.put("mapList", mapList);
+        return code;
     }
 
     /**
-     *  展示账单中的详单
+     * 展示账单中的详单
+     *
      * @param mapValue
      * @return
      */
@@ -125,6 +139,7 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
 
     /**
      * 展示火运实绩
+     *
      * @param mapValue
      * @return
      */

src/main/resources/application-dev.yml

@@ -1,9 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: dil
+    username: Dil123789
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-bmstrain-api-dev
-
+    name: dil-bmstrain-api-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: dil
+    username: Dil123789
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-bmstrain-api-dev

src/main/resources/bootstrap.yml

@@ -20,7 +20,11 @@ openfeign:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@discovery.steerinfo.com/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+  instance:
+    prefer-ip-address: true
+    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 genxml:
   pth: com/a