add

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

@@ -154,7 +154,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
                     // updateWorkerStreet(wvos,workerBrandAccount.getWorkerId(),brand.getBrandId(),ws);
 
                     // 同步-师傅服务的类目信息 无则插入
-                    getServiceCategory(wvos, wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs, sysDictRefMap);
+                    getServiceCategory(wvos, wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs, sysDictRefMap, workerBrandAccount);
 
                     // 新增或修改(证件,师傅地理位置,师傅服务的类目)
                     addOrUpdate(updateList, addList, wscList, wscdList, ws);
@@ -261,7 +261,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
     private void getServiceCategory(WangdianWxgVos wvos, List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
                                     SysDict sysDict, ItfTblWangdianWxgDownload wxg,
                                     Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                                    Map<String, List<SysDictRef>> sysDictRefMap) {
+                                    Map<String, List<SysDictRef>> sysDictRefMap,WorkerBrandAccount workerBrandAccount) {
         List<String> complete = new ArrayList<>();
         // 先处理商用
         for (SignSplb syitem: wvos.getSySignSplbList()){
@@ -269,7 +269,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
             for (String s :syitem.getFwlbList()){
                 // 师傅服务的大类中查看是否存在 不存在新增
                 extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.COMMERCIAL_TYPE.getCode(), sysDictRefMap);
+                        syitem, s,ServiceCategoryEnum.COMMERCIAL_TYPE.getCode(), sysDictRefMap, workerBrandAccount);
             }
         }
         complete.clear();
@@ -280,7 +280,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
             for (String s :syitem.getFwlbList()){
                 // 师傅服务的大类中查看是否存在 不存在新增
                 extracted(wscList, wscdList, complete, sysDict, wxg, wxgCategoryTypeRecs,
-                        syitem, s,ServiceCategoryEnum.HOME_TYPE.getCode(), sysDictRefMap);
+                        syitem, s,ServiceCategoryEnum.HOME_TYPE.getCode(), sysDictRefMap,workerBrandAccount);
             }
         }
     }
@@ -288,20 +288,20 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
     private void extracted(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList,
                            List<String> complete, SysDict sysDict, ItfTblWangdianWxgDownload wxg,
                            Map<String,List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs, SignSplb syitem,
-                           String s, String type,Map<String, List<SysDictRef>> sysDictRefMap) {
+                           String s, String type,Map<String, List<SysDictRef>> sysDictRefMap,WorkerBrandAccount workerBrandAccount) {
         if ( !complete.contains(s + syitem.getSpdl())){
             // 提取品牌商对应的大类信息
             SysDictRef sysDictRef = sysDictRefMap.get(String.valueOf(syitem.getSpdl())).get(0);
 
             if (s.equals(ServiceCategoryEnum.INSTALL_TYPE.getText())){
                 getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.INSTALL_TYPE.getCode(),type);
+                        sysDictRef,ServiceCategoryEnum.INSTALL_TYPE.getCode(),type,workerBrandAccount);
             } else if (s.equals(ServiceCategoryEnum.REPAIR_TYPE.getText())){
                 getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.REPAIR_TYPE.getCode(),type);
+                        sysDictRef,ServiceCategoryEnum.REPAIR_TYPE.getCode(),type,workerBrandAccount);
             } else if (s.equals(ServiceCategoryEnum.DELIVERY_TYPE.getText())){
                 getAddInfo(wscList, wscdList, sysDict, wxg, wxgCategoryTypeRecs,
-                        sysDictRef,ServiceCategoryEnum.DELIVERY_TYPE.getCode(),type);
+                        sysDictRef,ServiceCategoryEnum.DELIVERY_TYPE.getCode(),type,workerBrandAccount);
             }
             // 新增过的无需再次新增
             complete.add(s + syitem.getSpdl());
@@ -311,7 +311,7 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
 
     private void getAddInfo(List<WorkerServiceCategory> wscList, List<WorkerServiceCategoryDetail> wscdList, SysDict sysDict,
                             ItfTblWangdianWxgDownload wxg, Map<String, List<WorkerServiceCategoryDetail>> wxgCategoryTypeRecs,
-                            SysDictRef sysDictRef, String code, String type) {
+                            SysDictRef sysDictRef, String code, String type,WorkerBrandAccount workerBrandAccount) {
         Boolean include = Boolean.FALSE;
         // 看师傅是否已有（服务类型 INSTALL=安装 REPAIR=维修  DELIVERY=配送）对应的大类信息 如有不做任何处理
         if (wxgCategoryTypeRecs !=null && wxgCategoryTypeRecs.size()>0){
@@ -331,7 +331,9 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
             if (wxgCategoryTypeRecs ==null || wxgCategoryTypeRecs.size()<1 || !wxgCategoryTypeRecs.containsKey(code) ){
                 WorkerServiceCategory wsc = new WorkerServiceCategory();
                 wsc.setId(IdWorker.getIdStr());
-                wsc.setWorkerId(String.valueOf(wxg.getSfzen()));
+                wsc.setWorkerId(workerBrandAccount.getWorkerId());
+                wsc.setWebsitId(workerBrandAccount.getWebsitId());
+                wsc.setWebsitWorkerId(workerBrandAccount.getWebsitWorkerId());
                 wsc.setServiceCategoryId(sysDict.getDictCode());
                 wsc.setServiceCategoryName(sysDict.getDictValue());
                 wsc.setFlag(type);
@@ -359,7 +361,9 @@ public class GLPPWXGQueryUpdateServiceImpl implements GLPPWXGQueryUpdateService
                 WorkerServiceCategoryDetail wscd = new WorkerServiceCategoryDetail();
                 wscd.setId(IdWorker.getIdStr());
                 wscd.setWorkerServiceCategoryId(wxgCategoryTypeRecs.get(code).get(0).getServiceCategoryId());
-                wscd.setWorkerId(String.valueOf(wxg.getSfzen()));
+                wscd.setWorkerId(workerBrandAccount.getWorkerId());
+                wscd.setWebsitId(workerBrandAccount.getWebsitId());
+                wscd.setWebsitWorkerId(workerBrandAccount.getWebsitWorkerId());
                 wscd.setServiceCategoryId(sysDict.getDictCode());
                 wscd.setServiceCategoryName(sysDict.getDictValue());
                 wscd.setFlag(type);