承运订单/托运订单-详情数据增加翻译字段

sckw-modules/sckw-report/src/main/resources/bootstrap.yml

@@ -5,9 +5,9 @@ spring:
   application:
     name: sckw-report
   profiles:
-    active: @profiles.active@
+#    active: @profiles.active@
 #    active: test
-#    active: ${DEPLOY_MODE:test}
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/AcceptCarriageOrderVO.java

@@ -235,4 +235,19 @@ public class AcceptCarriageOrderVO /*extends PageRequest*/ {
      */
     private String goodsPriceUnit;
 
+    /**
+     * 装货量
+     */
+    private BigDecimal loadAmount;
+
+    /**
+     * 剩余量
+     */
+    private BigDecimal ignoreAmount;
+
+    /**
+     * 卸货量
+     */
+    private BigDecimal unloadAmount;
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/OrderDetailVO.java

@@ -17,6 +17,10 @@ public class OrderDetailVO {
      * 计费方式
      */
     private String billingMode;
+    /**
+     * 计费方式-label
+     */
+    private String billingModeLabel;
     /**
      * 承运单位id
      */
@@ -100,6 +104,12 @@ public class OrderDetailVO {
      * 结算周期
      */
     private String settlementCycle;
+
+    /**
+     * 结算周期
+     */
+    private String settlementCycleLabel;
+
     /**
      * 备注
      */

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

@@ -192,7 +192,15 @@ public class TransportCommonService {
         orderDetailVO.setUnloadPhone(unloadOrderAddress.getPhone());
         orderDetailVO.setUnloadAddressDetail(unloadOrderAddress.getDetailAddress());
         orderDetailVO.setSettlementCycle(logisticsOrder.getSettlementCycle() == null ? null : String.valueOf(logisticsOrder.getSettlementCycle()));
+        if (logisticsOrder.getSettlementCycle() != null) {
+            Map<String, SysDictResDto> dtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.SETTLEMENT_CYCLE.getType());
+            orderDetailVO.setSettlementCycleLabel(dtoMap.isEmpty() ? null : dtoMap.get(String.valueOf(logisticsOrder.getSettlementCycle())).getLabel());
+        }
         orderDetailVO.setBillingMode(logisticsOrder.getBillingMode());
+        if (logisticsOrder.getBillingMode() != null) {
+            Map<String, SysDictResDto> dictResDtoMap = remoteSystemService.queryDictMapByType(DictTypeEnum.CHARGING_TYPE.getType());
+            orderDetailVO.setBillingModeLabel(dictResDtoMap.isEmpty() ? null : dictResDtoMap.get(logisticsOrder.getBillingMode()).getLabel());
+        }
         orderDetailVO.setScheduleStartTime(logisticsOrder.getStartTime() == null ? null : logisticsOrder.getStartTime());
         orderDetailVO.setScheduleEndTime(logisticsOrder.getEndTime() == null ? null : logisticsOrder.getEndTime());
         orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : String.valueOf(logisticsOrder.getLoadAmount()));
@@ -242,7 +250,7 @@ public class TransportCommonService {
                     .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
-            updateOrderTrack(logisticsOrder.getId(),orderDto.getRemark(),LogisticsOrderEnum.CANCEL_ORDER);
+            updateOrderTrack(logisticsOrder.getId(), orderDto.getRemark(), LogisticsOrderEnum.CANCEL_ORDER);
             //mongodb更新
             SckwLogisticsOrder order = new SckwLogisticsOrder();
             order.set_id(logisticsOrder.getId());
@@ -286,7 +294,7 @@ public class TransportCommonService {
                     .set(KwtLogisticsOrder::getStatus, LogisticsOrderEnum.CANCEL_ORDER.getCode())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId())
                     .set(KwtLogisticsOrder::getUpdateTime, new Date()));
-            updateOrderTrack(logisticsOrder.getId(),orderDto.getRemark(),LogisticsOrderEnum.CANCEL_ORDER);
+            updateOrderTrack(logisticsOrder.getId(), orderDto.getRemark(), LogisticsOrderEnum.CANCEL_ORDER);
             /**mongodb更新*/
             //父级
             SckwLogisticsOrder sckwLogisticsOrder = new SckwLogisticsOrder();
@@ -326,11 +334,12 @@ public class TransportCommonService {
 
     /**
      * 根据物流订单修改物流状态表
+     *
      * @param id
      * @param remark
      * @param logisticsOrderEnum
      */
-    private void updateOrderTrack(Long id,String remark,LogisticsOrderEnum logisticsOrderEnum) {
+    private void updateOrderTrack(Long id, String remark, LogisticsOrderEnum logisticsOrderEnum) {
         KwtLogisticsOrderTrack orderTrack = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
                 .eq(KwtLogisticsOrderTrack::getLOrderId, id)
                 .eq(KwtLogisticsOrderTrack::getStatus, logisticsOrderEnum.getCode())