Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -198,13 +198,16 @@ public class TzBaseEnterpriseInfoServiceImpl
 						if(!ValidationUtil.isEmpty(companyPrivilegeModel)){
 							List<AgencyUserModel> agencyUserModelList = Privilege.agencyUserClient.queryByCompanyId(companyPrivilegeModel.getSequenceNbr(),null,null,null).getResult();
 							if(ValidationUtil.isEmpty(agencyUserModelList)){
+								//spe表中的数据在工商查不到，且平台无用户，将删除企业数据
 								Privilege.companyClient.deleteCompany(String.valueOf(companyPrivilegeModel.getSequenceNbr()));
 								if (!ValidationUtil.isEmpty(tzBaseEnterprisePrivilegeInfo)) {
 									this.deleteBySeq(tzBaseEnterprisePrivilegeInfo.getSequenceNbr());
 								}
 							}
 						}
-
+						//spe表中的数据在工商查不到,设置spe表状态为1
+						speUseUnit.setSyncState(1);
+						speUseUnitService.updateById(speUseUnit);
 					}else {
 						CompanyModel privilegeCompanyModel = Privilege.companyClient.queryByCompanyName(String.valueOf(resultMap.get("registration_authority"))).getResult();
 						CompanyModel companyModel = new CompanyModel();
@@ -255,11 +258,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 								Privilege.companyClient.create(companyModel);
 							} else if (tzBaseEnterprisePrivilegeInfo == null) {
 								//企业表没有，平台表有
+								this.save(baseEnterpriseInfo);
 								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
 									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
 									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
 								}
-								this.save(baseEnterpriseInfo);
 							} else if (companyPrivilegeModel == null) {
 								//平台表没有，企业表有
 								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
@@ -271,27 +274,33 @@ public class TzBaseEnterpriseInfoServiceImpl
 								//企业表有 平台表有
 								if (!companyPrivilegeModel.getCompanyType().contains(companyModel.getCompanyType())) {
 									companyPrivilegeModel.setCompanyType(companyPrivilegeModel.getCompanyType() + "," + companyModel.getCompanyType());
-									this.updateById(tzBaseEnterprisePrivilegeInfo);
+									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
 								}
 								if (!tzBaseEnterprisePrivilegeInfo.getUnitType().contains(baseEnterpriseInfo.getUnitType())) {
 									tzBaseEnterprisePrivilegeInfo.setUnitType(tzBaseEnterprisePrivilegeInfo.getUnitType() + "," + baseEnterpriseInfo.getUnitType());
-									Privilege.companyClient.update(companyPrivilegeModel, companyPrivilegeModel.getSequenceNbr());
+									this.updateById(tzBaseEnterprisePrivilegeInfo);
 								}
-
-
 							}
+							setSpeUseUnitState(3,speUseUnit);
 						} catch (Exception e) {
 							System.out.println(e.getMessage());
+							//当报错时 设置状态为 2
+							speUseUnit.setSyncState(2);
+							speUseUnitService.updateById(speUseUnit);
 						}
 					}
-					speUseUnit.setSyncState(3);
-					speUseUnitService.updateById(speUseUnit);
 				}
 			}
 		}
 		return "ok";
 	}
 
+
+	public void setSpeUseUnitState(int state,SpeUseUnit speUseUnit){
+		speUseUnit.setSyncState(state);
+		speUseUnitService.updateById(speUseUnit);
+	}
+
 	public Map<String, CompanyModel> getCompanyInfoMap(Collection companyModels,Map<String, CompanyModel> map){
 		if(companyModels == null){
 			return map;