Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/CompanyBaseMapper.java

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/RandomUtil.java

 package com.github.wxiaoqi.security.common.util;
 
+import java.util.HashSet;
 import java.util.Random;
+import java.util.Set;
 
 /**
  * 随机数工具
@@ -31,10 +33,41 @@ public class RandomUtil
 
 		return String.valueOf((int) (random * num));
 	}
-	
+
+	/**
+	 * 获取随机数字集合
+	 * @param max
+	 * @param n
+	 * @param set
+	 */
+	public static void randomSet(int max, int n, Set<Integer> set) {
+		if (n > (max + 1) || max < 0) {
+			return;
+		}
+		for (int i = 0; i < n; i++) {
+			int num = (int) (Math.random() * (max));
+			set.add(num);
+		}
+		int setSize = set.size();
+		// 如果存入的数小于指定生成的个数，则调用递归再生成剩余个数的随机数，如此循环，直到达到指定大小
+		if (setSize < n) {
+			randomSet( max, n-setSize, set);// 递归
+		}
+	}
+
 	public static synchronized String gencRan(){
 		Random ran = new Random(System.nanoTime());
 		double nextDouble = ran.nextDouble();
 		return String.valueOf(nextDouble).substring(2, 6);
 	}
+
+	public static void main(String[] args) {
+		int max = 20;
+		int n = 5;
+		Set<Integer> set = new HashSet<>();
+		randomSet(max, n, set);
+		for(Integer a : set) {
+			System.out.println(a);
+		}
+	}
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -162,6 +162,9 @@ public class OrderCancelBiz {
                     }
                     //退款流程
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ key);
+
+                    //站点总人数减少
+                    tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
                 }
             }
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.constant.RestCode;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -18,15 +19,13 @@ import com.xxfc.platform.tour.mapper.*;
 import com.xxfc.platform.tour.vo.TourGoodVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 旅游商品表
@@ -325,6 +324,27 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
         return  mapper.findAllByHome((page-1)*limit,limit);
     };
 
+    /**
+     * 获取指定数量的随机旅游路线
+     * @return
+     */
+    public ObjectRestResponse findRandomVehicle(Integer number) {
+        number = number == null ? 3 : number;
+        Map<String, Object> param = new HashMap<>();
+        List<TourGood> list = mapper.getCoordinateList(param);
+        Set<TourGood> resultList = new HashSet<>();
+        if(CollectionUtils.isNotEmpty(list)) {
+            if(number == list.size()) {
+                return ObjectRestResponse.succ(list);
+            }
+            Set<Integer> set = new HashSet<>();
+            RandomUtil.randomSet(list.size(), number, set);
+            for(Integer i : set) {
+                resultList.add(list.get(i));
+            }
+        }
+        return ObjectRestResponse.succ(resultList);
+    }
 }
 
 

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodController.java

@@ -52,5 +52,10 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
         return baseBiz.getAllByHome(page,limit);
     }
 
+    @ApiOperation("随机获取旅游路线")
+    @GetMapping(value = "/app/unauth/findRandomVehicle")
+    public ObjectRestResponse findRandomVehicle(Integer number) {
+        return baseBiz.findRandomVehicle(number);
+    }
 
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ResultVehicleVo.java

