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

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

@@ -36,4 +36,6 @@ public class BaseUserDTO extends PageParam implements DataInter {
     List<Integer> dataCorporationIds;
 
     List<Integer> dataCompanyIds;
+
+    Integer bizType;
 }

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

+package com.github.wxiaoqi.security.admin.dto;
+
+
+import com.github.wxiaoqi.security.common.vo.DataInter;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class BranchCompanyBannerDTO extends PageParam implements DataInter {
+
+    private Integer  status;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+    Integer bizType;
+}

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

 package com.github.wxiaoqi.security.admin.dto;
 
+
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
@@ -10,7 +11,7 @@ import lombok.Data;
  * @data 2019/8/23 16:27
  */
 @Data
-public class CompanyApplyFindDTO extends PageParam {
+public class CompanyApplyFindDTO extends PageParam  {
 
     private String  name;
 

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

 package com.github.wxiaoqi.security.admin.dto;
 
+import com.github.wxiaoqi.security.common.vo.DataInter;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
@@ -12,10 +13,18 @@ import java.util.List;
  * @data 2019/8/23 16:27
  */
 @Data
-public class CompanyInfoFindDTO extends PageParam {
+public class CompanyInfoFindDTO extends PageParam implements DataInter {
 
+    private Integer  status;
 
     private String  name;
 
     private List<Long> ids;
+
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+    Integer bizType;
 }

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

+package com.github.wxiaoqi.security.admin.dto;
+
+import com.github.wxiaoqi.security.common.vo.DataInter;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CompanySearchDTO extends PageParam implements DataInter {
+    Integer addrCity;
+    String lon;
+    String lat;
+    Integer state;
+    Integer isShow;
+    Integer isDel;
+    Integer addrProvince;
+
+    Long companyId;
+
+    String name;
+
+    Integer id;
+
+    List<Integer> companyIds;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+    Integer bizType;
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BranchCompanyBanner.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 店铺banner
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-11 11:06:45
+ */
+@Data
+@Table(name = "branch_company_banner")
+public class BranchCompanyBanner implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    //主键id
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Long id;
+
+
+
+	@Column(name = "company_id")
+	@ApiModelProperty(value = "店铺id")
+	private Integer companyId;
+	
+
+    @Column(name = "name")
+	@ApiModelProperty(value = "banner名称")
+    private String name;
+	
+
+    @Column(name = "cover")
+	@ApiModelProperty(value = "封面")
+    private String cover;
+
+
+    @Column(name = "rank")
+	@ApiModelProperty(value = "排序")
+    private Integer rank;
+	
+
+    @Column(name = "url")
+	@ApiModelProperty(value = "地址url")
+    private String url;
+
+
+
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态：1-上架；2-上架")
+    private Integer status;
+
+
+	@Column(name = "crt_time")
+	private Long crtTime;
+
+
+	@Column(name = "upd_time")
+	private Long updTime;
+	
+
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除；0-正常；1-删除")
+    private Integer isDel;
+	
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/CompanyInfo.java

@@ -62,6 +62,22 @@ public class CompanyInfo {
     private String mobile;
 
 
+    @ApiModelProperty("联系人身份证")
+    @Column(name = "contact_number")
+    private String contactNumber;
+
+
+    @ApiModelProperty("联系人身份证正面")
+    @Column(name = "contact_front_url")
+    private String contactFrontUrl;
+
+
+
+    @ApiModelProperty("联系人身份证反面")
+    @Column(name = "contact_back_url")
+    private String contactBackUrl;
+
+
     @ApiModelProperty("营业执照")
     @Column(name = "business_license")
     private String businessLicense;
@@ -144,6 +160,24 @@ public class CompanyInfo {
     private String registerCode;
 
 
+    @Column(name = "bank_account")
+    @ApiModelProperty("银行账号")
+    private String bankAccount;
+
+
+
+    @Column(name = "bank_name")
+    @ApiModelProperty("开户名")
+    private String bankName;
+
+
+
+
+    @Column(name = "bank")
+    @ApiModelProperty("开户行")
+    private String bank;
+
+
 
     @Column(name = "crt_time")
     private Long crtTime;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/CompanyInfoOrder.java

@@ -36,7 +36,7 @@ public class CompanyInfoOrder {
 
     @ApiModelProperty("支付状态：0-未支付：1-已支付：2-已退款")
     @Column(name = "pay_status")
-    private Integer pay_status;
+    private Integer payStatus;
 
 
 

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BranchCompanyBannerVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+
+import com.github.wxiaoqi.security.admin.entity.BranchCompanyBanner;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 16:27
+ */
+@Data
+public class BranchCompanyBannerVo extends BranchCompanyBanner {
+
+    private String  companyName;
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/CompanyApplyVo.java

@@ -15,6 +15,6 @@ public class CompanyApplyVo extends CompanyInfoApply {
 
 
     @ApiModelProperty("商家名称")
-    private Integer branchName;
+    private String branchName;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/CompanySearchVO.java

+package com.github.wxiaoqi.security.admin.vo;
+
+
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CompanySearchVO extends BranchCompany {
+    BigDecimal distance;
+
+    String companyName;
+}

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

+package com.github.wxiaoqi.security.admin.biz;
+
+
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.dto.BranchCompanyBannerDTO;
+import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.mapper.BranchCompanyBannerMapper;
+import com.github.wxiaoqi.security.admin.vo.BranchCompanyBannerVo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+
+@Service
+@Slf4j
+public class BranchCompanyBannerBiz extends BaseBiz<BranchCompanyBannerMapper, BranchCompanyBanner>{
+
+
+
+
+
+    public List<BranchCompanyBannerVo> getList(BranchCompanyBannerDTO branchCompanyBannerDTO){
+        return  mapper.selectList(branchCompanyBannerDTO);
+    }
+
+    public ObjectRestResponse selectList(BranchCompanyBannerDTO branchCompanyBannerDTO){
+        PageHelper.startPage(branchCompanyBannerDTO.getPage(), branchCompanyBannerDTO.getLimit());
+        PageInfo<BranchCompanyBannerVo> pageInfo = new PageInfo<>(getList(branchCompanyBannerDTO));
+        return ObjectRestResponse.succ(PageDataVO.pageInfo(pageInfo));
+    }
+
+
+}

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

@@ -2,16 +2,23 @@ package com.github.wxiaoqi.security.admin.biz;
 
 
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
 import com.github.wxiaoqi.security.admin.entity.BranchCompany;
 import com.github.wxiaoqi.security.admin.mapper.BranchCompanyMapper;
+import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.universal.dto.SendMsgDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
 
 
@@ -53,6 +60,18 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
 
+    public PageDataVO<CompanySearchVO> search(CompanySearchDTO vo) {
+        PageHelper.startPage(vo.getPage(), vo.getLimit());
+        PageInfo<CompanySearchVO> branchCompanyPageInfo = new PageInfo<>(getList(vo));
+        return PageDataVO.pageInfo(branchCompanyPageInfo);
+    }
+
+
+    public List<CompanySearchVO> getList(CompanySearchDTO vo){
+        return  mapper.search(vo);
+    }
+
+
 
 
 }

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

@@ -21,6 +21,7 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,14 +57,21 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
         if (list.size() > 0){
             throw  new BaseException("公司名称不能重复",ResultCode.FAILED_CODE);
         }
+
         BigDecimal platformAmount=BigDecimal.ZERO;
         BigDecimal margin=BigDecimal.ZERO;
         CompanyInfo companyInfo1=null;
         Integer formType=2;
         if (id > 0){
+            if (checkStatus(id) > 0L){
+                throw  new BaseException("已存在待审核记录",ResultCode.FAILED_CODE);
+            }
             companyInfo1=companyInfoBiz.selectById(id);
             BeanUtils.copyPropertiesTargetIsEquals(companyInfo1,companyInfo);
         }else {
+            if (checkApplyStatus(companyInfo.getAppUserId()) > 0L ){
+                throw  new BaseException("已存在待审核记录",ResultCode.FAILED_CODE);
+            }
             JSONObject jsonObject=getApplyOrder();
             if (jsonObject != null && jsonObject.getInteger("isPay") == 1){
                 platformAmount=jsonObject.getBigDecimal("platformAmount") == null ? BigDecimal.ZERO :jsonObject.getBigDecimal("platformAmount")  ;
@@ -101,6 +109,21 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
         return  companyInfoApply;
     }
 
+    public Long checkStatus(Long branchId){
+        CompanyInfoApply companyInfoApply=new CompanyInfoApply();
+        companyInfoApply.setBranchId(branchId);
+        companyInfoApply.setStatus(0);
+        return  selectCount(companyInfoApply);
+    }
+
+    public Long checkApplyStatus(Integer appUserId){
+        CompanyInfoApply companyInfoApply=new CompanyInfoApply();
+        companyInfoApply.setAppUserId(appUserId);
+        companyInfoApply.setStatus(0);
+        companyInfoApply.setFormType(1);
+        return  selectCount(companyInfoApply);
+    }
+
     //入驻规则管理
     public JSONObject getApplyOrder(){
         try {
@@ -145,8 +168,7 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
         companyInfoVo.setCompanyInfoApply(companyInfoApply);
         companyInfoVo.setCompanyInfoOrderList(companyInfoOrderBiz.getList(id));
         return  companyInfoVo;
-
-        }
+    }
 
     @Transactional(rollbackFor = Exception.class)
     public  void  audit(CompanyInfoApply companyInfoApply) {
@@ -165,7 +187,7 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
                 CompanyInfoApply companyInfoApply1=new CompanyInfoApply();
                 companyInfoApply1.setId(companyInfoApply.getId());
                 companyInfoApply1.setBranchId(id);
-                updateSelectiveById(companyInfoApply);
+                updateSelectiveById(companyInfoApply1);
             }
 
         }
@@ -174,6 +196,19 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
 
 
 
+    public CompanyInfoVo  getCompanyInfo(CompanyInfo companyInfo){
+        Long branchId = companyInfo.getId() == null ? 0L : companyInfo.getId();
+        CompanyInfoVo companyInfoVo=new CompanyInfoVo();
+        BeanUtils.copyProperties(companyInfo,companyInfoVo);
+        if (branchId != null  ){
+            CompanyInfoApply companyInfoApply=mapper.getOneByOrderUpdTime(branchId);
+            companyInfoVo.setCompanyInfoApply(companyInfoApply);
+        }
+        return  companyInfoVo;
+    }
+
+
+
 
 
 

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

@@ -15,7 +15,7 @@ import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
 import com.xxfc.platform.universal.dto.SendMsgDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
-import com.xxfc.platform.vehicle.pojo.dto.CompanyInfoFindDTO;
+import com.github.wxiaoqi.security.admin.dto.CompanyInfoFindDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -135,6 +135,9 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
         if (companyInfoFindDTO.getIds() != null && companyInfoFindDTO.getIds().size() > 0){
             criteria.andIn("id",companyInfoFindDTO.getIds());
         }
+        if (companyInfoFindDTO.getDataCorporationIds() != null && companyInfoFindDTO.getDataCorporationIds().size() > 0){
+            criteria.andIn("id",companyInfoFindDTO.getDataCorporationIds());
+        }
         example.setOrderByClause("crt_time desc ");
 
         return  selectByExample(example);

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

@@ -22,7 +22,7 @@ public class CompanyInfoOrderBiz extends BaseBiz<CompanyInfoOrderMapper, Company
     public  void  saveOrder(CompanyInfoOrder companyInfoOrder){
         companyInfoOrder.setOderNo(OrderUtil.GetOrderNumber("", OrderUtil.COMPANY_MID));
         if (companyInfoOrder.getRealAmount().compareTo(BigDecimal.ZERO) == 0){
-            companyInfoOrder.setPay_status(1);
+            companyInfoOrder.setPayStatus(1);
             companyInfoOrder.setPayTime(System.currentTimeMillis());
         }
         insertSelective(companyInfoOrder);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BranchCompanyBannerMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.dto.BranchCompanyBannerDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompanyBanner;
+import com.github.wxiaoqi.security.admin.vo.BranchCompanyBannerVo;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.common.Mapper;
+import java.util.List;
+
+/**
+ * 店铺banner
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-11 11:06:45
+ */
+@Repository
+public interface BranchCompanyBannerMapper extends Mapper<BranchCompanyBanner> {
+
+    List<BranchCompanyBannerVo> selectList(BranchCompanyBannerDTO branchCompanyBannerDTO);
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BranchCompanyMapper.java

@@ -2,10 +2,16 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 
 
+import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
 import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
 
+    List<CompanySearchVO> search(CompanySearchDTO companySearchDTO);
+
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/CompanyInfoApplyMapper.java

@@ -3,6 +3,8 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoApply;
 import com.github.wxiaoqi.security.admin.vo.CompanyApplyVo;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -11,4 +13,7 @@ import java.util.List;
 public interface CompanyInfoApplyMapper extends Mapper<CompanyInfoApply>, SelectByIdListMapper<CompanyInfoApply,Long> {
 
     List<CompanyApplyVo> selectList(CompanyApplyFindDTO companyApplyFindDTO);
+
+    @Select("SELECT * FROM  company_info_apply WHERE branch_id=#{branchId} and form_type=2  ORDER BY upd_time DESC LIMIT 1")
+    CompanyInfoApply getOneByOrderUpdTime(@Param("branchId")Long branchId);
 }
\ No newline at end of file

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

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.BranchCompanyBannerBiz;
+import com.github.wxiaoqi.security.admin.dto.BranchCompanyBannerDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompanyBanner;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("backstage/companyBanner")
+@RequiredArgsConstructor(onConstructor_ = {@Autowired})
+@Api(tags = {"店铺Banner"})
+public class AdminBranchCompanyBannerController extends BaseController<BranchCompanyBannerBiz, BranchCompanyBanner>{
+
+
+
+    @GetMapping("selectList")
+    @ApiModelProperty("店铺Banner列表")
+    public  ObjectRestResponse selectList(BranchCompanyBannerDTO branchCompanyBannerDTO) {
+     return  baseBiz.selectList(branchCompanyBannerDTO);
+    }
+
+
+
+
+
+
+}

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

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.BranchCompanyBiz;
+import com.github.wxiaoqi.security.admin.biz.CompanyInfoBiz;
+import com.github.wxiaoqi.security.admin.dto.CompanySearchDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.admin.vo.CompanySearchVO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("backstage/branchCompany")
+@RequiredArgsConstructor(onConstructor_ = {@Autowired})
+@Api(tags = {"店铺"})
+public class AdminBranchCompanyController extends BaseController<BranchCompanyBiz, BranchCompany> implements UserRestInterface {
+
+
+    @Autowired
+    CompanyInfoBiz companyInfoBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+
+    @GetMapping("search")
+    @ApiModelProperty("店铺列表")
+    public  ObjectRestResponse search(CompanySearchDTO companySearchDTO) {
+     return ObjectRestResponse.succ( baseBiz.search(companySearchDTO));
+    }
+
+
+
+    @PostMapping("addOrUpd")
+    @ApiModelProperty("店铺更新")
+    public  ObjectRestResponse addOrUpd(@RequestBody BranchCompany branchCompany) {
+        return baseBiz.addOrUpd(branchCompany);
+    }
+
+    @GetMapping("info")
+    @ApiModelProperty("店铺信息")
+    public  ObjectRestResponse search() {
+        CompanySearchDTO companySearchDTO=new CompanySearchDTO();
+        setPowerData(companySearchDTO);
+        List<CompanySearchVO> list = baseBiz.getList(companySearchDTO);
+        if (list.size() == 0){
+            throw  new BaseException("店铺不存在", ResultCode.FAILED_CODE);
+        }
+        return ObjectRestResponse.succ(list.get(0));
+    }
+
+
+
+
+}

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

@@ -5,9 +5,13 @@ import com.github.wxiaoqi.security.admin.biz.CompanyInfoBiz;
 import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoApply;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.xxfc.platform.vehicle.pojo.dto.CompanyInfoFindDTO;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.admin.dto.CompanyInfoFindDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author Administrator
  */
@@ -23,13 +29,23 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("backstage/company")
 @RequiredArgsConstructor(onConstructor_ = {@Autowired})
 @Api(tags = {"商家申请"})
-public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyBiz,CompanyInfoApplyBiz> {
+public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyBiz,CompanyInfoApply>implements UserRestInterface {
 
 
     @Autowired
     CompanyInfoBiz companyInfoBiz;
 
 
+    @Autowired
+    UserFeign userFeign;
+
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+
     @GetMapping("apply/selectList")
     @ApiModelProperty("商家入驻申请")
     public  ObjectRestResponse applySelectList(CompanyApplyFindDTO companyApplyFindDTO) {
@@ -67,10 +83,16 @@ public class AdminCompanyInfoController extends BaseController<CompanyInfoApplyB
     }
 
 
-    @GetMapping("info/{id}")
+    @GetMapping("info")
     @ApiModelProperty("商家信息")
-    public  ObjectRestResponse info(@PathVariable("id") Long id) {
-        return ObjectRestResponse.succ( companyInfoBiz.selectById(id));
+    public  ObjectRestResponse info() {
+        CompanyInfoFindDTO companyInfoFindDTO=new CompanyInfoFindDTO();
+        setPowerData(companyInfoFindDTO);
+        List<CompanyInfo> list = companyInfoBiz.getList(companyInfoFindDTO);
+        if (list == null || list.size() == 0){
+            throw  new BaseException("商家不存在", ResultCode.FAILED_CODE);
+        }
+        return ObjectRestResponse.succ(baseBiz.getCompanyInfo(list.get(0)));
     }
 
 

ace-modules/ace-admin/src/main/resources/mapper/BranchCompanyBannerMapper.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.github.wxiaoqi.security.admin.mapper.BranchCompanyBannerMapper">
+
+
+    <select id="selectList"  resultType="com.github.wxiaoqi.security.admin.vo.BranchCompanyBannerVo" parameterType="com.github.wxiaoqi.security.admin.dto.BranchCompanyBannerDTO">
+        SELECT
+        a.*,
+        b.`name` as companyName
+        FROM branch_company_banner a
+        LEFT JOIN  branch_company b on a.company_id=b.id
+        LEFT JOIN  company_info i on  b.company_id=i.id
+        <where>
+             a.is_del = 0
+            <if test="status != null ">
+                AND  a.`status`= #{status}
+            </if>
+            <if test="dataCorporationIds != null and dataCorporationIds.size > 0">
+                and  b.company_id  in
+                <foreach collection="dataCorporationIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+       order by a.upd_time DESC
+    </select>
+</mapper>
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/BranchCompanyMapper.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.github.wxiaoqi.security.admin.mapper.BranchCompanyMapper">
+    <resultMap id="BaseResultMap" type="com.github.wxiaoqi.security.admin.entity.BranchCompany">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="name" property="name" jdbcType="VARCHAR"/>
+        <result column="short_name" property="shortName" jdbcType="VARCHAR"/>
+        <result column="branch_type" property="branchType" jdbcType="INTEGER"/>
+        <result column="subordinate_branch" property="subordinateBranch" jdbcType="INTEGER"/>
+        <result column="addr_province" property="addrProvince" jdbcType="INTEGER"/>
+        <result column="addr_city" property="addrCity" jdbcType="INTEGER"/>
+        <result column="addr_town" property="addrTown" jdbcType="INTEGER"/>
+        <result column="addr_detail" property="addrDetail" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="vehice_service_phone" property="vehiceServicePhone"/>
+        <result column="tour_service_phone" property="tourServicePhone"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="zone_id" property="zoneId"/>
+        <result column="state" property="state"/>
+    </resultMap>
+
+    <select id="search" parameterType="com.github.wxiaoqi.security.admin.dto.CompanySearchDTO" resultType="com.github.wxiaoqi.security.admin.vo.CompanySearchVO">
+        select c.*,i.name as companyName
+        <if test="lon != null and lat != null">
+            , st_distance_sphere(point(#{lon}, #{lat}), point(c.longitude, c.latitude)) as distance
+        </if>
+        from branch_company c
+        LEFT JOIN  company_info i on  c.company_id=i.id
+        <where>
+             c.is_del = 0
+            <if test="id != null">
+                and c.id = #{id}
+            </if>
+            <if test="addrCity != null">
+                and (c.addr_city = #{addrCity} or c.addr_province = #{addrCity} or c.addr_town = #{addrCity})
+            </if>
+            <if test="addrProvince != null">
+                and  c.addr_province = #{addrProvince}
+            </if>
+            <if test="lon != null and lat != null">
+                and c.longitude is not null and c.latitude is not null
+            </if>
+            <if test="state != null">
+                and c.state = #{state}
+            </if>
+            <if test="companyId != null">
+                and c.company_id = #{companyId}
+            </if>
+            <if test="isShow != null">
+                and c.is_show = #{isShow}
+            </if>
+            <if test="name != null and name != '' ">
+                and ( c.name like  concat('%',#{name},'%') or  c.short_name like  concat('%',#{name},'%') )
+            </if>
+            <if test="companyIds != null and companyIds.size > 0">
+                and c.id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
+                and c.id in
+                <foreach collection="dataCompanyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="dataCorporationIds != null and dataCorporationIds.size > 0">
+                and c.company_id  in
+                <foreach collection="dataCorporationIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+        <choose>
+            <when test="lon != null and lat != null">
+                order by c.distance asc
+            </when>
+            <otherwise>
+                order by c.id desc
+            </otherwise>
+        </choose>
+    </select>
+
+
+</mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/WalletCathDTO.java

@@ -55,6 +55,8 @@ public class WalletCathDTO extends PageParam implements DataInter {
 
     List<Integer> dataCompanyIds;
 
+    Integer bizType;
+
 
 
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/WalletDTO.java

@@ -39,6 +39,8 @@ public class WalletDTO extends PageParam implements DataInter {
 
     List<Integer> dataCompanyIds;
 
+    Integer bizType;
+
 
 
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/WalletDetailDTO.java

@@ -48,6 +48,8 @@ public class WalletDetailDTO extends PageParam implements DataInter {
 
     List<Integer> dataCompanyIds;
 
+    Integer bizType;
+
 
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -430,6 +430,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private Integer corporationId;
 
+        Integer bizType;
+
     }
 
     @RequestMapping(value = "/app/unauth/refund/{no}/{refundAmount}", method = RequestMethod.POST)

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSearchDTO.java

@@ -42,6 +42,8 @@ public class GoodSearchDTO extends PageParam implements DataInter {
 	List<Integer> dataCorporationIds;
 
 	List<Integer> dataCompanyIds;
+
+	Integer bizType;
 	
 
 	

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCommonPriceInfo.java

@@ -116,4 +116,7 @@ public class VehicleCommonPriceInfo implements Serializable, DataInter {
 
     @Transient
 	List<Integer> dataCorporationIds;
+
+    @Transient
+    Integer bizType;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleHolidayPriceInfo.java

@@ -129,4 +129,9 @@ public class VehicleHolidayPriceInfo implements Serializable, DataInter {
 
 	@Transient
 	List<Integer> dataCorporationIds;
+
+	@Transient
+	Integer bizType;
+
+
 }

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

@@ -28,5 +28,7 @@ public class CompanySearchDTO extends PageParam implements DataInter {
 
     List<Integer> dataCompanyIds;
 
+    Integer bizType;
+
 
 }

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

@@ -159,4 +159,6 @@ public class VehiclePageQueryVo implements DataInter {
 
     List<Integer> dataCorporationIds;
 
+    Integer bizType;
+
 }

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

 package com.xxfc.platform.vehicle.pojo.dto;
 
+import com.github.wxiaoqi.security.common.vo.DataInter;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
@@ -12,10 +13,16 @@ import java.util.List;
  * @data 2019/8/23 16:27
  */
 @Data
-public class CompanyInfoFindDTO extends PageParam {
+public class CompanyInfoFindDTO extends PageParam implements DataInter {
 
 
     private String  name;
 
     private List<Long> ids;
+
+    List<Integer> dataCorporationIds;
+
+    List<Integer> dataCompanyIds;
+
+    Integer bizType;
 }

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

@@ -57,4 +57,6 @@ public class VehiclePlanDto extends PageParam implements DataInter {
     List<Integer> dataCorporationIds;
 
     List<Integer> dataCompanyIds;
+
+    Integer bizType;
 }