添加商家入驻流程

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

@@ -2,9 +2,12 @@ package com.github.wxiaoqi.security.admin.vo;
 
 import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
 import com.github.wxiaoqi.security.admin.entity.CompanyInfoApply;
+import com.github.wxiaoqi.security.admin.entity.CompanyInfoOrder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -18,4 +21,8 @@ public class CompanyInfoVo extends CompanyInfo {
     @ApiModelProperty("商家审核记录")
     private CompanyInfoApply companyInfoApply;
 
+
+    @ApiModelProperty("商家订单记录")
+    private List<CompanyInfoOrder> companyInfoOrderList;
+
 }

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

@@ -139,6 +139,7 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
             }
          }
         companyInfoVo.setCompanyInfoApply(companyInfoApply);
+        companyInfoVo.setCompanyInfoOrderList(companyInfoOrderBiz.getList(id));
         return  companyInfoVo;
 
         }
@@ -162,6 +163,7 @@ public class CompanyInfoApplyBiz extends BaseBiz<CompanyInfoApplyMapper, Company
                 companyInfoApply1.setBranchId(id);
                 updateSelectiveById(companyInfoApply);
             }
+
         }
 
 

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

@@ -4,10 +4,7 @@ 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.entity.AppUser;
-import com.github.wxiaoqi.security.admin.entity.CompanyInfo;
-import com.github.wxiaoqi.security.admin.entity.CompanyInfoApply;
-import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.CompanyInfoMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -38,7 +35,10 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
     MQSenderFeign mqSenderFeign;
 
     @Autowired
-    AppUserBiz appUserBiz;
+    AppUserLoginBiz appUserBiz;
+
+    @Autowired
+    UserBiz userBiz;
 
 
 
@@ -57,7 +57,7 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
         }else {
             insertSelective(companyInfo);
             id=companyInfo.getId();
-
+            addUser(id);
         }
         sendQueue(companyInfo);
         return  id;
@@ -119,15 +119,25 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
     public  void  addUser(Long branchId){
         CompanyInfo companyInfo = selectById(branchId);
         Integer appUserId=companyInfo.getAppUserId() == null ? 0 : companyInfo.getAppUserId();
-        AppUser appUser = appUserBiz.selectById(appUserId);
-        if (appUser == null ){
+        AppUserLogin appUser = appUserBiz.selectById(appUserId);
+        if (appUser == null || StringUtils.isBlank(appUser.getUsername())){
             throw  new BaseException("app用户不存在",ResultCode.FAILED_CODE);
         }
         String username=appUser.getUsername();
-     /*   String password=
-        User user =new User();
-
-        user.setUsername(companyInfo.get);*/
+        User user = userBiz.getUserByUsername(username);
+        if (user != null ){
+            throw  new BaseException("商家用户已存在相同手机号"+username,ResultCode.FAILED_CODE);
+        }
+        String password=username.substring(5);
+        user =new User();
+        user.setUsername(username);
+        user.setName(companyInfo.getName());
+        user.setPassword(password);
+        user.setStatus(1);
+        user.setCorporationId(branchId);
+        user.setDataAll(2);
+        user.setDataCorporation(branchId+"");
+        userBiz.insertSelective(user);
     }
 
 }

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

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 
 @Service
@@ -28,6 +29,13 @@ public class CompanyInfoOrderBiz extends BaseBiz<CompanyInfoOrderMapper, Company
     }
 
 
+    public List<CompanyInfoOrder>  getList(Long branchApplyId){
+        CompanyInfoOrder companyInfoOrder=new CompanyInfoOrder();
+        companyInfoOrder.setBranchApplyId(branchApplyId);
+        return  selectList(companyInfoOrder);
+    }
+
+
 
 
 

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

@@ -22,6 +22,10 @@ import org.springframework.web.bind.annotation.*;
 public class AppCompanyInfoController extends BaseController<CompanyInfoApplyBiz> {
 
 
+    @Autowired
+    CompanyInfoOrderBiz companyInfoOrderBiz;
+
+
     @PostMapping("apply")
     @ApiModelProperty("商家入驻申请")
     public  ObjectRestResponse apply(@RequestBody CompanyInfo companyInfo) {
@@ -30,5 +34,12 @@ public class AppCompanyInfoController extends BaseController<CompanyInfoApplyBiz
     }
 
 
+    @GetMapping("order/{id}")
+    @ApiModelProperty("商家入驻订单")
+    public  ObjectRestResponse applySelectList(@PathVariable("id") Long id) {
+        return ObjectRestResponse.succ( companyInfoOrderBiz.getList(id));
+    }
+
+
 
 }