@@ -109,7 +109,7 @@ public class ResultVehicleVo {
      */
     private Date maintenanceDate;
     /**
-     * 保养公里
+     * 当前公里数
      */
     private Integer mileage;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/CompanyVo.java

 package com.xxfc.platform.vehicle.pojo.vo;
 
+import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +10,7 @@ import java.math.BigDecimal;
  * 分公司信息
  */
 @Data
-public class CompanyVo {
+public class CompanyVo extends PageParam {
 
     /**
      * 公司基本信息表
@@ -30,10 +31,16 @@ public class CompanyVo {
     String  content;
     @ApiModelProperty("地址-省/直辖市(编码)")
     Integer addrProvince;
+    @ApiModelProperty("地址-省/直辖市(编码)名称")
+    String provinceName;
     @ApiModelProperty("地址-市(编码)")
     Integer addrCity;
+    @ApiModelProperty("地址-市(编码)名称")
+    String cityName;
     @ApiModelProperty("地址-镇/县（编码)")
     Integer addrTown;
+    @ApiModelProperty("地址-镇/县（编码)名称")
+    String townName;
 
     /**
      * 分支机构

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

@@ -4,6 +4,7 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
 import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
@@ -16,7 +17,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -26,7 +26,10 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
 
      @Autowired
-     BranchCompanyStockRightBiz stockRightBiz;
+    BranchCompanyStockRightBiz stockRightBiz;
+
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
 
      @Autowired
      BranchCompanyStockInfoMapper stockInfoMapper;
@@ -96,25 +99,69 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         Integer companyId=companyVo.getCompanyId();
         if (companyId==null||companyId==0){
             branchCompany.setId(null);
-            insertSelective(companyBase);
+            branchCompanyBiz.insertSelective(branchCompany);
         }else {
             branchCompany.setId(companyId);
-            updateSelectiveById(companyBase);
+            branchCompanyBiz.updateSelectiveById(branchCompany);
         }
         return  ObjectRestResponse.succ();
     }
 
+    //获取详情
+    public  ObjectRestResponse getCompanyDetail(CompanyVo companyVo){
+        if (companyVo==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        Integer companyBaseId=companyVo.getId();
+        Integer companyId=companyVo.getCompanyId();
+        Integer stockId=companyVo.getStockId();
+        if (companyBaseId!=null&&companyBaseId>0){
+            CompanyBase companyBase=selectById(companyBaseId);
+            BeanUtils.copyProperties(companyBase,companyVo);
+        }
+        if (companyId!=null&&companyId>0){
+            BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
+            BeanUtils.copyProperties(branchCompany,companyVo);
+        }
+        if (stockId!=null&&stockId>0){
+            BranchCompanyStockRight stockRight=stockRightBiz.selectById(stockId);
+            BeanUtils.copyProperties(stockRight,companyVo);
+        }
+        return  ObjectRestResponse.succ(companyVo);
+    }
+
     //设置股权信息
     public  ObjectRestResponse updStockInfo(CompanyVo companyVo){
-        if (companyVo==null|| StringUtils.isBlank(companyVo.getCompanyName())|| StringUtils.isBlank(companyVo.getName())||
-                companyVo.getZoneId()==null||companyVo.getZoneId()==0|| companyVo.getAddrProvince()==null||companyVo.getAddrProvince()==0
-                || companyVo.getAddrCity()==null||companyVo.getAddrCity()==0){
+
+        if (companyVo==null|| companyVo.getId()==null||companyVo.getId()==0 || companyVo.getBalance()==null||companyVo.getBalance()==0|| companyVo.getTotal()==null||companyVo.getTotal()==0
+                ||companyVo.getPrice() ==null|| companyVo.getPrice().compareTo(BigDecimal.ZERO)<0){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
-        Integer state=companyVo.getState()==null?2:companyVo.getState();
-        if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())||StringUtils.isBlank(companyVo.getContent())
-                ||StringUtils.isBlank(companyVo.getLeader())||StringUtils.isBlank(companyVo.getLeaderContactInfo())||StringUtils.isBlank(companyVo.getTourServicePhone())||StringUtils.isBlank(companyVo.getVehiceServicePhone()))){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"上架时参数不能为空");
+        Integer companyBaseId=companyVo.getId();
+        Integer stockState=companyVo.getStockState();
+        if (stockState!=null&&stockState==2){
+            CompanyBase companyBase=selectById(companyBaseId);
+            if (companyBase==null||StringUtils.isBlank(companyBase.getDescribes())|| StringUtils.isBlank(companyBase.getContent())||StringUtils.isBlank(companyBase.getImages())){
+                return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"基础信息不完善");
+            }
+        }
+        Integer stockId=companyVo.getStockId();
+        BranchCompanyStockRight right=new BranchCompanyStockRight();
+        BeanUtils.copyProperties(companyVo,right);
+        if (stockId==null||stockId==0){
+            right.setId(null);
+            stockRightBiz.insertSelective(right);
+        }else {
+            right.setId(stockId);
+            stockRightBiz.updateSelectiveById(right);
+        }
+        return  ObjectRestResponse.succ();
+    }
+
+    //设置基础信息
+    public  ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
+        if (companyVo==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
         CompanyBase companyBase=new CompanyBase();
         BeanUtils.copyProperties(companyVo,companyBase);
@@ -128,18 +175,39 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
         BranchCompany branchCompany=new BranchCompany();
         BeanUtils.copyProperties(companyVo,branchCompany);
         branchCompany.setCompanyBaseId(companyBaseId);
-        branchCompany.setName(companyVo.getCompanyName());
         Integer companyId=companyVo.getCompanyId();
         if (companyId==null||companyId==0){
             branchCompany.setId(null);
-            insertSelective(companyBase);
+            branchCompanyBiz.insertSelective(branchCompany);
         }else {
             branchCompany.setId(companyId);
-            updateSelectiveById(companyBase);
+            branchCompanyBiz.updateSelectiveById(branchCompany);
         }
         return  ObjectRestResponse.succ();
     }
 
+    public  ObjectRestResponse delCompany(Integer id){
+        CompanyBase companyBase=new CompanyBase();
+        companyBase.setId(id);
+        companyBase.setIsDel(1);
+        updateSelectiveById(companyBase);
+        return  ObjectRestResponse.succ();
+    }
+
+    public  ObjectRestResponse getList(CompanyVo companyVo){
+        Integer page=1;
+        Integer limit=10;
+        if (companyVo.getPage()!=null&&companyVo.getPage()>0){
+            page=companyVo.getPage();
+        }
+        if (companyVo.getLimit()!=null&&companyVo.getLimit()>0){
+            limit=companyVo.getLimit();
+        }
+        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(companyVo)));
+    }
+
+    
+
     public CompanyBaseVo findCompanyDetailById(Integer id) {
         CompanyBaseVo companyBaseVo = new CompanyBaseVo();
         CompanyBaseDetailDTO companyBaseDetailDTO = mapper.findCompanyBaseById(id);

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

@@ -532,8 +532,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 ((vehicleBookInfo.getBookedDate() & andOperationFactor) != andOperationRs)){//已经被预定
             //当天已经被预定检查小时是否也被预定
             return filterHourInfoBooked(vehicleId, hourInfo);
-        } else if (vehicleBookInfo != null && vehicleBookInfo.getBookedDate() != null &&(vehicleBookInfo.getBookedDate() & andOperationFactor) == 0){//未被预定，查看时间是否被预定
-            return filterHourInfoBooked(vehicleId, hourInfo);
         }
         return Boolean.TRUE;
     }
@@ -545,7 +543,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
-            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() >0) {
+            if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
                 if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定
                     log.info(entry.getKey() + "预定的时间段已经被预约！");
                     return Boolean.FALSE;

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

@@ -48,7 +48,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
                 throw new BaseException(ResultCode.ONLY_BOOK_FROM_TODAY);
             }
         }
-        if (bookStartDate.compareTo(bookEndDate) > 0) {
+        if (bookStartDate.compareTo(bookEndDate) >= 0) {
             throw new BaseException(ResultCode.END_TIME_FROM_TODAY);
         }
         Map<String, Integer> predictableHours = Maps.newHashMap();

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.RandomUtil;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
@@ -20,8 +21,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 /**
  * 车型
@@ -71,7 +71,28 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return null;
+    }
 
+    /**
+     * 获取指定数量的随机车型
+     * @return
+     */
+    public ObjectRestResponse findRandomVehicle(Integer number) {
+        number = number == null ? 3 : number;
+        VehicleModelQueryCondition vmqc = new VehicleModelQueryCondition();
+        List<VehicleModelVo> list = mapper.findVehicleModelPage(vmqc);
+        Set<VehicleModelVo> resultList = new HashSet<>();
+        if(CollectionUtils.isNotEmpty(list)) {
+            if(number == list.size()) {
+                return ObjectRestResponse.succ(list);
+            }
+            Set<Integer> set = new HashSet<>();
+            RandomUtil.randomSet(list.size(), number, set);
+            for(Integer i : set) {
+               resultList.add(list.get(i));
+            }
+        }
+        return ObjectRestResponse.succ(resultList);
     }
 
     /**

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

@@ -209,7 +209,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
-        bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
+        bookVehicleVo.setNotCheckTimeLegal(Boolean.FALSE);
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }

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

@@ -125,6 +125,13 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return vehicleModelBiz.findVehicleModelPage(vmqc);
     }
 
+    @GetMapping(value = "/app/unauth/findRandomVehicle")
+    @IgnoreUserToken
+    @ApiOperation("获取随机车型")
+    public ObjectRestResponse findRandomVehicle(Integer number) {
+        return vehicleModelBiz.findRandomVehicle(number);
+    }
+
 
     /**
      * 添加车型

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

@@ -13,6 +13,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockInfoRightVo;
+import com.xxfc.platform.vehicle.pojo.vo.CompanyVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,13 +25,58 @@ import javax.servlet.http.HttpServletRequest;
 @IgnoreClientToken
 @IgnoreUserToken
 @RequestMapping("company/base")
-public class CompanyBaseController extends BaseController<CompanyBaseBiz> {
-
+public class CompanyController extends BaseController<CompanyBaseBiz> {
 
 
+    @ApiOperation("同步分公司信息")
     @PostMapping("synchro")
     public ObjectRestResponse<String> synchro() {
         return baseBiz.synchro();
     }
 
+
+    @ApiOperation("查询公司列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public ObjectRestResponse getList(CompanyVo companyVo){
+        return  baseBiz.getList(companyVo);
+    }
+
+    @ApiOperation("设置基础信息")
+    @RequestMapping(value = "/updCompany", method = RequestMethod.POST)
+    public ObjectRestResponse updCompany(@RequestBody CompanyVo companyVo){
+        return  baseBiz.updCompany(companyVo);
+    }
+
+    @ApiOperation("添加分公司")
+    @RequestMapping(value = "/addCompany", method = RequestMethod.POST)
+    public ObjectRestResponse addCompany(@RequestBody CompanyVo companyVo){
+        return  baseBiz.updCompany(companyVo);
+    }
+
+    @ApiOperation("获取详情")
+    @RequestMapping(value = "/getCompanyDetail", method = RequestMethod.GET)
+    public ObjectRestResponse getCompanyDetail(CompanyVo companyVo){
+        return  baseBiz.getCompanyDetail(companyVo);
+    }
+
+    @ApiOperation("设置股权信息")
+    @RequestMapping(value = "/updStockInfo", method = RequestMethod.POST)
+    public ObjectRestResponse updStockInfo(CompanyVo companyVo){
+        return  baseBiz.updStockInfo(companyVo);
+    }
+    @ApiOperation("设置详情")
+    @RequestMapping(value = "/updCompanyDetail", method = RequestMethod.POST)
+    public ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
+        return  baseBiz.updCompanyDetail(companyVo);
+    }
+
+    @ApiOperation("删除")
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    public ObjectRestResponse del(@RequestParam(value = "id",defaultValue = "0") Integer id){
+        return  baseBiz.delCompany(id);
+    }
+
+
+
+
 }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.CompanyBaseMapper" >
+
+  <select id="getList"  parameterType="com.xxfc.platform.vehicle.pojo.vo.CompanyVo"  resultType="com.xxfc.platform.vehicle.pojo.vo.CompanyVo">
+      SELECT
+      c.id as companyId,
+      c.`name` as companyName,
+      c.addr_detail as addrDetail,
+      c.state,
+      c.leader,
+      c.leader_contact_info as leaderContactInfo,
+      c.latitude,
+      c.longitude,
+      c.vehice_service_phone as vehiceServicePhone,
+      c.tour_service_phone as tourServicePhone,
+      c.zone_id as zoneId,
+      c.addr_province as addrProvince,
+      c.province_name as provinceName,
+      c.addr_city as addrCity,
+      c.city_name as cityName,
+      c.addr_town as addrTown,
+      c.town_name as townName,
+      b.cover,
+      b.id,
+      b.`name`,
+      r.id as stockId,
+      r.balance,
+      r.rank,
+      r.stock_state as stockState,
+      r.total,
+      r.type,
+      r.price
+      FROM   branch_company c
+      LEFT JOIN company_base b ON c.company_base_id=b.id
+      LEFT JOIN branch_company_stock_info_right r ON c.company_base_id=r.company_base_id
+        <where>
+            b.is_del=0
+            <if test="zoneId != null and zoneId !='' ">
+                and c.zone_id = #{zoneId}
+            </if>
+            <if test="addrProvince != null and addrProvince != ''">
+                and c.addr_province =#{addrProvince}
+            </if>
+            <if test="addrCity != null and addrCity != ''">
+                and c.addr_city =#{addrCity}
+            </if>
+            <if test="name != null and name != ''">
+                and  b.`name` like CONCAT('%',#{name},'%')
+            </if>
+        </where>
+       order by c.id desc
+  </select>
+</mapper>
\ No newline at end of file