解决代码冲突

pom.xml

@@ -338,17 +338,21 @@
 
     <profiles>
         <profile>
-            <id>pdy</id>
+            <id>dev</id>
             <properties>
-                <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>pdy</profiles.active>
+                <profiles.active>dev</profiles.active>
                 <nacos.server>10.10.10.230:8848</nacos.server>
-                <nacos.namespace>sckw_pdy</nacos.namespace>
+                <nacos.namespace>sckw-service-platform-dev</nacos.namespace>
+            </properties>
+        </profile>
+        <!--测试环境-->
+        <profile>
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+                <nacos.server>10.10.10.224:8848</nacos.server>
+                <nacos.namespace>sckw-service-platform</nacos.namespace>
             </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
     </profiles>
     <build>

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CarWaybillEnum.java

@@ -37,7 +37,7 @@ public enum CarWaybillEnum {
     /**
      * 已核-通过
      */
-    APPROVAL_PASS(8, "approvalCompleted", "8", "已核单"),
+    APPROVAL_PASS(8, "approvalPass", "8", "已核单"),
     /**
      * 拒接单
      */
@@ -53,7 +53,7 @@ public enum CarWaybillEnum {
     /**
      * 已核单-不通过
      */
-    APPROVAL_NO_PASS(12, "revoked", "11", "已撤销"),
+    APPROVAL_NO_PASS(12, "revoked", "12", "已撤销"),
     ;
 
     private final Integer code;

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -167,7 +167,7 @@ public class SckwLogisticsOrder {
     /**
      * 业务状态
      */
-    private Integer status;
+    private String status;
 
     /**
      * 企业id

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwTransportService.java

@@ -89,6 +89,7 @@ public class KwTransportService {
      */
     public HttpResult getWaybillDriverDetail(Long id, String type) {
         HttpResult result = new HttpResult();
+
         /**
          * 当前司机端页面 页面【计划】=1；【出车】=2；【执行】=3；【完结】=4
          * 计划:对应运单状态的[待接单]
@@ -96,6 +97,7 @@ public class KwTransportService {
          * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
          * 完结: 对应[已卸货]、[已核单]
          * */
+
         List<Long> status = new ArrayList<>();
         if (String.valueOf(NumberConstant.ONE).equals(type)) {
             status.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
@@ -108,7 +110,7 @@ public class KwTransportService {
             status.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
         } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
             status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            status.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         } else {
             result.setMsg("类型错误");
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrder.java

@@ -26,6 +26,11 @@ public class KwtLogisticsOrder implements Serializable {
      */
     private Long entId;
 
+    /**
+     * 物流订单类型（1 贸易订单生成物流订单、2 自建物流订单）
+     */
+    private String type;
+
     /**
      * 交易订单id（kwo_trade_order）
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -141,7 +141,7 @@ public class AcceptCarriageOrderService {
     }
 
     /**
-     * 承运订单分包托运
+     * 承运订单-分包托运
      *
      * @param bo
      * @return
@@ -494,7 +494,7 @@ public class AcceptCarriageOrderService {
      * 分包托运-承运订单-主体
      * @param bo    页面填写分包数据
      * @param lOrderNo  当前分包物流订单编号
-     * @param order 父级物流订单数据
+     * @param order 当前物流订单数据
      * @param orderId   当前订单主键id
      * @param pids  组装的pids
      * @param orderStatus   当前单据状态
@@ -505,8 +505,9 @@ public class AcceptCarriageOrderService {
                                                  Long orderId, String pids, Integer orderStatus,KwtLogisticsOrder logisticsOrder) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
-        order.setTOrderId(order.getTOrderId());
-        order.setTOrderNo(order.getTOrderNo());
+        order.setType(logisticsOrder.getType());
+        order.setTOrderId(logisticsOrder.getTOrderId());
+        order.setTOrderNo(logisticsOrder.getTOrderNo());
         order.setLOrderNo(lOrderNo);
         //分包时,存放分包上级id
         order.setPid(Long.parseLong(bo.getLOrderId()));
@@ -529,7 +530,7 @@ public class AcceptCarriageOrderService {
         order.setStartTime(bo.getShipmentsDateTime());
         order.setEndTime(bo.getReceiveGoodsDateTime());
         order.setRemark(bo.getRemark());
-        order.setPayment(order.getPayment());
+        order.setPayment(Long.parseLong(bo.getPayment()));
         order.setTaxRate(new BigDecimal(bo.getTaxRate()));
         order.setCreateBy(LoginUserHolder.getUserId());
         order.setCreateTime(new Date());
@@ -545,8 +546,6 @@ public class AcceptCarriageOrderService {
         order.setIgnoreAmount(decimal);
         order.setDeficitPrice(decimal);
         order.setDeficitAmount(decimal);
-        order.setTOrderId(logisticsOrder.getTOrderId());
-        order.setTOrderNo(logisticsOrder.getTOrderNo());
         kwtLogisticsOrderMapper.insert(order);
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/DriverService.java

@@ -118,7 +118,7 @@ public class DriverService {
         top2.setValue(String.valueOf(NumberConstant.THREE));
         status.clear();
         status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-        status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+        status.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         TableTops top3 = waybillOrderMapper.statistics(id, status);
         top3.setName("完结");
         top3.setValue(String.valueOf(NumberConstant.FOUR));
@@ -164,10 +164,10 @@ public class DriverService {
             loopStatus.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
         } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
             tripStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            tripStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
 
             loopStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            loopStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         } else {
             result.setMsg("类型错误");
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -18,12 +18,11 @@ import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
@@ -626,7 +625,7 @@ public class KwtWaybillOrderService {
         lOrder.set_id(order.getId());
         lOrder.setLOrderId(order.getId());
         lOrder.setEntrustAmount(order.getEntrustAmount());
-        lOrder.setStatus(order.getStatus());
+        lOrder.setStatus(String.valueOf(order.getStatus()));
         lOrder.setUpdateTime(order.getUpdateTime());
         lOrder.setUpdateBy(order.getUpdateBy());
         //rabbitMq业务汇总数据发送/消费对象

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -176,7 +176,7 @@ public class WaybillManagementService {
         statuses.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
         statuses.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
         statuses.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
-        statuses.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode());
+        statuses.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         // 初始化各状态
         List<WaybillStatusVO> statusVOS = new ArrayList<>();
         statuses.forEach(e -> {

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -4,6 +4,7 @@
     <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrder">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="type" jdbcType="BIGINT" property="type"/>
         <result column="t_order_id" jdbcType="BIGINT" property="tOrderId"/>
         <result column="t_order_no" jdbcType="VARCHAR" property="tOrderNo"/>
         <result column="l_order_no" jdbcType="VARCHAR" property="lOrderNo"/>
@@ -40,7 +41,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         id
-        , ent_id, t_order_id, t_order_no, l_order_no, pid,pids, settlement_cycle, price, price_type,billing_mode,
+        , ent_id, t_order_id,type, t_order_no, l_order_no, pid,pids, settlement_cycle, price, price_type,billing_mode,
     amount, unit, loss, loss_unit, goods_price, goods_price_unit, start_time, end_time,
     subcontract_amount, entrust_amount, unload_amount, load_amount, ignore_amount, deficit_amount,
     deficit_price, payment, tax_rate, remark, `status`, create_by, create_time, update_by,