add

src/main/java/com/zfire/jiasm/syncdata/base/BaseService.java

@@ -39,19 +39,19 @@ public class BaseService {
 
 
     // 提取消息渠道ID 消息渠道名称
-    public String getxxqd(String xxqd){
+    public String getxxly(String xxly){
         String phone = "电话";
         String dictcode = "";
-        if (redis.hasKey(RedisConstant.XXQD_CODE + phone)) {
-            dictcode = (String) redis.get(RedisConstant.XXQD_CODE + phone);
+        if (redis.hasKey(RedisConstant.XXLY_CODE + phone)) {
+            dictcode = (String) redis.get(RedisConstant.XXLY_CODE + phone);
         } else {
             SysDict sysDict =  sysDictService.lambdaQuery().
-                    eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_XXQD_CHANNEL.getCode())
-                    .eq(SysDict::getDictValue,xxqd).last("limit 1").one();
+                    eq(SysDict::getDictType, DictTypeEnum.DICT_TYPE_XXQD_SOURCE.getCode())
+                    .eq(SysDict::getDictValue,xxly).last("limit 1").one();
             if (sysDict != null){
                 dictcode = sysDict.getDictCode();
 
-                redis.set(RedisConstant.XXQD_CODE + phone, dictcode,RedisConstant.BRAND_CODE_TIME_LENGTH);
+                redis.set(RedisConstant.XXLY_CODE + phone, dictcode,RedisConstant.BRAND_CODE_TIME_LENGTH);
             }
         }
 

src/main/java/com/zfire/jiasm/syncdata/constant/RedisConstant.java

@@ -37,7 +37,7 @@ public class RedisConstant {
     public static final String CENTER_CODE = GREE + "CENTER:";
 
     // 格力品牌
-    public static final String XXQD_CODE = GREE + "PHONE:";
+    public static final String XXLY_CODE = GREE + "PHONE:";
 
 
 

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -1023,11 +1023,11 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
         orderPar.setBrandId(brand.getBrandId());
         OrderBase upOrder = repairDownloadMapper.getUpOrderBase(orderPar);
 
-        // 消息渠道不能为空，为空时默认电话 消息渠道没指定ID，需对应出ID
-        if (StringUtils.isEmpty(upOrder.getInfoChannel())){
-            upOrder.setInfoChannel("电话");
+        // 消息来源不能为空，为空时默认电话
+        if (StringUtils.isEmpty(upOrder.getInfoSource())){
+            upOrder.setInfoSource("电话");
         }
-        upOrder.setInfoChannelId(baseService.getxxqd(upOrder.getInfoChannel()));
+        upOrder.setInfoSourceId(baseService.getxxly(upOrder.getInfoSource()));
 
         // 赋值接收师傅信息
         Worker worker= publicService.getInstallOrderWorker(item.getWxrenid());
@@ -2675,11 +2675,11 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
             order.setIsChildInfo("YES");
         }
 
-        // 消息渠道不能为空，为空时默认电话 消息渠道没指定ID，需对应出ID
-        if (StringUtils.isEmpty(order.getInfoChannel())){
-            order.setInfoChannel("电话");
+        // 消息来源不能为空，为空时默认电话
+        if (StringUtils.isEmpty(order.getInfoSource())){
+            order.setInfoSource("电话");
         }
-        order.setInfoChannelId(baseService.getxxqd(order.getInfoChannel()));
+        order.setInfoSourceId(baseService.getxxly(order.getInfoSource()));
 
         // 部分属性值重置
         orderService.setParame(brand, order, item);

src/main/java/com/zfire/jiasm/syncdata/service/impl/OrderServiceImpl.java

@@ -100,11 +100,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
             orderBase.setGpsAddress(publicService.getGpsaddress(orderBase.getLng(),orderBase.getLat()));
         }
 
-        // 消息渠道不能为空，为空时默认电话 消息渠道没指定ID，需对应出ID
-        if (StringUtils.isEmpty(orderBase.getInfoChannel())){
-            orderBase.setInfoChannel("电话");
+        // 消息来源不能为空，为空时默认电话
+        if (StringUtils.isEmpty(orderBase.getInfoSource())){
+            orderBase.setInfoSource("电话");
         }
-        orderBase.setInfoChannelId(baseService.getxxqd(orderBase.getInfoChannel()));
+        orderBase.setInfoSourceId(baseService.getxxly(orderBase.getInfoSource()));
 
         // 设置网点信息
         setWebsit(item, orderBase);
@@ -232,7 +232,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
         setOrderStatus(item, orderBase);
 
         // 生成改派申请数据 todo 先不做 20230818
-        //getOrderApplyDispatch(orderBase, oads);
+        // getOrderApplyDispatch(orderBase, oads);
 
         // 接收派工网点与所属区域有差异时 以接收网点为准 本身就是按网点来的，这里无需处理
 
@@ -473,11 +473,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderBaseMapper, OrderBase> im
             orderBase.setWorkerIdcard("");
         }
 
-        // 消息渠道不能为空，为空时默认电话 消息渠道没指定ID，需对应出ID
-        if (StringUtils.isEmpty(orderBase.getInfoChannel())){
-            orderBase.setInfoChannel("电话");
+        // 消息来源不能为空，为空时默认电话
+        if (StringUtils.isEmpty(orderBase.getInfoSource())){
+            orderBase.setInfoSource("电话");
         }
-        orderBase.setInfoChannelId(baseService.getxxqd(orderBase.getInfoChannel()));
+        orderBase.setInfoSourceId(baseService.getxxly(orderBase.getInfoSource()));
 
         // 设置网点信息
         setWebsit(item, orderBase);

src/main/resources/mapper/AZGDLcLsDownloadMapper.xml

@@ -27,7 +27,7 @@
                a.xslxid as sale_type_id,a.yhsxid as user_attr_id,a.xxlbid as info_type_id,
                a.wcsj as over_time,a.cjdt as create_time,a.cjren as create_by,a.cjrmc as create_name,a.last_modified_date as update_time,
                a.last_modified_by as update_by,a.azren as dispatch_flag,a.jspgwdsj as first_dispatch_websit_time,
-               ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,a.xxly as info_source,
+               ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,ifnull(a.xxly,'') as info_source,
                1 as upload_flag,
                case when a.spid=102 then '商用' when a.spid=109 then '商用' else '家用' end as service_flag,
                a.fjhm as gree_virtualnumber,
@@ -53,7 +53,7 @@
                a.kqbh as cross_no,a.yhsx as user_attr,a.yhsxid as user_attr_id,a.xslxid as sale_type_id,a.xxlbid as info_type_id,
                a.fphm as invoice_no,a.gmsj as buy_time,
                a.xxlb as info_type,a.yhqwkssj as expect_start_time,ifnull(a.yyazsj,a.yhqwkssj) as appointment_time,
-               c.order_state as order_status,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,a.xxly as info_source,
+               c.order_state as order_status,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,ifnull(a.xxly,'') as info_source,
 
 
 

src/main/resources/mapper/RepairDownloadMapper.xml

@@ -13,7 +13,7 @@
                f.dict_code as service_category_id,f.dict_value as service_category_name,
                if((a.wxwdno='' or wxwdno is null),IFNULL(a.xjwdno,''),a.wxwdno) as websit_id,
                a.xjwdno as rece_websit_id,a.cjwdno as create_websit_id,
-               a.xxqdid as info_channel_id,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,a.xxly as info_source,
+               a.xxqdid as info_channel_id,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,ifnull(a.xxly,'') as info_source,
                a.ssqy as region,a.zxhao as seat_no,a.qqlyzj as external_pk,
                a.bjustat as bjy_check_status,a.yhqwsmsj as expect_start_time,a.qwsmjssj as expect_end_time,a.cjwdno as create_sys,
                a.zjczwd as last_operator_websit,a.last_modified_by as last_operator_by,IFNULL(a.zjczsj,a.last_modified_date) as last_operator_time,
@@ -49,7 +49,7 @@
                                when '三级投诉' then 'THIRD'
                                when '特级投诉' then 'SUPER' else 'NO' end as complaint,
                a.xswdno as sale_websit_id,
-               a.xxqdid as info_channel_id,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,a.xxly as info_source,
+               a.xxqdid as info_channel_id,ifnull(a.xxqd,'') as info_channel,a.xxlyid as info_source_id,ifnull(a.xxly,'') as info_source,
                a.wcsj as over_time,IFNULL(a.zjczsj,a.last_modified_date) as last_operator_time,
                IFNULL(a.last_modified_date,a.zjczsj) as update_time,a.yhsx as user_attr,a.yhsxid as user_attr_id,
                a.fjhm,a.gdhao as file_no,a.zxhao as seat_no,a.xjwdsj as rece_time,a.yhqwsmsj as appointment_time,