Merge branch 'hz_dev' into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java

@@ -49,35 +49,67 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
     //临时数据同步
     public ObjectRestResponse synchro(){
-       List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
-       if (list.size()>0){
-           for (BranchCompanyStockInfo companyStockInfo:list){
+        List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
+        if (list.size()>0){
+            for (BranchCompanyStockInfo companyStockInfo:list){
                 int num=0;
-               String companyName=companyStockInfo.getCompanyName();
-               Integer balance=companyStockInfo.getBalance();
-               Integer total=companyStockInfo.getTotal();
-               BigDecimal price=companyStockInfo.getPrice();
-               CompanyBase companyBase=new CompanyBase();
-               companyBase.setAddrCity(companyStockInfo.getAddrCity());
-               companyBase.setAddrProvince(companyStockInfo.getAddrProvince());
-               companyBase.setName(companyName);
-               companyBase.setCover(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
-               companyBase.setImages(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
-               insertSelective(companyBase);
-               Integer companyBaseId=companyBase.getId();
-               if (companyBaseId!=null){
+                String companyName=companyStockInfo.getCompanyName();
+                Integer balance=companyStockInfo.getBalance();
+                Integer total=companyStockInfo.getTotal();
+                BigDecimal price=companyStockInfo.getPrice();
+                CompanyBase companyBase=new CompanyBase();
+                companyBase.setAddrCity(companyStockInfo.getAddrCity());
+                companyBase.setAddrProvince(companyStockInfo.getAddrProvince());
+                companyBase.setName(companyName);
+                companyBase.setCover(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
+                companyBase.setImages(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
+                insertSelective(companyBase);
+                Integer companyBaseId=companyBase.getId();
+                if (companyBaseId!=null){
                     BranchCompanyStockRight branchCompanyStockRight=new BranchCompanyStockRight();
-                   branchCompanyStockRight.setBalance(balance);
-                   branchCompanyStockRight.setPrice(price);
-                   branchCompanyStockRight.setTotal(total);
-                   branchCompanyStockRight.setCompanyBaseId(companyBaseId);
-                   branchCompanyStockRight.setStockState(2);
-                   stockRightBiz.insertSelective(branchCompanyStockRight);
-               }
-               num++;
-               log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
-           }
-       }
+                    branchCompanyStockRight.setBalance(balance);
+                    branchCompanyStockRight.setPrice(price);
+                    branchCompanyStockRight.setTotal(total);
+                    branchCompanyStockRight.setCompanyBaseId(companyBaseId);
+                    branchCompanyStockRight.setStockState(2);
+                    stockRightBiz.insertSelective(branchCompanyStockRight);
+                }
+                num++;
+                log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
+            }
+        }
+
+        return  ObjectRestResponse.succ();
+    }
+
+    //临时数据同步2
+    public ObjectRestResponse synchro2(){
+        List<BranchCompany> list= branchCompanyBiz.selectListAll();
+        if (list.size()>0){
+            int num=0;
+            for (BranchCompany branchCompany:list){
+                Integer companyBaseId=branchCompany.getCompanyBaseId();
+                Integer id=branchCompany.getId();
+                if (companyBaseId!=null||companyBaseId!=0){
+                     CompanyBase companyBase=selectById(companyBaseId);
+                     if (companyBase!=null){
+                         branchCompany=new BranchCompany();
+                         branchCompany.setId(id);
+                         branchCompany.setAddrProvince(companyBase.getAddrProvince());
+                         branchCompany.setProvinceName(companyBase.getProvinceName());
+                         branchCompany.setAddrCity(companyBase.getAddrCity());
+                         branchCompany.setCityName(companyBase.getCityName());
+                         branchCompany.setAddrTown(companyBase.getAddrTown());
+                         branchCompany.setTownName(companyBase.getTownName());
+                         branchCompanyBiz.updateSelectiveById(branchCompany);
+                         num++;
+                         log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
+                     }
+                }
+
+
+            }
+        }
 
         return  ObjectRestResponse.succ();
     }
@@ -125,18 +157,25 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         Integer companyBaseId=companyVo.getId();
         Integer companyId=companyVo.getCompanyId();
         Integer stockId=companyVo.getStockId();
+        String name="";
+        String companyName="";
         if (companyBaseId!=null&&companyBaseId>0){
             CompanyBase companyBase=selectById(companyBaseId);
             BeanUtils.copyProperties(companyBase,companyVo);
+            name=companyBase.getName();
         }
         if (companyId!=null&&companyId>0){
             BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
             BeanUtils.copyProperties(branchCompany,companyVo);
+            companyName=branchCompany.getName();
         }
         if (stockId!=null&&stockId>0){
             BranchCompanyStockRight stockRight=stockRightBiz.selectById(stockId);
             BeanUtils.copyProperties(stockRight,companyVo);
         }
+        companyVo.setId(companyBaseId);
+        companyVo.setName(name);
+        companyVo.setCompanyName(companyName);
         return  ObjectRestResponse.succ(companyVo);
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java

@@ -25,6 +25,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
         return baseBiz.synchro();
     }
 
+    @ApiOperation("同步分公司地址")
+    @PostMapping("synchro2")
+    public ObjectRestResponse<String> synchro2() {
+        return baseBiz.synchro2();
+    }
+
 
     @ApiOperation("查询公司列表")
     @RequestMapping(value = "/list", method = RequestMethod.GET)