Skip to content

T
tcm-system
Commit c5fe681a authored by zjy's avatar zjy
Browse files
Options

user/role/tright 6.2 

分离了胖丁和商户的我的管理
还需要调用其他服务
parent ca7e39f0
Hide whitespace changes
Inline Side-by-side
Showing with 265 additions and 54 deletions
src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java 0 → 100644
View file @ c5fe681a
package com.pangding.web.authority.controller;
import com.pangding.web.authority.service.CompanyService;
import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* 公司我的管理controller
* @author tangfang
* @date 2019-05-20 10:49
*/
@RestController
@RequestMapping(value="/company")
public class CompanyManagementController {
@Autowired
CompanyService companyServiceImpl;
/**y
* 新增/修改公司信息
* @param reqVo 公司以及公司扩展表信息
* @return 公司信息
*/
@RequestMapping(value = "/saveCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyVo> saveCompany(@RequestBody CompanyAndCompanyExtendSaveReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyName",reqVo.getCompanyName())
.notBlankCheck("companyType",reqVo.getCompanyType())
.notBlankCheck("businessLicenseCode",reqVo.getBusinessLicenseCode())
.notBlankCheck("address",reqVo.getAddress())
.notBlankCheck("companyAttribute",reqVo.getCompanyAttribute())
.notBlankCheck("contactName",reqVo.getContactName())
.notBlankCheck("contactPhone",reqVo.getContactPhone())
.checkPhoneNo("contactPhone",reqVo.getContactPhone())
.notBlankCheck("contactCode",reqVo.getContactCode())
.checkIdCard("contactCode",reqVo.getContactCode())
.notBlankCheck("electromicAgreementCode",reqVo.getElectromicAgreementCode())
.notBlankCheck("signingStatus",reqVo.getSigningStatus())
.notBlankCheck("status",reqVo.getStatus())
.notBlankCheck("nature",reqVo.getNature())
.notBlankCheck("productOrInterface",reqVo.getProductOrInterface())
.checkException();
return ResponseResult.result(companyServiceImpl.saveCompany(reqVo));
}
/**y
* 商户查看详情，根据公司id返回用户信息和公司主表信息
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司主表信息的对象
*/
@RequestMapping(value = "/detail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<DetailResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
}
/**y
* 我的二维码页面
* @param reqVo 公司扩展表请求对象
* @return 公司主表信息
*/
@RequestMapping(value = "/myQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyVo> myQrCodeUrl(@RequestBody CompanyGetReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.myQrCodeUrl(reqVo));
}
/**
* 获取二维码url，有则直接返回，没有则调用微信服务生成url
* @param reqVo 封装了公司id，页面选项的请求对象
* @return 二维码url
*/
@RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.notBlankCheck("select",reqVo.getSelect())
.checkException();
return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));
}
/**y
* 保存/修改银行卡信息，并调用第三方接口发送手机验证码
*
* @param reqVo 公司银行卡表信息
* @return 银行卡表主键
*/
@RequestMapping(value = "/saveBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> saveBank(@RequestBody CompanyBankCardVo reqVo){
checkBank(reqVo);
return ResponseResult.result(companyServiceImpl.saveBank(reqVo));
}
private void checkBank(CompanyBankCardVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardCode",reqVo.getBankCardCode())
.notNumberCheck("bankCardCode",reqVo.getBankCardCode())
.notBlankCheck("bankName",reqVo.getBankName())
.notBlankCheck("name",reqVo.getName())
.notBlankCheck("idCard",reqVo.getIdCard())
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkIdCard("idCard",reqVo.getIdCard())
.notBlankCheck("reservedPhone",reqVo.getReservedPhone())
.checkPhoneNo("reservedPhone",reqVo.getReservedPhone())
.checkException();
}
/**y
* 提交银行卡信息，验证手机验证码，并更新银行卡状态
* @param reqVo 银行卡表数据+验证码
* @return 目前返回验证码
*/
@RequestMapping(value = "/bankSubmit", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyBankCardVo> bankSubmit(@RequestBody BankSubmitReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardId",reqVo.getId())
.notBlankCheck("verifyCode",reqVo.getVerifyCode())
.checkException();
return ResponseResult.result(companyServiceImpl.bankSubmit(reqVo));
}
/**
* 获取银行卡列表
* @param reqVo 继承了分页对象，含公司id
* @return 银行卡列表分页对象
*/
@RequestMapping(value = "/bankCardList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<PageSizeData<CompanyBankCardVo>> bankCardList(@RequestBody BankCardListReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkException();
return ResponseResult.result(companyServiceImpl.getBankCardList(reqVo));
}
/**y
* 添加用户
* @param reqVo 封装了用户信息和用户角色信息的请求对象
* @return 用户id
*/
@RequestMapping(value = "/saveUser", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> saveUser(@RequestBody WebUserReqVo reqVo) throws Exception {
CheckerHelper.newInstance()
.notBlankCheck("account",reqVo.getAccount())
.notBlankCheck("password",reqVo.getPassword())
.notBlankCheck("phone",reqVo.getPhone())
.checkPhoneNo("phone",reqVo.getPhone())
.notBlankCheck("createId",reqVo.getCreateId())
.notBlankCheck("createName",reqVo.getCreateName())
.notBlankCheck("companyId",reqVo.getCompanyId())
.checkException();
return ResponseResult.result(companyServiceImpl.saveUser(reqVo));
}
/**
* 删除银行卡
* @param reqVo 封装了银行卡id的请求对象
* @return
*/
@RequestMapping(value = "/deleteBank", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult deleteBank(@RequestBody CompanyBankCardVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyBankCardId",reqVo.getId())
.checkException();
companyServiceImpl.deleteBank(reqVo);
return new ResponseResult();
}
/**
* 设置该银行卡为默认支付，并取消其他银行卡的默认
* @param reqVo 封装了银行卡id的请求对象
* @return
*/
@RequestMapping(value = "/setDefault", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult setDefault(@RequestBody CompanyBankCardVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("bankCardId",reqVo.getId())
.checkException();
companyServiceImpl.setDefault(reqVo);
return new ResponseResult();
}
}
src/main/java/com/pangding/web/authority/controller/CompanyController.java → src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @ c5fe681a
......@@ -5,7 +5,6 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.CompanyResVo;
import com.pangding.web.authority.vo.resvo.DetailResVo;
import com.yanzuoguang.util.helper.CheckerHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -17,18 +16,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
/**
* 公司controller
* @author tangfang
* @date 2019-05-20 10:49
* 胖丁我的管理Controller
* @Author zhangjinyao
* @create 2019/6/2 14:48
*/
@RestController
@RequestMapping(value="/company")
public class CompanyController {
@RequestMapping(value="/pangding")
public class PangdingManagementController {
@Autowired
CompanyService companyServiceImpl;
/**y
* 分页查询公司信息
* @param reqVo 继承了分页对象
......@@ -90,43 +87,30 @@ public class CompanyController {
}
/**y
* 商户查看详情，根据公司id返回用户信息和公司主表信息
* @param reqVo 包含公司id的请求对象
* @return 封装了用户，公司主表信息的对象
*/
@RequestMapping(value = "/detail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<DetailResVo> getDetail(@RequestBody CompanyGetReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.getDetail(reqVo));
}
/**y
* 获取我的二维码url
* 我的二维码页面
* @param reqVo 公司扩展表请求对象
* @return 公司二维码url
* @return 公司主表信息
*/
@RequestMapping(value = "/getQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> getQrCodeUrl(@RequestBody CompanyExtendGetReqVo reqVo){
@RequestMapping(value = "/myQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<CompanyVo> myQrCodeUrl(@RequestBody CompanyGetReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("id",reqVo.getId())
.notBlankCheck("companyId",reqVo.getId())
.checkException();
return ResponseResult.result(companyServiceImpl.getQrCodeUrl(reqVo));
return ResponseResult.result(companyServiceImpl.myQrCodeUrl(reqVo));
}
/**y
* 根据二维码源码调用微信接口获取二维码url
/**
* 获取二维码url，有则直接返回，没有则调用微信服务生成url
* @param reqVo 封装了公司id，页面选项的请求对象
* @return 二维码url，目前没有调用微信接口，仅返回null
* @return 二维码url
*/
@RequestMapping(value = "/createQrCode", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> createQrCode(@RequestBody CreateQrCodeUrlReqVo reqVo){
@RequestMapping(value = "/generateQrCodeUrl", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
CheckerHelper.newInstance()
.notBlankCheck("companyId",reqVo.getCompanyId())
.notBlankCheck("select",reqVo.getSelect())
.checkException();
return ResponseResult.result(companyServiceImpl.createQrCodeUrl(reqVo));
return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));
}
/**y
......@@ -215,7 +199,6 @@ public class CompanyController {
return new ResponseResult();
}
/**
* 删除银行卡
* @param reqVo 封装了银行卡id的请求对象
......
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @ c5fe681a
......@@ -87,19 +87,19 @@ public interface CompanyService{
void setDefault(CompanyBankCardVo reqVo);
/**
* 获取我的二维码url
/**y
* 我的二维码页面
* @param reqVo 公司扩展表请求对象
* @return 公司二维码url
* @return 公司主表信息
*/
String getQrCodeUrl(CompanyExtendGetReqVo reqVo);
CompanyVo myQrCodeUrl(CompanyGetReqVo reqVo);
/**
* 根据二维码源码调用微信接口获取二维码url
* 获取二维码url，有则直接返回，没有则调用微信服务生成url
* @param reqVo 封装了公司id，页面选项的请求对象
* @return 二维码url，目前没有调用微信接口，仅返回null
* @return 二维码url
*/
String createQrCodeUrl(CreateQrCodeUrlReqVo reqVo);
String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo);
/**
* 获取银行卡列表
......
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @ c5fe681a
......@@ -270,31 +270,44 @@ public class CompanyServiceImpl implements CompanyService{
return companyBankCardVo;
}
/**
* 获取我的二维码url
/**y
* 我的二维码页面
* @param reqVo 公司扩展表请求对象
* @return 公司二维码url
* @return 公司主表信息
*/
@Override
public String getQrCodeUrl(CompanyExtendGetReqVo reqVo) {
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
if (null == companyExtendVo.getQrCodeUrl() || companyExtendVo.getQrCodeUrl().isEmpty()){
throw new CodeException("未拥有二维码url，请先添加");
public CompanyVo myQrCodeUrl(CompanyGetReqVo reqVo) {
CompanyVo companyVo = companyDao.load(reqVo,CompanyVo.class);
if (null == companyVo){
throw new CodeException("暂无公司信息");
}
return companyExtendVo.getQrCodeUrl();
return companyVo;
}
/**
* 根据二维码源码调用微信接口获取二维码url
* 获取二维码url，有则直接返回，没有则调用微信服务生成url
* @param reqVo 封装了公司id，页面选项的请求对象
* @return 二维码url，目前没有调用微信接口，仅返回null
* @return 二维码url
*/
@Override
public String createQrCodeUrl(CreateQrCodeUrlReqVo reqVo) {
public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
CompanyExtendGetReqVo reqVo1 = new CompanyExtendGetReqVo();
reqVo1.setId(reqVo.getCompanyId());
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo1,CompanyExtendVo.class);
if (null == companyExtendVo){
throw new CodeException("暂无公司扩展表信息");
}
String url = companyExtendVo.getQrCodeUrl();
if (null != url && !url.isEmpty()){
return url;
}
String qrCode = companyExtendVo.getQrCode();
if (null == qrCode || qrCode.isEmpty()){
qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
}
String select = reqVo.getSelect();
/*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
return null;
......
src/main/java/com/pangding/web/authority/service/impl/RegisterServiceImpl.java
View file @ c5fe681a
......@@ -16,6 +16,7 @@ import com.pangding.web.util.RSAUtils;
import com.yanzuoguang.token.TokenHelper;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.ResponseResult;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -71,7 +72,7 @@ public class RegisterServiceImpl implements RegisterService {
CompanyExtendGetReqVo reqVo = new CompanyExtendGetReqVo();
reqVo.setInvitationCode(invitationCode);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(reqVo,CompanyExtendVo.class);
return companyExtendVo == null ? null : companyExtendVo;
return companyExtendVo;
}
/**
......@@ -152,6 +153,11 @@ public class RegisterServiceImpl implements RegisterService {
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(reqVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
/*此处应该调用第三方接口传入companyVo发送手机验证码并更新公司状态*/
......@@ -215,6 +221,11 @@ public class RegisterServiceImpl implements RegisterService {
/*保存公司扩展表*/
CompanyExtendVo extendVo = new CompanyExtendVo();
extendVo.setId(reqVo.getId());
String qrCode = DateHelper.getNow()
.replace("-","")
.replace(":","")
.replace(" ","");
extendVo.setQrCode(qrCode);
companyExtendDaoImpl.save(extendVo);
SaveCompanyResVo resVo = new SaveCompanyResVo();
......
src/main/java/com/pangding/web/authority/vo/reqvo/CreateQrCodeUrlReqVo.java → src/main/java/com/pangding/web/authority/vo/reqvo/GenerateQrCodeUrlReqVo.java
View file @ c5fe681a
......@@ -4,7 +4,7 @@ package com.pangding.web.authority.vo.reqvo;
* @Author zhangjinyao
* @create 2019/5/23 19:26
*/
public class CreateQrCodeUrlReqVo {
public class GenerateQrCodeUrlReqVo {
private String reqId;
private String companyId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment