差旅标准优化

base/nckd-base-common/src/main/java/nckd/base/common/utils/TripSyncBillUtils.java

@@ -57,8 +57,8 @@ public class TripSyncBillUtils {
         Map<String, Object> data = new HashMap<>();
         List<Map<String,Object>> dataTypeList = new ArrayList<>();
         Map<String,Object> dataTypeInfo = new HashMap<>();
-        //是否添加VE_前缀，0否 1是
-        dataTypeInfo.put("prefixFlag","0");
+        //是否添加VE_前缀，1否 0是
+        dataTypeInfo.put("prefixFlag","1");
         dataTypeInfo.put("dataTypeNo","10115");
         dataTypeInfo.put("dataTypeName","报销级别");
         dataTypeInfo.put("type","1");
@@ -225,12 +225,13 @@ public class TripSyncBillUtils {
         cityClassifyInfo.put("companyCode", "");
         cityClassifyInfo.put("cityClassifyName", tripArea.getString(BaseFieldConst.NAME));
         cityClassifyInfo.put("cityClassifyNumber", billNumber);
-        cityClassifyInfo.put("cityInfo", cityList);
+//        cityClassifyInfo.put("cityInfo", cityList);
 
         cityClassifyInfoList.add(cityClassifyInfo);
 
         Map<String, Object> data = new HashMap<>();
         data.put("cityClassifyInfo", cityClassifyInfoList);
+        data.put("cityInfo", cityList);
 
         logger.info(String.format("推送%s,单据编号%s转换业务数据结束，业务数据JSON:\n%s",
                 displayName, billNumber, JSONObject.toJSONString(data)));
@@ -276,18 +277,20 @@ public class TripSyncBillUtils {
                 .filter(it -> airMap.containsKey(it.getString("seat.number")))
                 .map(it -> airMap.get(it.getString("seat.number")))
                 .collect(Collectors.joining(","));
-        List<Map<String, String>> allowedAreaList = new ArrayList<>();
-        Map<String, String> allowedArea = new HashMap<>();
-        //舱位编号1头等舱2公务舱3经济舱4高端经济舱
-        allowedArea.put("cabinCodes", cabinCodes);
-        allowedAreaList.add(allowedArea);
+//        List<Map<String, String>> allowedAreaList = new ArrayList<>();
+//        Map<String, String> allowedArea = new HashMap<>();
+//        //舱位编号1头等舱2公务舱3经济舱4高端经济舱
+//        allowedArea.put("cabinCodes", cabinCodes);
+//        allowedAreaList.add(allowedArea);
 
         //管控应用场景(经济舱折扣限制3120803,允许乘坐舱位 3120809,指定舱位折扣信息 3120819)
         dTicketTravelStandard.put("sceneCode", "3120809");
         //管控方式 1只做提醒 2不允许预订 3不显示 4能订但只能在线支付
         dTicketTravelStandard.put("controlType", "4");
+        //允许乘坐舱位1头等舱2公务舱3经济舱4高端经济舱
+        dTicketTravelStandard.put("allowCabins", cabinCodes);
         //指定舱位折扣信息
-        dTicketTravelStandard.put("allowedAreaList", allowedAreaList);
+//        dTicketTravelStandard.put("allowedAreaList", allowedAreaList);
 
         return Collections.singletonList(dTicketTravelStandard);
     }