Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/CompanySearchDTO.java

@@ -32,5 +32,7 @@ public class CompanySearchDTO extends PageParam implements DataInter {
 
     Integer   goodsType;
 
+    Integer   isBrowse;
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BranchCompanyBiz.java

@@ -36,6 +36,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     public ObjectRestResponse addOrUpd(BranchCompany branchCompany){
         Long id = branchCompany.getId() == null ? 0L :branchCompany.getId();
         BranchCompany branchCompany1=selectById(id);
+        branchCompany.setPhone(branchCompany.getLeaderContactInfo());
+        branchCompany.setTourServicePhone(branchCompany.getLeaderContactInfo());
+        branchCompany.setVehiceServicePhone(branchCompany.getLeaderContactInfo());
         if (branchCompany1 != null){
              updateSelectiveById(branchCompany);
         }else {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BranchCompanyGiveBiz.java

@@ -27,6 +27,7 @@ public class BranchCompanyGiveBiz extends BaseBiz<BranchCompanyGiveMapper, Branc
         if (branchCompanyGive1 == null){
             insertSelectiveRe(branchCompanyGive);
         }else {
+            branchCompanyGive.setId(branchCompanyGive1.getId());
             updateSelectiveById(branchCompanyGive);
         }
         Integer companyId = branchCompanyGive.getCompanyId();
@@ -34,10 +35,13 @@ public class BranchCompanyGiveBiz extends BaseBiz<BranchCompanyGiveMapper, Branc
         if (branchCompany1 != null){
             BranchCompany branchCompany=new BranchCompany();
             branchCompany.setId(companyId);
+            Integer giveNum = branchCompany1.getGiveNum() == null ? 0 :branchCompany1.getGiveNum();
             if (isDel == 1){
-                branchCompany.setGiveNum(branchCompany1.getGiveNum()-1);
+                giveNum=giveNum > 0 ? (giveNum-1):0;
+                branchCompany.setGiveNum(giveNum);
             }else {
-                branchCompany.setGiveNum(branchCompany1.getGiveNum()+1);
+                giveNum=giveNum+1;
+                branchCompany.setGiveNum(giveNum);
             }
             branchCompanyBiz.addOrUpd(branchCompany);
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppBranchCompanyController.java

@@ -69,6 +69,7 @@ public class AppBranchCompanyController extends BaseController<BranchCompanyBiz>
         if (list.size() == 0){
             throw  new BaseException("店铺不存在", ResultCode.FAILED_CODE);
         }
+        doBrowse(companySearchDTO);
         return ObjectRestResponse.succ(list.get(0));
     }
 
@@ -110,4 +111,24 @@ public class AppBranchCompanyController extends BaseController<BranchCompanyBiz>
         return ObjectRestResponse.succ();
     }
 
+
+    public  void  doBrowse(CompanySearchDTO companySearchDTO){
+        try {
+            Integer isBrowse = companySearchDTO.getIsBrowse() == null ? 0 :companySearchDTO.getIsBrowse();
+            Integer companyId = companySearchDTO.getId() == null ? 0 : companySearchDTO.getId();
+            if (isBrowse == 1 && companyId > 0){
+                BranchCompany branchCompany1 = baseBiz.selectById(companyId);
+                if (branchCompany1 != null){
+                    BranchCompany branchCompany=new BranchCompany();
+                    branchCompany.setId(companyId);
+                    branchCompany.setBrowseNum(branchCompany1.getBrowseNum()+1);
+                    baseBiz.addOrUpd(branchCompany);
+                }
+            }
+        }catch (Exception e){
+
+        }
+
+    }
+
 }