修改入驻流程

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BranchCompany.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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@Table(name = "branch_company")
+public class BranchCompany {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @Column(name = "company_base_id")
+    @ApiModelProperty("主键id")
+    private Integer companyBaseId;
+
+
+    @Column(name = "company_id")
+    @ApiModelProperty("公司id")
+    private Long companyId;
+
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+
+
+    @Column(name = "short_name")
+    @ApiModelProperty("简称")
+    private String shortName;
+
+    /**
+     * 分支机构类型
+     */
+    @Column(name = "branch_type")
+    @ApiModelProperty("分支机构类型")
+    private Integer branchType;
+
+    /**
+     * 分支机构所属机构
+     */
+    @Column(name = "subordinate_branch")
+    @ApiModelProperty("分支机构所属机构")
+    private Integer subordinateBranch;
+
+
+
+    /**
+     * 地址-省/直辖市(编码)
+     */
+    @Column(name = "addr_province")
+    @ApiModelProperty("地址-省/直辖市(编码)")
+    private Integer addrProvince;
+
+    /**
+     * 地址-省/直辖市(编码)名称
+     */
+    @Column(name = "province_name")
+    @ApiModelProperty("地址-省/直辖市(编码)名称")
+    private String provinceName;
+
+    /**
+     * 地址-市(编码)
+     */
+    @Column(name = "addr_city")
+    @ApiModelProperty("地址-市(编码)")
+    private Integer addrCity;
+
+
+    /**
+     * 地址-市(编码)名称
+     */
+    @Column(name = "city_name")
+    @ApiModelProperty("地址-市(编码名称")
+    private String cityName;
+
+    /**
+     * 地址-镇/县（编码）
+     */
+    @Column(name = "addr_town")
+    @ApiModelProperty("地址-镇/县（编码）")
+    private Integer addrTown;
+
+    /**
+     * 地址-县名称
+     */
+    @Column(name = "town_name")
+    @ApiModelProperty("县名称")
+    private String townName;
+
+    /**
+     * 详细地址
+     */
+    @Column(name = "addr_detail")
+    @ApiModelProperty("详细地址")
+    private String addrDetail;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    /**
+     * 负责人
+     */
+    @ApiModelProperty("负责人")
+    private String leader;
+
+    /**
+     * 负责人联系方式
+     */
+    @ApiModelProperty("负责人联系方式")
+    private String leaderContactInfo;
+    /**
+     * 分公司状态
+     */
+    @ApiModelProperty("分公司状态")
+    private Integer status;
+
+    /**
+     *公司地址-纬度
+     */
+    @ApiModelProperty("公司地址-纬度")
+    private BigDecimal latitude;
+
+    /**
+     * 公司地址-经度
+     */
+    @ApiModelProperty("公司地址-经度")
+    private BigDecimal longitude;
+
+    private String companyPic;
+
+    private Integer zoneId;
+
+    private String phone;
+
+    /**
+     * 租车客服电话
+     */
+    @Column(name = "vehice_service_phone")
+    @ApiModelProperty("租车客服电话")
+    private String vehiceServicePhone;
+    /**
+     * 旅游客服电话
+     */
+    @Column(name = "tour_service_phone")
+    @ApiModelProperty("旅游客服电话")
+    private String tourServicePhone;
+
+    /**
+     * 上下架:1-上架；2-下架
+     */
+    private Integer state;
+    /**
+     * 是否app展示：1-是；2-否
+     */
+    @Column(name = "is_show")
+    private Integer isShow;
+
+    /**
+     * 是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+    private Integer isDel;
+
+}
\ No newline at end of file

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

 package com.github.wxiaoqi.security.admin.biz;
 
 
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
 import com.github.wxiaoqi.security.admin.mapper.BranchCompanyMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
+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 static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
+
 
 @Service
 @Slf4j
 public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany>{
 
 
-
+    @Autowired
+    MQSenderFeign mqSenderFeign;
 
 
     public ObjectRestResponse addOrUpd(BranchCompany branchCompany){
@@ -25,7 +32,24 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         }else {
              insertSelective(branchCompany);
         }
+        sendQueue(branchCompany);
         return  ObjectRestResponse.succ();
     }
 
+
+
+    public void sendQueue(BranchCompany branchCompany) {
+        try {
+
+            SendMsgDTO sendMsgDTO = new SendMsgDTO() {{
+                setExchange(ADMIN_TOPIC);
+            }};
+            sendMsgDTO.setJson(JSONUtil.toJsonStr(branchCompany));
+            sendMsgDTO.setRoutKey(KEY_COMPANY_UPD);
+            mqSenderFeign.postSendMessage(sendMsgDTO);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
 }

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

 package com.github.wxiaoqi.security.admin.biz;
 
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.CompanyApplyFindDTO;
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoApply;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoOrder;
@@ -38,6 +40,8 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
 
     @Autowired
     ConfigFeign  configFeign;
+
+
     @Autowired
     CompanyInfoOrderBiz companyInfoOrderBiz;
 
@@ -166,9 +170,6 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
 
         }
 
-
-
-
     }
 
 

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

@@ -11,6 +11,8 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 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.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;
@@ -41,6 +43,13 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
     UserBiz userBiz;
 
 
+    @Autowired
+    ConfigFeign  configFeign;
+
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
+
 
 
 
@@ -57,13 +66,34 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
         }else {
             insertSelective(companyInfo);
             id=companyInfo.getId();
+            //初始化商家账号
             addUser(id);
+            //初始化店铺
+            BranchCompany branchCompany = getBranchCompanyInfo();
+            branchCompany.setCompanyId(id);
+            branchCompanyBiz.addOrUpd(branchCompany);
         }
         sendQueue(companyInfo);
         return  id;
     }
 
 
+
+    //初始化店铺信息
+    public BranchCompany getBranchCompanyInfo(){
+        try {
+            List<Cofig> list=configFeign.getAllByType(ConfigFeign.TYPE_BRANCH_COMPANY+"").getData();
+            if (list!=null && list.size()>0){
+                String params=list.get(0).getParams();
+                return  JSONUtil.toBean(params, BranchCompany.class);
+            }
+        }catch (Exception e){
+            log.error(e.getMessage(), e);;
+        }
+        return  null;
+    }
+
+
     public  void   saveOrUpd(CompanyInfo companyInfo){
         Long id = companyInfo.getId() == null ? 0L :companyInfo.getId();
         if (id  > 0L ){

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

 package com.github.wxiaoqi.security.admin.mapper;
 
 
-import com.xxfc.platform.vehicle.entity.BranchCompany;
+
+import com.github.wxiaoqi.security.admin.entity.BranchCompany;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
-import java.util.List;
-import java.util.Map;
-
 public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
 
 }
\ No newline at end of file

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -25,6 +25,8 @@ public interface ConfigFeign {
 
     public  static final int TYPE_COMPANY_APPLY=110;
 
+    public  static final int TYPE_BRANCH_COMPANY=111;
+
     @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
     ObjectRestResponse<List<Cofig>> getAllByType(@RequestParam("types") String types);
 

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

@@ -501,12 +501,12 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     public ObjectRestResponse  saveOrUpd(BranchCompany branchCompany){
         Integer id= branchCompany.getId() == null ? 0 : branchCompany.getId();
-        if (id > 0){
+        BranchCompany branchCompany1=selectById(id);
+        if (branchCompany1 != null){
             updateSelectiveById(branchCompany);
         }else {
             insertSelective(branchCompany);
         }
-        //sendQueue(branchCompany);
         return  ObjectRestResponse.succ();
     }
     public ObjectRestResponse  del(BranchCompany branchCompany){

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

@@ -26,10 +26,11 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
 
     public ObjectRestResponse addOrUpd(CompanyInfo companyInfo){
         Long id = companyInfo.getId() == null ? 0L :companyInfo.getId();
-        if (id > 0L){
-             updateSelectiveById(companyInfo);
+        CompanyInfo companyInfo1=selectById(id);
+        if (companyInfo1 != null){
+            updateSelectiveById(companyInfo);
         }else {
-             insertSelective(companyInfo);
+            insertSelective(companyInfo);
         }
         return  ObjectRestResponse.succ();
     }