Merge remote-tracking branch 'origin/dev' into dev

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -68,13 +68,13 @@ public class AuthServiceImpl implements IAuthService {
         @Override
         public void run() {
             //存基础信息
-            SaveBaseToCache(loginResVo);
+            saveBaseToCache(loginResVo);
 
             //存菜单权限
-            SaveToCache(loginResVo);
+            saveToCache(loginResVo);
 
             //存登录记录信息
-            SaveLoginInfo(loginResVo);
+            saveLoginInfo(loginResVo);
         }
 
 
@@ -84,7 +84,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveBaseToCache(LoginResVo loginResVo) {
+        private void saveBaseToCache(LoginResVo loginResVo) {
             //存用户登录信息
             saveUserLoginInfo();
 
@@ -147,7 +147,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveToCache(LoginResVo loginResVo) {
+        private void saveToCache(LoginResVo loginResVo) {
             //存权限菜单
             long id = loginResVo.getId();
             List<UserAccessMenuInfoResDto> userAccessMenuInfo = remoteUserService.queryUserAccessMenu(id);
@@ -173,7 +173,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveLoginInfo(LoginResVo loginResVo) {
+        private void saveLoginInfo(LoginResVo loginResVo) {
             long userId = loginResVo.getId();
             UserLoginReqDto currentDayLogin = remoteUserService.currentDayLogin(userId);
             UserLoginReqDto userLoginReqDto = new UserLoginReqDto();
@@ -411,13 +411,13 @@ public class AuthServiceImpl implements IAuthService {
         @Override
         public void run() {
             //司机信息
-            SaveDriverToCache(loginBase, driver);
+            saveDriverToCache(loginBase, driver);
 
             //用户信息
-            SaveUserToCache(loginBase, user);
+            saveUserToCache(loginBase, user);
 
             //企业信息
-            SaveEntToCache(enterprise);
+            saveEntToCache(enterprise);
         }
 
         /**
@@ -426,7 +426,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveEntToCache(EntCacheResDto ent) {
+        private void saveEntToCache(EntCacheResDto ent) {
             if (ent == null) {
                 return;
             }
@@ -441,7 +441,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveDriverToCache(LoginBase loginBase, RDriverDetailVo driver) {
+        private void saveDriverToCache(LoginBase loginBase, RDriverDetailVo driver) {
             if (driver == null) {
                 return;
             }
@@ -468,7 +468,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/7/3
          */
-        private void SaveUserToCache(LoginBase loginBase, KwsUserResDto user) {
+        private void saveUserToCache(LoginBase loginBase, KwsUserResDto user) {
             if (user == null) {
                 return;
             }
@@ -500,7 +500,7 @@ public class AuthServiceImpl implements IAuthService {
             RedissonUtils.putString(key, JSON.toJSONString(loginUserInfo), Global.APP_TOKEN_EXPIRE);
 
             //存缓存请求地址
-            SaveMenusToCache(user);
+            saveMenusToCache(user);
         }
 
         /**
@@ -509,7 +509,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveMenusToCache(KwsUserResDto loginResVo) {
+        private void saveMenusToCache(KwsUserResDto loginResVo) {
             //存权限菜单
             long id = loginResVo.getId();
             List<UserAccessMenuInfoResDto> userAccessMenuInfo = remoteUserService.queryUserAccessMenu(id);
@@ -535,7 +535,7 @@ public class AuthServiceImpl implements IAuthService {
          * @author: czh
          * @date: 2023/6/28
          */
-        private void SaveLoginInfo(LoginResVo loginResVo) {
+        private void saveLoginInfo(LoginResVo loginResVo) {
             long userId = loginResVo.getId();
             UserLoginReqDto currentDayLogin = remoteUserService.currentDayLogin(userId);
             UserLoginReqDto userLoginReqDto = new UserLoginReqDto();

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/StringUtils.java

@@ -717,7 +717,7 @@ public class StringUtils {
             return str;
         }
         // cannot be longer than the char array
-        final int newCodePoints[] = new int[strLen];
+        final int [] newCodePoints = new int[strLen];
         int outOffset = 0;
         // copy the first codepoint
         newCodePoints[outOffset++] = newCodePoint;

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/config/easyexcel/CustomCellWeightWeightConfig.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
@@ -34,7 +35,7 @@ public class CustomCellWeightWeightConfig extends AbstractColumnWidthStyleStrate
         if (needSetWidth) {
             Map<Integer, Integer> maxColumnWidthMap = CACHE.get(writeSheetHolder.getSheetNo());
             if (maxColumnWidthMap == null) {
-                maxColumnWidthMap = new HashMap<>();
+                maxColumnWidthMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
                 CACHE.put(writeSheetHolder.getSheetNo(), maxColumnWidthMap);
             }
 

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -4,6 +4,7 @@ package com.sckw.excel.utils;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import com.sckw.core.exception.BusinessException;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.StringUtils;
 import org.springframework.util.Assert;
 
@@ -298,7 +299,7 @@ public class DateUtil {
         String endLastWeekTime = DateTime.now().offset(DateField.DAY_OF_YEAR, lastEndOffset)
                 .setField(DateField.HOUR_OF_DAY, 23).setField(DateField.MINUTE, 59)
                 .setField(DateField.SECOND, 59).setField(DateField.MILLISECOND, 0).toString();
-        Map<String, String> maps = new HashMap();
+        Map<String, String> maps = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         maps.put("startUpLastWeekTime", startUpLastWeekTime);
         maps.put("endUpLastWeekTime", endUpLastWeekTime);
         maps.put("startLastWeekTime", startLastWeekTime);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/ContractTrackResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -20,6 +22,8 @@ public class ContractTrackResVo implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/LogisticsBaseInfoResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -81,6 +83,8 @@ public class LogisticsBaseInfoResVo implements Serializable {
     /**
      * 终止时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private String endTime;
 
     /**
@@ -96,6 +100,7 @@ public class LogisticsBaseInfoResVo implements Serializable {
     /**
      * 生效时间
      */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     private Date startTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/TradeBaseInfoResVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.res;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -31,6 +33,7 @@ public class TradeBaseInfoResVo implements Serializable {
     /**
      * 终止时间
      */
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
     private String endTime;
 
     /**
@@ -86,6 +89,8 @@ public class TradeBaseInfoResVo implements Serializable {
     /**
      * 生效时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/CommonBusinessService.java

@@ -173,7 +173,7 @@ public class CommonBusinessService {
         Long entId1 = kwcContractLogisticsUnit.getEntId();
 
         EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(entId1);
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("entName", entCacheResDto1.getFirmName());
         map.put("contract_no", kwcContractLogistics.getContractNo());
         map.put("name", kwcContractLogistics.getName());
@@ -205,7 +205,7 @@ public class CommonBusinessService {
             Long entId1 = kwcContractTradeUnit.getEntId();
 
             EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(entId1);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto1.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -471,7 +471,7 @@ public class KwcContractLogisticsService {
             Map<Integer, KwcContractLogisticsUnit> collect = kwcContractLogisticsUnits.stream().collect(Collectors.toMap(KwcContractLogisticsUnit::getUnitType, Function.identity()));
             KwcContractLogisticsUnit kwcContractLogisticsUnit = collect.get(CooperateTypeEnum.CARRIAGE.getCode());
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwcContractLogisticsUnit.getEntId());
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractLogistics.getContractNo());
             map.put("name", kwcContractLogistics.getName());
@@ -637,7 +637,7 @@ public class KwcContractLogisticsService {
             KwcContractLogisticsUnit kwcContractLogisticsUnit = collect.get(CooperateTypeEnum.CARRIAGE.getCode());
             Long entId = kwcContractLogisticsUnit.getEntId();
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractLogistic.getContractNo());
             map.put("name", kwcContractLogistic.getName());

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -547,7 +547,7 @@ public class KwcContractTradeService {
             Map<Integer, KwcContractTradeUnit> collect = kwcContractTradeUnits.stream().collect(Collectors.toMap(KwcContractTradeUnit::getUnitType, Function.identity()));
             KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.PURCHASER.getCode());
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwcContractTradeUnit.getEntId());
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());
@@ -720,7 +720,7 @@ public class KwcContractTradeService {
             KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.PURCHASER.getCode());
             Long entId = kwcContractTradeUnit.getEntId();
             EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = CollectionUtils.createHashMap();
             map.put("entName", entCacheResDto.getFirmName());
             map.put("contract_no", kwcContractTrade.getContractNo());
             map.put("name", kwcContractTrade.getName());

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -278,37 +278,6 @@ public class KwfTruckController {
         return HttpResult.ok(truckService.queryLocateTrack(params));
     }
 
-    /**
-     * @desc 获取JSON文件数据（暂时使用）
-     * @author zk
-     * @date 2023/8/2
-     **/
-    public String ReadFile(){
-        BufferedReader reader = null;
-        String laststr = "";
-        try{
-            InputStream fileInputStream = getClass().getClassLoader().getResourceAsStream("GPS.json");
-            InputStreamReader inputStreamReader = new InputStreamReader(fileInputStream, "UTF-8");
-            reader = new BufferedReader(inputStreamReader);
-            String tempString = null;
-            while((tempString = reader.readLine()) != null){
-                laststr += tempString;
-            }
-            reader.close();
-        }catch(IOException e){
-            e.printStackTrace();
-        }finally{
-            if(reader != null){
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return laststr;
-    }
-
     /**
      * @param truckNo 车牌号
      * @desc 车牌号查询车辆关联数据

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfDriverCardMapper.java

@@ -12,6 +12,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfDriverCardMapper extends BaseMapper<KwfDriverCard> {
 
+    /**
+     * 新增
+     * @param params 新增参数
+     * @return
+     */
     int insert1(KwfDriverCard params);
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetDriverMapper.java

@@ -19,16 +19,17 @@ public interface KwfFleetDriverMapper extends BaseMapper<KwfFleetDriver> {
     /**
      * 查询
      * @param params 参数
-     * @return
+     * @return 车队关联司机信息
      */
     KwfFleetDriver findByTruckDriver(KwfFleetDriver params);
 
     /**
+     * 查询车队班组
      * @param driverId 司机id
      * @param entId 企业id
-     * @desc 查询车队班组
      * @author zk
      * @date 2023/7/20
+     * @return 车队信息
      **/
     KwfFleet findByFleetDriver(@Param("driverId") Long driverId, @Param("entId") Long entId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfFleetTruckMapper.java

@@ -18,16 +18,17 @@ public interface KwfFleetTruckMapper extends BaseMapper<KwfFleetTruck> {
     /**
      * 查询
      * @param params 参数
-     * @return
+     * @return 车队车辆信息
      */
     KwfFleetTruck findByTruckFleet(KwfFleetTruck params);
 
     /**
+     * 查询车队班组
      * @param truckId 车辆id
      * @param entId 企业id
-     * @desc 查询车队班组
      * @author zk
      * @date 2023/7/20
+     * @return 车队信息
      **/
     KwfFleet findByFleetTruck(@Param("truckId") Long truckId, @Param("entId") Long entId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTransportLicenseMapper.java

@@ -12,5 +12,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfTransportLicenseMapper extends BaseMapper<KwfTransportLicense> {
 
+    /**
+     * 查询道路运输许可证
+     * @param truckId 车辆ID
+     * @author zk
+     * @date 2023/7/20
+     **/
     KwfTransportLicense findByTruckId(Long truckId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckLicenseMapper.java

@@ -12,5 +12,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface KwfTruckLicenseMapper extends BaseMapper<KwfTruckLicense> {
 
+    /**
+     * 查询车辆行驶证信息
+     * @param truckId 车辆ID
+     * @author zk
+     * @date 2023/7/20
+     * @return 车辆行驶证信息
+     **/
     KwfTruckLicense findByTruckId(Long truckId);
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwfTruckMapper.java

@@ -75,14 +75,14 @@ public interface KwfTruckMapper extends BaseMapper<KwfTruck> {
 
     /**
      * 查询企业车辆
-     * @param {entId 企业ID(必填), truckNo 车牌号}
+     * @param params {entId 企业ID(必填), truckNo 车牌号}
      * @return
      */
     List<KwfTruckMonitorVo> findTruckByEnt(Map<String, Object> params);
 
     /**
      * 查询全部车辆
-     * @param {truckNo 车牌号}
+     * @param params {truckNo 车牌号}
      * @return
      */
     List<KwfTruckMonitorVo> findTruckByAll(Map<String, Object> params);

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/MessageService.java

@@ -134,8 +134,8 @@ public class MessageService {
             categoryMap = dictMap.get(DictTypeEnum.MSG_CATEGORY.getType());
             statusMap = dictMap.get(DictTypeEnum.MSG_STATUS.getType());
         } else {
-            categoryMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            categoryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         String clientType = LoginUserHolder.getClientType();
         List<Long> userIds = list.stream().map(MessageListDTO::getCreateBy).toList();

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -60,7 +60,7 @@ public class SmsService {
         if (CollectionUtils.isNotEmpty(dict)) {
             map = dict.get(DictTypeEnum.SEND_SMS_TYPE.getType());
         } else {
-            map = new HashMap<>();
+            map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         String type = param.getType();
         if (Objects.isNull(map.get(type))) {

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: sckw-message
   profiles:
-    active: @profiles.active@
+    active: lfdc
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -323,7 +323,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void submitOrderSendMsg(OrderCheckDTO orderCheck, String orderNo) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("orderNo", orderNo);
         List<UserInfo> userInfos = new ArrayList<>();
         //提交人信息
@@ -372,7 +372,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void sendMsg(MessageEnum msgEnum, Map<String, Object> params, String pcUrl, String appUrl, List<UserInfo> userInfos) {
-        Map<String, String> urls = new HashMap<>();
+        Map<String, String> urls = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         urls.put(ClientTypeEnum.pc.getValue(), pcUrl);
         urls.put(ClientTypeEnum.app.getValue(), appUrl);
         SckwMessage msg = new SckwMessage(msgEnum);
@@ -629,14 +629,14 @@ public class KwoTradeOrderService {
                         DictTypeEnum.DELIVERY_TYPE.getType(), DictTypeEnum.TORDER_SOURCE.getType(), DictTypeEnum.TORDER_STATUS.getType(),
                         DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.TAX_RATE.getType(),
                         DictTypeEnum.TORDER_UNIT_TYPE.getType(), DictTypeEnum.TORDER_ADDRESS_TYPE.getType(), DictTypeEnum.ADDRESS_TYPE.getType()));
-        Map<String, String> tradeMap = new HashMap<>();
-        Map<String, String> pickupMap = new HashMap<>();
-        Map<String, String> deleveryMap = new HashMap<>();
-        Map<String, String> sourceMap = new HashMap<>();
-        Map<String, String> statusMap = new HashMap<>();
-        Map<String, String> prodcutNameMap = new HashMap<>();
-        Map<String, String> unitMap = new HashMap<>();
-        Map<String, String> taxRateMap = new HashMap<>();
+        Map<String, String> tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> deleveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> prodcutNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         Map<String, String> orderUnitMap, orderAddressMap, addressMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             tradeMap = dict.get(DictTypeEnum.TRADE_TYPE.getType());
@@ -651,9 +651,9 @@ public class KwoTradeOrderService {
             orderAddressMap = dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
             addressMap = dict.get(DictTypeEnum.ADDRESS_TYPE.getType());
         } else {
-            orderUnitMap = new HashMap<>();
-            orderAddressMap = new HashMap<>();
-            addressMap = new HashMap<>();
+            orderUnitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            orderAddressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            addressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         //订单基本信息
         OrderDetailRes detail = BeanUtils.copyProperties(order, OrderDetailRes.class);
@@ -1073,7 +1073,7 @@ public class KwoTradeOrderService {
      * @return: void
      */
     private void rejectOrderSendMsg(List<KwoTradeOrderUnit> units, KwoTradeOrder order) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("orderNo", order.getTOrderNo());
         Map<String, KwoTradeOrderUnit> unitMap = units.stream().collect
                 (Collectors.toMap(KwoTradeOrderUnit::getUnitType, Function.identity()));

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -99,16 +99,16 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRADE_TYPE.getType(), DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()));
         Map<String, String> productNameMap, tradeMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         TransportDemandDetailRes res = BeanUtils.copyProperties(transportDemand, TransportDemandDetailRes.class);
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), res.getGoodsType());
@@ -236,15 +236,15 @@ public class KwoTransportDemandService {
         Map<String, String> productNameMap, tradeMap, statusMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<TransportDemandListRes> result = Lists.newArrayList();
         list.forEach(e -> {
@@ -376,13 +376,13 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType()));
         Map<String, String> productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         List<TransportDemandExport> result = Lists.newArrayList();
         demands.forEach(e -> {
@@ -529,13 +529,13 @@ public class KwoTransportDemandService {
                 DictTypeEnum.TRADE_TYPE.getType()));
         Map<String, String> productNameMap, tradeMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
         }
         List<TransportDemandSquaresListRes> result = Lists.newArrayList();
         list.forEach(e -> {

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwpWantBuyService.java

@@ -116,15 +116,15 @@ public class KwpWantBuyService {
         Map<String, String> tradeMap, productNameMap, goodsStatusMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             productNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             goodsStatusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.GOODS_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.GOODS_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            goodsStatusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         // 对求购列表进行数据处理
         res.forEach(e -> {
@@ -175,16 +175,16 @@ public class KwpWantBuyService {
                 DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.WANT_BUY_STATUS.getType()));
         Map<String, String> tradeMap, productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         //把查询出来的集合wantBuyTradings里面对的tranding 转成字符串放在String里面
         wantBuyDto.forEach(wantBuySelectRes -> {
@@ -362,19 +362,19 @@ public class KwpWantBuyService {
                 DictTypeEnum.WANT_BUY_STATUS.getType(), DictTypeEnum.TORDER_ADDRESS_TYPE.getType(), DictTypeEnum.TRADE_TYPE.getType()));
         Map<String, String> productNameMap, wantBuyStatusMap, orderAddressMap, tradeMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            wantBuyStatusMap = new HashMap<>();
-            orderAddressMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            wantBuyStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            orderAddressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             wantBuyStatusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
             orderAddressMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TORDER_ADDRESS_TYPE.getType());
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
         }
         List<SysDictResDto> types = remoteSystemService.queryDictFrontAll(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), responseData.getGoodsType());
         if (CollectionUtils.isNotEmpty(types)) {
@@ -564,16 +564,16 @@ public class KwpWantBuyService {
                 DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.WANT_BUY_STATUS.getType()));
         Map<String, String> tradeMap, productNameMap, statusMap;
         if (CollectionUtils.isEmpty(dict)) {
-            tradeMap = new HashMap<>();
-            productNameMap = new HashMap<>();
-            statusMap = new HashMap<>();
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             tradeMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.TRADE_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.TRADE_TYPE.getType());
             productNameMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             statusMap = CollectionUtils.isEmpty(dict.get(DictTypeEnum.WANT_BUY_STATUS.getType())) ?
-                    new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
+                    new HashMap<>(Global.NUMERICAL_SIXTEEN) : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         List<WantBuyExport> result = new ArrayList<>();
         wantBuyDto.forEach(e -> {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/JumpUrlConfig.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.model;
 
+import com.sckw.core.model.constant.Global;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -29,12 +30,12 @@ public class JumpUrlConfig {
     public Map<String, String> getMapUrl(String key) {
         JumpUrl jumpUrl = url.get(key);
         if (Objects.nonNull(jumpUrl)) {
-            return new HashMap<>() {{
+            return new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                 put("pc", jumpUrl.getPc());
                 put("app", jumpUrl.getApp());
             }};
         }
-        return new HashMap<>();
+        return new HashMap<>(Global.NUMERICAL_SIXTEEN);
     }
 
 

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerLogisticsService.java

@@ -199,13 +199,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(idNo.id(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", idNo.no());
             put("name", logisticsReq.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_CARRIER);
         //推送系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", idNo.no());
             put("name", logisticsReq.getName());
@@ -449,13 +449,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(id, LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_REVOCATION_CARRIER);
         //推送系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -501,13 +501,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(ledgerReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_BACK_CARRIER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -543,13 +543,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(confirmReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_CONFIRM_SHIPPER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -621,13 +621,13 @@ public class KwpLedgerLogisticsService extends AbsLedger {
         //承运方
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(ledgerReq.getIdLong(), LogisticsUnitType.CARRIER);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
         }}, new UserInfo().setUserId(LoginUserHolder.getUserId()).setEntId(LoginUserHolder.getEntId()), MessageEnum.LEDGER_SUCCESS_CARRIER);
         //推送系统管理员和变更人
-        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendPurchaseBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpLedgerLogistics.getLLedgerNo());
             put("name", kwpLedgerLogistics.getName());
@@ -635,11 +635,11 @@ public class KwpLedgerLogisticsService extends AbsLedger {
 
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", kwpSettlementLogistics.getSlOrderNo());
         }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_CARRIER);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", kwpSettlementLogistics.getSlOrderNo());
         }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_SHIPPER);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpLedgerTradeService.java

@@ -241,6 +241,7 @@ public class KwpLedgerTradeService extends AbsLedger {
             KwpLedgerTrade ledgerTrade = tradeMapper.selectById(tradeSendReq.getId());
             orderCheck(ledgerTrade);
             updateCheck(ledgerTrade.getStatus());
+            kwpLedgerTrade.setTLedgerNo(ledgerTrade.getTLedgerNo());
             kwpLedgerTrade.setUpdateBy(LoginUserHolder.getUserId());
             kwpLedgerTrade.setUpdateTime(LocalDateTime.now());
             tradeMapper.updateById(kwpLedgerTrade);
@@ -251,7 +252,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //校验当前订单是否已存在绑定的对账单
         tradeOrderService.check(ids);
         List<OrderDetailRes> resList = new ArrayList<>();
-        Map<Long, String> map = new HashMap<>();
+        Map<Long, String> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         String trading = tradeSendReq.getTrading();
         for (Long id : ids) {
             OrderDetailRes orderDetailById = tradeOrderInfoService.getOrderDetailById(id);
@@ -378,7 +379,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(idNo.id(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", idNo.no());
             put("name", tradeSendReq.getName());
@@ -386,7 +387,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(idNo.id(), TradeUnitType.SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", idNo.no());
             put("name", tradeSendReq.getName());
@@ -465,7 +466,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(id, TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -473,7 +474,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(id, TradeUnitType.SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -515,7 +516,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -523,7 +524,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -556,7 +557,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(confirmReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -564,7 +565,7 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(confirmReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -647,7 +648,7 @@ public class KwpLedgerTradeService extends AbsLedger {
         //推送消息
         KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.PURCHASE);
         //推送创建人
-        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendCreate(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
@@ -655,18 +656,18 @@ public class KwpLedgerTradeService extends AbsLedger {
 
         //推送系统管理员和变更人
         KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(ledgerReq.getIdLong(), TradeUnitType.SELL);
-        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendSellBoth(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpLedgerTrade.getTLedgerNo());
             put("name", kwpLedgerTrade.getName());
         }}, ledgerReq.getIdLong(), kwpLedgerTradeUnit.getEntId(), MessageEnum.LEDGER_SUCCESS_PURCHASE);
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit.getFirmName());
             put("number", kwpSettlementTrade.getStOrderNo());
         }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_SELL);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", kwpLedgerTradeUnit2.getFirmName());
             put("number", kwpSettlementTrade.getStOrderNo());
         }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_PURCHASE);

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -254,11 +254,11 @@ public class KwpSettlementOfflineService {
         KwpLedgerLogisticsUnit logisticsUnit2 = logisticsUnitService.queryCustomerEnt(settlementLogisticsDto.getLLedgerId(), LogisticsUnitType.CARRIER);
 
         //推送双方系统管理员
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit.getFirmName());
             put("number", settlementLogisticsDto.getSlOrderNo());
         }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_CARRIER);
-        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+        messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
             put("company", logisticsUnit2.getFirmName());
             put("number", settlementLogisticsDto.getSlOrderNo());
         }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SHIPPER);
@@ -406,13 +406,13 @@ public class KwpSettlementOfflineService {
                 KwpLedgerTradeUnit kwpLedgerTradeUnit = tradeUnitService.queryCustomerEnt(byId.getLedgerId(), TradeUnitType.PURCHASE);
                 KwpLedgerTradeUnit kwpLedgerTradeUnit2 = tradeUnitService.queryCustomerEnt(byId.getLedgerId(), TradeUnitType.SELL);
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);
 
                 return "确认回款成功";

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementWalletService.java

@@ -291,11 +291,11 @@ public class KwpSettlementWalletService {
                     // 调用电子钱包进行清分操作
                     walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, price, "2");
                     //推送双方系统管理员
-                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("company", logisticsUnit.getFirmName());
                         put("number", settlementLogisticsDto.getSlOrderNo());
                     }}, logisticsUnit2.getEntId(), MessageEnum.SETTLEMENT_START_CARRIER);
-                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                    messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("company", logisticsUnit2.getFirmName());
                         put("number", settlementLogisticsDto.getSlOrderNo());
                     }}, logisticsUnit.getEntId(), MessageEnum.SETTLEMENT_START_SHIPPER);
@@ -407,11 +407,11 @@ public class KwpSettlementWalletService {
                 walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, price, "2");
 
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
                     put("number", kwpSettlementTrade.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_START_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
                     put("number", kwpSettlementTrade.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_START_PURCHASE);
@@ -571,13 +571,13 @@ public class KwpSettlementWalletService {
                 //对结算单中的总计金额进行清分
                 walletBusinessService.splitMoney(orderNo, uid, filter, channelEnum, byId.getTotalPrice(), "1");
                 //推送双方系统管理员
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit2.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_SELL);
-                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>() {{
+                messageSender.sendManager(LoginUserHolder.getUserId(), new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("company", kwpLedgerTradeUnit2.getFirmName());
-                    put("number", kwpSettlementTrade.getStOrderNo());
+                    put("number", byId.getStOrderNo());
                 }}, kwpLedgerTradeUnit.getEntId(), MessageEnum.SETTLEMENT_CONFIRM_PURCHASE);
 
                 //todo-xcq 调用中台接口

sckw-modules/sckw-payment/src/main/resources/mapper/KwpSettlementTradeMapper.xml

@@ -359,8 +359,8 @@
     <select id="getById" resultType="com.sckw.payment.model.dto.SettlementTradeDto">
         select kst.id,
                kst.status,
-               kst.st_order_no,
-               kst.create_time,
+               kst.st_order_no                                    stOrderNo,
+               kst.create_time                                    createTime,
                kst.receipt_time,
                cast(kst.actual_price as char)                     actualPrice,
                cast(kst.total_price as char)                      totalPrice,

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -207,7 +207,7 @@ public class KwpGoodsService {
         if (CollectionUtils.isNotEmpty(dict)) {
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
         } else {
-            unitMap = new HashMap<>();
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<Long> goodsIds = list.stream().map(KwpGoods::getId).toList();
         Map<Long, List<KwpGoodsPriceRange>> map = kwpGoodsPriceRangeService.getByGoodsIds(goodsIds).stream()
@@ -254,11 +254,11 @@ public class KwpGoodsService {
         }
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(),
                 DictTypeEnum.UNIT_TYPE.getType(), DictTypeEnum.TAX_RATE.getType(), DictTypeEnum.GOODS_STATUS.getType(), DictTypeEnum.ADDRESS_TYPE.getType()));
-        Map<String, String> productNameMap = new HashMap<>();
-        Map<String, String> unitMap = new HashMap<>();
-        Map<String, String> taxRateMap = new HashMap<>();
-        Map<String, String> goodsStatusMap = new HashMap<>();
-        Map<String, String> addressMap = new HashMap<>();
+        Map<String, String> productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+        Map<String, String> addressMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(dict)) {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
@@ -695,10 +695,10 @@ public class KwpGoodsService {
             taxRateMap = dict.get(DictTypeEnum.TAX_RATE.getType());
             goodsStatusMap = dict.get(DictTypeEnum.GOODS_STATUS.getType());
         } else {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
-            taxRateMap = new HashMap<>();
-            goodsStatusMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            taxRateMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsStatusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         Map<Long, String> entMap = entList.stream().collect(Collectors.toMap(EntCacheResDto::getId, EntCacheResDto::getFirmName, (k1, k2) -> k1));
         list.forEach(e -> {
@@ -773,14 +773,14 @@ public class KwpGoodsService {
      * @return: void
      */
     private void sendMsg(MessageEnum msgEnum, KwpGoods goods) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("productName", goods.getName());
         //给创建人发消息
         List<UserInfo> userInfos = new ArrayList<>();
         UserInfo createUser = new UserInfo();
         createUser.setUserId(goods.getCreateBy()).setEntId(goods.getEntId());
         userInfos.add(createUser);
-        HashMap<String, String> urlMap = new HashMap<>();
+        HashMap<String, String> urlMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         urlMap.put(ClientTypeEnum.app.getValue(), appGoodsListUrl);
         urlMap.put(ClientTypeEnum.pc.getValue(), pcGoodsListUrl);
         SckwMessage msg = new SckwMessage(msgEnum);
@@ -910,8 +910,8 @@ public class KwpGoodsService {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());
         } else {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         list.forEach(e -> {
             BuildingMaterialsMarketList materials = BeanUtils.copyProperties(e, BuildingMaterialsMarketList.class);

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsStatisticsService.java

@@ -1,6 +1,7 @@
 package com.sckw.product.service;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.product.model.KwpGoods;
@@ -57,8 +58,8 @@ public class KwpGoodsStatisticsService {
                 DictTypeEnum.UNIT_TYPE.getType()));
         Map<String, String> productNameMap, unitMap;
         if (CollectionUtils.isEmpty(dict)) {
-            productNameMap = new HashMap<>();
-            unitMap = new HashMap<>();
+            productNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
             productNameMap = dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType());
             unitMap = dict.get(DictTypeEnum.UNIT_TYPE.getType());

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

@@ -1,6 +1,7 @@
 package com.sckw.report.service;
 
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.model.vo.TableBottom;
 import com.sckw.core.model.vo.TableStatisticRes;
@@ -105,21 +106,21 @@ public class KwOrderService {
         Map<String, String> statusMap, tradeMap, deliveryMap, pickupMap, sourceMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.DELIVERY_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PICKUP_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            statusMap = new HashMap<>();
-            tradeMap = new HashMap<>();
-            deliveryMap = new HashMap<>();
-            pickupMap = new HashMap<>();
-            sourceMap = new HashMap<>();
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            deliveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<OrderListRes> result = new ArrayList<>();
         list.forEach(e -> {
@@ -328,7 +329,7 @@ public class KwOrderService {
         AggregationResults<TableTop> aggregate = mongoTemplate
                 .aggregate(aggregation, SckwTradeOrder.class, TableTop.class);
         List<TableTop> tableTops = aggregate.getMappedResults();
-        Map<Integer, Integer> map = new HashMap<>();
+        Map<Integer, Integer> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(tableTops)) {
             map = tableTops.stream().collect(Collectors.toMap
                     (TableTop::getValue, TableTop::getTotal, (k1, k2) -> k2));
@@ -375,7 +376,7 @@ public class KwOrderService {
         AggregationResults<TradeOrderAppStatisticVO> aggregate = mongoTemplate
                 .aggregate(aggregation, SckwTradeOrder.class, TradeOrderAppStatisticVO.class);
         List<TradeOrderAppStatisticVO> tableTops = aggregate.getMappedResults();
-        Map<Integer, Integer> map = new HashMap<>();
+        Map<Integer, Integer> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(tableTops)) {
             map = tableTops.stream().collect(Collectors.toMap
                     (TradeOrderAppStatisticVO::getValue, TradeOrderAppStatisticVO::getTotal, (k1, k2) -> k2));
@@ -431,21 +432,21 @@ public class KwOrderService {
         Map<String, String> statusMap, pickupMap, deliveryMap, sourceMap, tradeMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             statusMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_STATUS.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_STATUS.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             pickupMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PICKUP_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PICKUP_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             deliveryMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.DELIVERY_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.DELIVERY_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             sourceMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TORDER_SOURCE.getType())) ?
-                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TORDER_SOURCE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             tradeMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.TRADE_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.TRADE_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            statusMap = new HashMap<>();
-            pickupMap = new HashMap<>();
-            deliveryMap = new HashMap<>();
-            sourceMap = new HashMap<>();
-            tradeMap = new HashMap<>();
+            statusMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            pickupMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            deliveryMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            sourceMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            tradeMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<TradeOrderListExport> list = new ArrayList<>();
         orders.forEach(e -> {

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

@@ -2,6 +2,7 @@ package com.sckw.report.service;
 
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.DateUtils;
@@ -214,12 +215,12 @@ public class KwOrderStatisticsService {
         Map<String, String> unitMap, goodsNameMap;
         if (CollectionUtils.isNotEmpty(dict)) {
             unitMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.UNIT_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
             goodsNameMap = CollectionUtils.isNotEmpty(dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType())) ?
-                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>();
+                    dict.get(DictTypeEnum.PRODUCT_NAME_TYPE.getType()) : new HashMap<>(Global.NUMERICAL_SIXTEEN);
         } else {
-            unitMap = new HashMap<>();
-            goodsNameMap = new HashMap<>();
+            unitMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
+            goodsNameMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         }
         List<WorkbenchPurchaseVO> result = new ArrayList<>();
         orders.forEach(e -> {

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -127,7 +127,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             return Collections.emptyMap();
         }
 
-        Map<String, Map<String, String>> map = new HashMap<>();
+        Map<String, Map<String, String>> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         for (String type : list) {
             List<SysDictResDto> sysDictResDtos = queryDictByType(type);
             if (CollectionUtils.isEmpty(sysDictResDtos)) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -398,7 +398,7 @@ public class KwsEnterpriseService {
 
 
         //子公司不用新建机构、角色等，直接返回
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();;
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", kwsEnterprise.getContacts());
         if (Objects.nonNull(reqVo.getEntPid())) {
@@ -540,7 +540,7 @@ public class KwsEnterpriseService {
         }
         commonService.updateEntCertificate(entId, BeanUtils.copyToList(kwsEntCertificates, EntCertificateInfo.class));
 
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = CollectionUtils.createHashMap();
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", LoginUserHolder.getUserName());
         MessageEnum messageEnum;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -56,7 +56,7 @@ public class LogisticsConsignmentController {
     public HttpResult purchaseLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("采购订单传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.purchaseLogisticsConsignment(logisticsConsignmentParam);
+            return logisticsConsignmentService.purchaseLogisticsConsignment(logisticsConsignmentParam,"1");
         } catch (Exception e) {
             OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER);
             log.error("采购订单-物流托运生成托运订单 error :{}", e.getMessage(), e);
@@ -202,7 +202,7 @@ public class LogisticsConsignmentController {
     public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
         log.info("销售订单-物流托运生成托运订单 传递参数信息:{}", JSONObject.toJSONString(logisticsConsignmentParam));
         try {
-            return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam);
+            return logisticsConsignmentService.sellLogisticsConsignment(logisticsConsignmentParam,"2");
         } catch (Exception e) {
             OrderGenerateSeqNoUtils.getSeqNoMinusOne(RedisOrderGenerateEnum.LOGISTICS_ORDER,OrderRuleEnum.LOGISTICS_ORDER);
             log.error("物流托运 error :{}", e.getMessage(), e);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderAddressMapper.java

@@ -6,26 +6,43 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
+/**
+ * @author zk
+ * @desc 车辆运单地址
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderAddressMapper extends BaseMapper<KwtWaybillOrderAddress> {
 
+    /**
+     * 新增
+     * @param params 新增参数
+     * @desc 新增
+     * @author zk
+     * @date 2023/7/20
+     * @return 更新记录数
+     **/
     int insert1(KwtWaybillOrderAddress params);
 
     /**
+     * 查询车辆运单装卸货地址信息
      * @param wOrderId 车辆订单id
      * @param addressType 地址类型（1装货地址、2卸货地址）
      * @desc 查询车辆运单装卸货地址信息
      * @author zk
      * @date 2023/7/20
+     * @return 运单地址信息
      **/
     KwtWaybillOrderAddress findByAddress(@Param("wOrderId") Long wOrderId, @Param("addressType") Integer addressType);
 
     /**
+     * 查询车辆运单装卸货地址CODE
      * @param entId 企业信息
      * @param addressType 地址类型（1装货地址、2卸货地址）
      * @desc 查询车辆运单装卸货地址CODE
      * @author zk
      * @date 2023/7/20
+     * @return 运单地址code
      **/
     List<Integer> findAddressCodeList(@Param("entId") Long entId, @Param("addressType") Integer addressType);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderMapper.java

@@ -15,21 +15,34 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * @author zk
+ * @desc 车辆运单
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
-    int deleteByPrimaryKey(Long id);
-
+    /**
+     * 新增
+     * @param record 新增参数
+     * @desc 新增
+     * @author zk
+     * @date 2023/7/31
+     * @return 新增数量
+     **/
     @Override
     int insert(KwtWaybillOrder record);
 
-    int insertSelective(KwtWaybillOrder record);
-
-    KwtWaybillOrder selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtWaybillOrder record);
-
-    int updateByPrimaryKey(KwtWaybillOrder record);
-
+    /**
+     * 查询车辆信息
+     * @param id 运单ID
+     * @param page 分页参数
+     * @param pageSize 分页参数
+     * @desc 查询车辆信息
+     * @author zk
+     * @date 2023/7/31
+     * @return 销售订单-采购订单-车辆信息
+     **/
     List<OrderCarDTO> selectWaybillOrderCarList(@Param("id") String id, @Param("page") int page, @Param("pageSize") int pageSize);
 
     /**
@@ -38,114 +51,131 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
      * @param statusList
      * @param page
      * @param pageSize
-     * @return
+     * @return 销售订单-采购订单-车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("statusList") List<Integer> statusList , @Param("page") int page, @Param("pageSize") int pageSize);
 
+    /**
+     * 贸易订单对应车辆运单数
+     * @param id 贸易订单ID
+     * @return 关联数量
+     */
     Long selectWaybillOrderCarCount(@Param("id") String id);
 
     /**
      * 根据司机id+定义状态统计
-     *
      * @param id
      * @param status
-     * @return
+     * @return 统计数
      */
     TableTops statistics(@Param("id") Long id, @Param("status") List<Long> status);
 
     /**
      * 根据司机id+运单状态获取物流订单id
-     *
      * @param id
      * @param status
-     * @return
+     * @return 物流订单id
      */
     List<Long> selectDriverOrder(@Param("id") Long id, @Param("status") List<Long> status);
 
     /**
      * 根基运单ID查询关联数据
-     *
      * @param id
-     * @return
+     * @return 订单详情
      */
     WayBillDetailDTO selectWaybillRelate(@Param("id") Long id);
 
     /**
      * 通过物流订单id+车辆运单状态查询是否存在处理中的数据
-     *
      * @param id
      * @param statusList
-     * @return
+     * @return 处理中的数据
      */
     int selectDataByLorderId(@Param("id") String id, @Param("statusList") List<Integer> statusList);
 
     /**
+     * 统计车辆运单
      * @param params {lOrderId 物流订单id, upperlOrderId 下级分包物流订单,belowlOrderId 所属上级分包, loadCountStatus 有效装货状态, unloadCountStatus 有效卸货状态}
      * @desc 统计车辆运单
      * @author zk
      * @date 2023/7/31
+     * @return 统计数据
      **/
     WaybillCountVo findWaybillOrderCount(Map<String, Object> params);
 
     /**
+     * 统计司机任务数(待接单/出车/执行/完结)
      * @param driverId 司机ID
      * @desc 统计司机任务数(待接单/出车/执行/完结)
      * @author zk
      * @date 2023/8/1
+     * @return 统计数据
      **/
     Map<String, Object> findStatisticsCountByDriver(@Param("driverId") Long driverId);
 
     /**
+     * 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @param params {driverId 司机ID, month月份}
      * @desc 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @author zk
      * @date 2023/8/1
+     * @return 统计数据
      **/
     Map<String, BigDecimal> findStatisticsSumByDriver(Map<String, Object> params);
 
     /**
+     * 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @param params {driverId 司机ID, month月份}
      * @desc 统计司机任务数（任务数/委派量/装货量/卸货量/亏吨量/亏吨扣款）
      * @author zk
      * @date 2023/8/1
+     * @return 口亏量
      **/
     BigDecimal deficitLossAmountByDriver(Map<String, Object> params);
 
     /**
+     * 查询司机任务列表-待接单
      * @param params {driverId 司机ID}
      * @desc 查询司机任务列表-待接单
      * @author zk
      * @date 2023/8/1
+     * @return 待接单运单
      **/
     List<WaybillOrderDriverVo> findWaitWaybillOrderByDriver(Map<String, Object> params);
 
     /**
+     * 查询司机任务列表-出车/执行/完结
      * @param params {driverId 司机ID, busStatus 状态 2出车/3执行/4完结, month月份}
      * @desc 查询司机任务列表-出车/执行/完结
      * @author zk
      * @date 2023/8/1
+     * @return 运单数据
      **/
     List<WaybillOrderDriverVo> findOtherWaybillOrderByDriver(Map<String, Object> params);
 
     /**
-     *易订单id查找相关联车辆信息
+     * 易订单id查找相关联车辆信息
      * @param id
-     * @return
+     * @return 车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListNotPage(@Param("id") String id);
 
     /**
-     *贸易订单ids查找相关联车辆信息
+     * 贸易订单ids查找相关联车辆信息
      * @param ids   贸易订单ids
-     * @return
+     * @return 车辆信息
      */
     List<OrderCarDTO> selectWaybillOrderCarListByTradeOrderId(@Param("ids") List<Long> ids);
 
     /**
      * 按状态统计运单
      * @param entId 企业ID
+     * @param createBys 创建人
      * @param statuses 查询状态
-     * @return
+     * @param keyword 关键字
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 统计数据
      */
     Long selectWaybillOrderCountByStatus(
             @Param("entId") Long entId,
@@ -155,13 +185,26 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
             @Param("startDate") String startDate,
             @Param("endDate") String endDate);
 
-    Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId, @Param("type") Integer type, @Param("statusList") List<Long> statusList);
+    /**
+     * 查询订单
+     * @param orderId 订单id
+     * @param type 类型
+     * @param statusList 状态集
+     * @return 订单信息
+     */
+    Map<String,Object> selectOrderByOrderId(@Param("orderId") Long orderId,
+                                            @Param("type") Integer type,
+                                            @Param("statusList") List<Long> statusList);
 
     /**
      * 按装卸量统计运单
      * @param entId 企业ID
+     * @param createBys 创建人
      * @param statuses 查询状态
-     * @return
+     * @param keyword 关键字
+     * @param startDate 开始时间
+     * @param endDate 结束时间
+     * @return 统计数据
      */
     List<WaybillAmountDTO> selectWaybillOrdersByStatus(
             @Param("entId") Long entId,
@@ -172,26 +215,34 @@ public interface KwtWaybillOrderMapper extends BaseMapper<KwtWaybillOrder> {
             @Param("endDate") String endDate
     );
 
-
+    /**
+     * 查询最大运单编号
+     * @param lOrderNo 运单编号
+     * @return 运单编号
+     */
     String getMaxOrderNo(@Param("lOrderNo") String lOrderNo);
 
     /**
+     * 查询车辆运单
      * @param params {driverId 司机ID, truckNo车牌号, busStatus 状态 2出车/3执行/4完结}
      * @desc 查询车辆运单
      * @author zk
      * @date 2023/9/6
+     * @return 运单信息
      **/
     List<KwtWaybillOrder> findWaybillOrder(Map<String, Object> params);
 
-
     /**
      * 托运订单-承运订单-通过单据号根据车牌号分组获取车辆信息统计信息
      * @param ids
      * @param statusList
      * @param page
      * @param pageSize
-     * @return
+     * @return 运单关联司机信息
      */
-    List<OrderCarDTO> selectInvalidWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids, @Param("statusList") List<Integer> statusList , @Param("page") int page, @Param("pageSize") int pageSize);
+    List<OrderCarDTO> selectInvalidWaybillOrderCarListGroupByTruckNo(@Param("ids") List<String> ids,
+                                                                     @Param("statusList") List<Integer> statusList ,
+                                                                     @Param("page") int page,
+                                                                     @Param("pageSize") int pageSize);
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTicketMapper.java

@@ -5,15 +5,22 @@ import com.sckw.transport.model.KwtWaybillOrderTicket;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * @author zk
+ * @desc 车辆运单榜单
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderTicketMapper extends BaseMapper<KwtWaybillOrderTicket> {
 
     /**
+     * 查询车辆运单榜单信息
      * @param wOrderId 车辆订单id
      * @param type 磅单类型（1装货单/2卸货单）
      * @desc 查询车辆运单榜单信息
      * @author zk
      * @date 2023/7/27
+     * @return 榜单信息
      **/
     KwtWaybillOrderTicket findWaybillOrderTicket(@Param("wOrderId") Long wOrderId, @Param("type") Integer type);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTrackMapper.java

@@ -5,27 +5,30 @@ import com.sckw.transport.model.KwtWaybillOrderTrack;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+/**
+ * @author zk
+ * @desc 车辆运单状态记录
+ * @date 2023/10/16
+ */
 @Mapper
 public interface KwtWaybillOrderTrackMapper extends BaseMapper<KwtWaybillOrderTrack> {
-    int deleteByPrimaryKey(Long id);
 
+    /**
+     * 新增运单状态记录
+     * @param record 新增信息
+     * @return 更新记录数
+     */
     @Override
     int insert(KwtWaybillOrderTrack record);
 
-    int insertSelective(KwtWaybillOrderTrack record);
-
-    KwtWaybillOrderTrack selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(KwtWaybillOrderTrack record);
-
-    int updateByPrimaryKey(KwtWaybillOrderTrack record);
-
     /**
+     * 查询车辆运单状态信息
      * @param wOrderId 车辆订单id
      * @param status 状态
      * @desc 查询车辆运单状态信息
      * @author zk
      * @date 2023/7/27
+     * @return 车辆运单状态信息
      **/
     KwtWaybillOrderTrack findWaybillOrderTrack(@Param("wOrderId") Long wOrderId, @Param("status") Integer status);
 }

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

@@ -39,7 +39,7 @@ public class KwtLogisticsOrderUnit implements Serializable {
     private Long entId;
 
     /**
-     * 一级企业id
+     * 一级企业id-存放对方数据
      */
     private Long topEntId;
 

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

@@ -217,7 +217,8 @@ public class AcceptCarriageOrderService {
         if (waitDistributionAmount.compareTo(new BigDecimal("0.00")) == 0) {
             throw new RuntimeException("剩余可分配量为0，不可进行分包操作！");
         }
-        int level = logisticsLevel(logisticsOrder);
+//        int level = logisticsLevel(logisticsOrder);
+        int level = newLogisticsLevel(logisticsOrder);
         long number = logisticsOrderMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrder>()
                         .eq(KwtLogisticsOrder::getDelFlag, NumberConstant.ZERO)
                         .apply(logisticsOrder.getId() != null, "FIND_IN_SET ('" + bo.getLOrderId() + "', pids)").ne(KwtLogisticsOrder::getId, bo.getLOrderId()))
@@ -230,10 +231,8 @@ public class AcceptCarriageOrderService {
          * 需要记录当前分包数据-分包上游数据
          * */
         /**
-         * 判断是否已存在分包【当前分包只允许加上主单一共三级】*/
-        Long count = logisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>()
-                .in(KwtLogisticsOrder::getPids, bo.getLOrderId()));
-        if (count > NumberConstant.TWO) {
+         * 判断是否已存在分包【当前分包只允许加上主单一共四级】*/
+        if (level >= 4) {
             throw new RuntimeException("分包次数已达上限!");
         }
         String pids = logisticsOrder.getPids();
@@ -305,10 +304,10 @@ public class AcceptCarriageOrderService {
         carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
 
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId());
-        commonService.newSendLogisticsOrderToMessage(carriageUnit,checkUnit,  logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
+        commonService.newSendLogisticsOrderToMessage(carriageUnit, checkUnit, logisticsOrder.getLOrderNo(), logisticsOrder.getCreateBy(), logisticsOrder.getEntId(),
                 messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
                 messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT,MessageEnum.NEW_CARRIAGE_ORDER,
+                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER,
                 "1");
 
         //修改父级mongodb数据
@@ -2023,21 +2022,22 @@ public class AcceptCarriageOrderService {
         /**发送信息至消息列表*/
         //托运单位
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getConsignCompanyId()));
+        //承运单位
+        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
         KwtLogisticsOrderUnit consignUnit = new KwtLogisticsOrderUnit();
+        //接收方
         consignUnit.setUnitType(NumberConstant.ONE);
         consignUnit.setEntId(Long.parseLong(orderDTO.getConsignCompanyId()));
-        consignUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
+        consignUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
         consignUnit.setFirmName(orderDTO.getConsignCompany());
-        consignUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
-
-        //承运单位
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(Long.parseLong(orderDTO.getAcceptCompanyId()));
+        consignUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        //发起方
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
         carriageUnit.setUnitType(NumberConstant.TWO);
         carriageUnit.setEntId(Long.parseLong(orderDTO.getAcceptCompanyId()));
-        carriageUnit.setTopEntId(entCacheResDto1 == null ? null : entCacheResDto1.getId());
+        carriageUnit.setTopEntId(entCacheResDto == null ? null : entCacheResDto.getId());
         carriageUnit.setFirmName(orderDTO.getAcceptCompany());
-        carriageUnit.setContactsId(Long.parseLong(orderDTO.getAcceptContactsId()));
+        carriageUnit.setContactsId(Long.parseLong(orderDTO.getConsignContactsId()));
 //        System.out.println("承运订单新建订单-消息列表推送 start");
 //        commonService.publicLogisticsConsignmentPushMessage(consignUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId()
 //                , MessageEnum.CARRIAGE_NEW_LOGISTICS, MessageEnum.CARRIAGE_NEW_LOGISTICS_ORDER);
@@ -2620,6 +2620,12 @@ public class AcceptCarriageOrderService {
         return idArrays.length <= 1 ? Global.NUMERICAL_ONE : (idArrays.length - Global.NUMERICAL_ONE);
     }
 
+    public int newLogisticsLevel(KwtLogisticsOrder logisticsOrder) {
+        String pids = logisticsOrder.getPids();
+        String[] idArrays = StringUtils.isBlank(pids) ? new String[0] : pids.split(Global.COMMA);
+        return idArrays.length <= 1 ? Global.NUMERICAL_ONE : idArrays.length;
+    }
+
     public HttpResult getOrderTrackByOrderId(String orderId, String number) {
         List<KwtLogisticsOrderTrack> list = logisticsOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
                 .eq(KwtLogisticsOrderTrack::getLOrderId, orderId)

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

@@ -336,7 +336,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", pcUrl);
                     put("app", appUrl);
                 }})
@@ -367,7 +367,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", pcUrl);
                     put("app", appUrl);
                 }})
@@ -444,7 +444,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -463,7 +463,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -522,7 +522,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(messageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("app", consignLogisticsOrderUrl);
                     put("pc", carriageLogisticsOrderUrl);
                 }})
@@ -568,7 +568,7 @@ public class CommonService {
             msg.setRequestId(UUIDUtils.get32UUID())
                     .setMessageEnum(consignMessageEnum)
                     .setParams(map)
-                    .setMsgUrls(new HashMap<>() {{
+                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("pc", consignLogisticsOrderUrl);
                         put("app", carriageLogisticsOrderUrl);
                     }})
@@ -616,7 +616,7 @@ public class CommonService {
             msg.setRequestId(UUIDUtils.get32UUID())
                     .setMessageEnum(consignMessageEnum)
                     .setParams(map)
-                    .setMsgUrls(new HashMap<>() {{
+                    .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                         put("pc", consignLogisticsOrderUrl);
                         put("app", carriageLogisticsOrderUrl);
                     }})
@@ -640,7 +640,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(consignMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", consignLogisticsOrderUrl);
                     put("app", carriageLogisticsOrderUrl);
                 }})
@@ -660,7 +660,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(MessageEnum.NEW_CARRIAGE_ORDER)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", consignLogisticsOrderUrl);
                     put("app", carriageLogisticsOrderUrl);
                 }})
@@ -744,7 +744,7 @@ public class CommonService {
         sckwMessage.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(carriageMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl());
                     put("app", messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl());
                 }})
@@ -764,7 +764,7 @@ public class CommonService {
         message.setRequestId(UUIDUtils.get32UUID())
                 .setMessageEnum(consignMessageEnum)
                 .setParams(map)
-                .setMsgUrls(new HashMap<>() {{
+                .setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("pc", messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl());
                     put("app", messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl());
                 }})

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

@@ -131,7 +131,7 @@ public class LogisticsConsignmentService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo) {
+    public HttpResult purchaseLogisticsConsignment(LogisticsConsignmentParam bo, String orderType) {
         HttpResult httpResult = ValidUtil.serviceValid(bo);
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
@@ -140,7 +140,7 @@ public class LogisticsConsignmentService {
         if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
             return HttpResult.error(checked.getMsg());
         }
-        logisticsConsignmentInsert(bo);
+        logisticsConsignmentInsert(bo, orderType);
         return HttpResult.ok();
     }
 
@@ -165,7 +165,7 @@ public class LogisticsConsignmentService {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult sellLogisticsConsignment(LogisticsConsignmentParam bo) {
+    public HttpResult sellLogisticsConsignment(LogisticsConsignmentParam bo, String orderType) {
         HttpResult httpResult = ValidUtil.serviceValid(bo);
         if (HttpStatus.SUCCESS_CODE != httpResult.getCode()) {
             return HttpResult.error(httpResult.getMsg());
@@ -174,11 +174,11 @@ public class LogisticsConsignmentService {
         if (checked.getCode() != HttpStatus.SUCCESS_CODE) {
             return HttpResult.error(checked.getMsg());
         }
-        logisticsConsignmentInsert(bo);
+        logisticsConsignmentInsert(bo, orderType);
         return HttpResult.ok();
     }
 
-    void logisticsConsignmentInsert(LogisticsConsignmentParam bo) {
+    void logisticsConsignmentInsert(LogisticsConsignmentParam bo, String orderType) {
         commonService.getRedisGenerateOrderNo();
         Long count = kwtLogisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>().eq(KwtLogisticsOrder::getTOrderId, bo.getTOrderId()));
         String lOrderNo = OrderGenerateSeqNoUtils.getSeqNo(RedisOrderGenerateEnum.LOGISTICS_ORDER, OrderRuleEnum.LOGISTICS_ORDER, "1", "0", String.valueOf(count + 1));
@@ -228,31 +228,72 @@ public class LogisticsConsignmentService {
             log.info("{}生成物流托运失败!,返回信息:{}", tradeOrder.getTOrderNo(), JSONObject.toJSONString(httpResult));
             throw new BusinessException("{" + tradeOrder.getTOrderNo() + "}生成物流托运失败!" + httpResult.getMsg());
         }
-        /**消息列表*/
-        EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
-        EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+        /**消息列表
+         * 1 采购 2 销售
+         * */
+        String pcConsignUrl = "";
+        String appConsignUrl = "";
+        String pcCarriageUrl = "";
+        String appCarriageUrl = "";
+        String type = "";
+        MessageEnum consignMessageEnum = null;
+        MessageEnum carriageMessageEnum = null;
         //托运单位
         KwtLogisticsOrderUnit checkUnit = new KwtLogisticsOrderUnit();
-
-        checkUnit.setUnitType(1);
-        checkUnit.setFirmName(bo.getCheckCompany());
-        checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
-        checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
-        checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
-
         //承运单位
         KwtLogisticsOrderUnit carriageUnit = new KwtLogisticsOrderUnit();
-        carriageUnit.setUnitType(2);
-        carriageUnit.setFirmName(bo.getConsignCompany());
-        carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
-        carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
-        carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
-
+        if ("1".equals(orderType)) {
+            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
+            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+            checkUnit.setUnitType(1);
+            checkUnit.setFirmName(bo.getCheckCompany());
+            checkUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+            checkUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
+
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(bo.getConsignCompany());
+            carriageUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+            carriageUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
+            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
+            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
+            type = "2";
+        } else if ("2".equals(orderType)) {
+            EntCacheResDto consignentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getConsignCompanyId()));
+            EntCacheResDto checkentMap = remoteSystemService.queryEntTreeById(Long.parseLong(bo.getCheckCompanyId()));
+
+            //发起方
+            checkUnit.setUnitType(1);
+            checkUnit.setFirmName(bo.getCheckCompany());
+            checkUnit.setEntId(Long.parseLong(bo.getCheckCompanyId()));
+            checkUnit.setTopEntId(consignentMap == null ? null : consignentMap.getId());
+            checkUnit.setContactsId(Long.parseLong(bo.getConsignContactsId()));
+
+            //接收方
+            carriageUnit.setUnitType(2);
+            carriageUnit.setFirmName(bo.getConsignCompany());
+            carriageUnit.setEntId(Long.parseLong(bo.getConsignCompanyId()));
+            carriageUnit.setTopEntId(checkentMap == null ? null : checkentMap.getId());
+            carriageUnit.setContactsId(Long.parseLong(bo.getCheckContactsId()));
+
+            pcConsignUrl = messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl();
+            appConsignUrl = messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl();
+            pcCarriageUrl = messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl();
+            appCarriageUrl = messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl();
+            consignMessageEnum = MessageEnum.NEW_CARRIAGE_ORDER;
+            carriageMessageEnum = MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT;
+            type = "1";
+        }
 //        commonService.initIatingLogisticsConsignment(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId());
         commonService.newSendLogisticsOrderToMessage(checkUnit, carriageUnit, lOrderNo, LoginUserHolder.getUserId(), LoginUserHolder.getEntId(),
-                messageUrlConfig.getPc().getConsignLogisticsAddOrderUrl(), messageUrlConfig.getApp().getConsignLogisticsAddOrderUrl(),
-                messageUrlConfig.getPc().getCarriageLogisticsAddOrderUrl(), messageUrlConfig.getApp().getCarriageLogisticsAddOrderUrl(),
-                MessageEnum.INITIATING_LOGISTICS_CONSIGNMENT, MessageEnum.NEW_CARRIAGE_ORDER, "1");
+                pcConsignUrl, appConsignUrl,
+                pcCarriageUrl, appCarriageUrl,
+                consignMessageEnum, carriageMessageEnum, type);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.sckw.transport.service;
 
 import com.sckw.core.common.enums.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
+import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.BeanUtils;
@@ -254,7 +255,7 @@ public class ManagementWaybillOrderService {
         AggregationResults<TableTops> outputTypeCount = mongoTemplate.aggregate(aggregation, SckwWaybillOrder.class, TableTops.class);
         List<TableTops> results = outputTypeCount.getMappedResults();
         // 填充默认值
-        Map<String,TableTops> listMap = new HashMap<>();
+        Map<String,TableTops> listMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         TableTops topTotal = new TableTops();
         topTotal.setName("全部");
         topTotal.setValue("all");

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

@@ -844,7 +844,7 @@ public class TransportCommonService {
             //一级物流订单向贸易订单推送数据
             if (order.getPid() == null && Integer.parseInt(order.getType()) == Global.NUMERICAL_ONE) {
                 //物流订单统计(运输完成后的物流订单)
-                LogisticsCountVo tradeCount = logisticsOrderMapper.findLogisticsOrderCount(new HashMap<>() {{
+                LogisticsCountVo tradeCount = logisticsOrderMapper.findLogisticsOrderCount(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
                     put("tOrderId", order.getTOrderId());
                     put("level", Global.NUMERICAL_ONE);
                 }});

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

@@ -264,6 +264,7 @@ public class WaybillManagementService {
         waybillDataVO.setCar(waybillCarVO);
         waybillDataVO.setTransport(wayBillDetailDTO);
         waybillDataVO.setProcess(statusVOS);
+        waybillTrackVOS = waybillTrackVOS.stream().sorted(Comparator.comparing(WaybillTrackVO::getCreateTime).reversed()).collect(Collectors.toList());
         waybillDataVO.setLogs(waybillTrackVOS);
         return HttpResult.ok(waybillDataVO);
     }
@@ -733,7 +734,7 @@ public class WaybillManagementService {
             endDate = StringTimeUtil.fillEnd(endDate);
         }
         // 运输途中
-        Map<String, String> _onway = new HashMap<>();
+        Map<String, String> _onway = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         _onway.put("name", "运输中");
         _onway.put("value", "onway");
         _onway.put("total", "0");
@@ -748,7 +749,7 @@ public class WaybillManagementService {
         );
         _onway.put("total", onWayCount.toString());
         // 已完成
-        Map<String, String> _finish = new HashMap<>();
+        Map<String, String> _finish = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         _finish.put("name", "已完成");
         _finish.put("value", "finish");
         _finish.put("total", "0");
@@ -891,7 +892,7 @@ public class WaybillManagementService {
                 StringUtils.isBlank(query.getStartDate()) ? null : StringTimeUtil.fillStart(query.getStartDate()),
                 StringUtils.isBlank(query.getEndDate()) ? null : StringTimeUtil.fillEnd(query.getEndDate())
         );
-        Map<String, String> amount = new HashMap<>();
+        Map<String, String> amount = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         // 总计条数
         amount.put("total", String.valueOf(wOrders.size()));
         BigDecimal loadAmount = new BigDecimal(Global.AMOUNT);