Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fileServe
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vanke
fileServe
Commits
580f861b
Commit
580f861b
authored
Jun 09, 2020
by
XiaHou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权星登录注册
parent
030b2c9a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
274 additions
and
1 deletion
+274
-1
PmsSupplierAuditController.java
.../mall/controller/quanxing/PmsSupplierAuditController.java
+33
-0
PmsMchtPlatCategoryDao.java
...a/com/macro/mall/dao/mchtdata/PmsMchtPlatCategoryDao.java
+2
-1
PmsSupplierAuditDto.java
...in/java/com/macro/mall/model/dto/PmsSupplierAuditDto.java
+19
-0
PmsSupplierAuditController.java
...ortal/controller/quanxing/PmsSupplierAuditController.java
+37
-0
IPmsSupplierAuditService.java
...macro/mall/service/quanxing/IPmsSupplierAuditService.java
+26
-0
PmsSupplierAuditServiceImpl.java
...ll/service/quanxing/impl/PmsSupplierAuditServiceImpl.java
+157
-0
No files found.
mall-admin/src/main/java/com/macro/mall/controller/quanxing/PmsSupplierAuditController.java
0 → 100644
View file @
580f861b
package
com
.
macro
.
mall
.
controller
.
quanxing
;
import
com.macro.mall.common.api.CommonResult
;
import
com.macro.mall.model.common.ResultMsg
;
import
com.macro.mall.model.dto.PmsSupplierAuditDto
;
import
com.macro.mall.service.quanxing.IPmsSupplierAuditService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.*
;
@Controller
@RequestMapping
(
"/pmsSupplierAudit"
)
@Api
(
tags
=
"申请供应商"
,
description
=
"申请供应商控制器"
)
public
class
PmsSupplierAuditController
{
@Autowired
private
IPmsSupplierAuditService
pmsSupplierAuditService
;
@ApiOperation
(
"申请供应商"
)
@ResponseBody
@RequestMapping
(
value
=
"/auditSupplier"
,
method
=
RequestMethod
.
POST
)
public
CommonResult
auditSupplier
(
@ApiParam
(
"审核id"
)
@RequestParam
(
"id"
)
Long
id
,
@ApiParam
(
"审核状态 0待审核 1审核通过 2审核不通过"
)
@RequestParam
(
"stauts"
)
Integer
stauts
,
@ApiParam
(
"备注"
)
@RequestParam
(
"remarks"
)
String
remarks
){
ResultMsg
res
=
this
.
pmsSupplierAuditService
.
auditSupplier
(
id
,
stauts
,
remarks
);
if
(
res
.
isFlag
()){
return
CommonResult
.
success
(
null
,
res
.
getMsg
());
}
return
CommonResult
.
failed
(
res
.
getMsg
());
}
}
mall-admin/src/main/java/com/macro/mall/dao/mchtdata/PmsMchtPlatCategoryDao.java
View file @
580f861b
...
...
@@ -2,6 +2,7 @@ package com.macro.mall.dao.mchtdata;
import
com.macro.mall.common.api.CommonResult
;
import
com.macro.mall.dto.MchtPlatCategoryResult
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -16,5 +17,5 @@ public interface PmsMchtPlatCategoryDao {
* @param parentId
* @return
*/
List
<
MchtPlatCategoryResult
>
list
(
Long
mchtId
,
Long
parentId
);
List
<
MchtPlatCategoryResult
>
list
(
@Param
(
"mchtId"
)
Long
mchtId
,
@Param
(
"parentId"
)
Long
parentId
);
}
mall-mbg/src/main/java/com/macro/mall/model/dto/PmsSupplierAuditDto.java
0 → 100644
View file @
580f861b
package
com
.
macro
.
mall
.
model
.
dto
;
import
com.macro.mall.model.OmsOrderItem
;
import
com.macro.mall.model.PmsSupplierAudit
;
import
com.macro.mall.model.PmsSupplierAuditProduct
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
@Data
@ApiModel
(
value
=
"审核商品数据传输"
)
public
class
PmsSupplierAuditDto
extends
PmsSupplierAudit
implements
Serializable
{
@ApiModelProperty
(
value
=
"审核上传商品"
)
private
List
<
PmsSupplierAuditProduct
>
pmsSupplierAuditProductList
;
}
mall-portal/src/main/java/com/macro/mall/portal/controller/quanxing/PmsSupplierAuditController.java
0 → 100644
View file @
580f861b
package
com
.
macro
.
mall
.
portal
.
controller
.
quanxing
;
import
com.macro.mall.common.api.CommonResult
;
import
com.macro.mall.model.common.ResultMsg
;
import
com.macro.mall.model.dto.PmsSupplierAuditDto
;
import
com.macro.mall.service.quanxing.IPmsSupplierAuditService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
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.ResponseBody
;
@Controller
@RequestMapping
(
"/pmsSupplierAudit"
)
@Api
(
tags
=
"申请供应商"
,
description
=
"申请供应商控制器"
)
public
class
PmsSupplierAuditController
{
@Autowired
private
IPmsSupplierAuditService
pmsSupplierAuditService
;
@ApiOperation
(
"申请供应商"
)
@ResponseBody
@RequestMapping
(
value
=
"/auditSupplier"
,
method
=
RequestMethod
.
POST
)
public
CommonResult
auditSupplier
(
@ApiParam
(
"申请供应商所需参数对象"
)
@RequestBody
PmsSupplierAuditDto
pmsSupplierAuditDto
){
ResultMsg
res
=
this
.
pmsSupplierAuditService
.
insertSupplierAudit
(
pmsSupplierAuditDto
);
if
(
res
.
isFlag
()){
return
CommonResult
.
success
(
null
,
res
.
getMsg
());
}
return
CommonResult
.
failed
(
res
.
getMsg
());
}
}
mall-service/src/main/java/com/macro/mall/service/quanxing/IPmsSupplierAuditService.java
0 → 100644
View file @
580f861b
package
com
.
macro
.
mall
.
service
.
quanxing
;
import
com.macro.mall.model.common.ResultMsg
;
import
com.macro.mall.model.dto.PmsSupplierAuditDto
;
public
interface
IPmsSupplierAuditService
{
/**
* 插入一条供应商审核
* @param pmsSupplierAuditDto
* @return
*/
ResultMsg
insertSupplierAudit
(
PmsSupplierAuditDto
pmsSupplierAuditDto
);
/**
* 审核供应商
* @return
*/
ResultMsg
auditSupplier
(
Long
id
,
Integer
status
,
String
remarks
);
/**
* 得到UUID 随机八位数
* @return
*/
String
getUsername
();
}
mall-service/src/main/java/com/macro/mall/service/quanxing/impl/PmsSupplierAuditServiceImpl.java
0 → 100644
View file @
580f861b
package
com
.
macro
.
mall
.
service
.
quanxing
.
impl
;
import
com.macro.mall.mapper.PmsSupplierAuditMapper
;
import
com.macro.mall.mapper.PmsSupplierAuditProductMapper
;
import
com.macro.mall.mapper.UmsMemberMapper
;
import
com.macro.mall.model.PmsSupplierAudit
;
import
com.macro.mall.model.UmsMember
;
import
com.macro.mall.model.common.ResultMsg
;
import
com.macro.mall.model.dto.PmsSupplierAuditDto
;
import
com.macro.mall.service.member.UmsMemberService
;
import
com.macro.mall.service.quanxing.IPmsSupplierAuditService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.security.crypto.password.PasswordEncoder
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.Random
;
import
java.util.UUID
;
@Service
public
class
PmsSupplierAuditServiceImpl
implements
IPmsSupplierAuditService
{
@Resource
private
PmsSupplierAuditMapper
pmsSupplierAuditMapper
;
//供应商审核表 代码生成器mapper
@Resource
private
PmsSupplierAuditProductMapper
pmsSupplierAuditProductMapper
;
//供应商审核商品表 代码生成器mapper
@Resource
private
UmsMemberMapper
umsMemberMapper
;
//会员表 代码生成器mapper
@Autowired
private
PasswordEncoder
passwordEncoder
;
//密码相关处理
@Autowired
private
UmsMemberService
umsMemberService
;
//会员表业务层
/**
* 审核供应商
* @param id
* @param status
* @param remarks
* @return
*/
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ResultMsg
auditSupplier
(
Long
id
,
Integer
status
,
String
remarks
){
PmsSupplierAudit
psa
=
this
.
pmsSupplierAuditMapper
.
selectByPrimaryKey
(
id
);
if
(
psa
==
null
){
return
new
ResultMsg
(
false
,
"传入id 不存在对应的审核记录"
);
}
if
(
status
==
null
){
return
new
ResultMsg
(
false
,
"请传入对应的审核状态"
);
}
PmsSupplierAudit
pmsSupplierAudit
=
new
PmsSupplierAuditDto
();
pmsSupplierAudit
.
setId
(
id
);
pmsSupplierAudit
.
setStatus
(
status
);
pmsSupplierAudit
.
setRemarks
(
remarks
);
//更新审核状态
this
.
pmsSupplierAuditMapper
.
updateByPrimaryKeySelective
(
pmsSupplierAudit
);
if
(
status
==
1
){
//审核通过还需将信息写入会员表
//补充会员信息
UmsMember
umsMember
=
new
UmsMember
();
umsMember
.
setUsername
(
this
.
getUsername
());
//系统根据时间生成账号
String
uuid
=
UUID
.
randomUUID
().
toString
().
replace
(
"-"
,
""
);
//随机生成昵称 转化为String对象 因为UUID本身为32位只是生成时多了“-”,所以将它们去除
umsMember
.
setName
(
uuid
.
substring
(
4
,
12
));
umsMember
.
setPhone
(
psa
.
getPhone
());
umsMember
.
setPassword
(
psa
.
getPassword
());
umsMember
.
setStatus
(
1
);
//帐号启用状态:0->禁用;1->启用
umsMember
.
setAccouuntType
(
1
);
//账户类型(0管理员1供应商2分销商)
umsMember
.
setBirthday
(
new
Date
());
umsMember
.
setCreateDate
(
new
Date
());
umsMember
.
setUpdateDate
(
new
Date
());
umsMember
.
setCreateTime
(
new
Date
());
//插入操作
this
.
umsMemberMapper
.
insert
(
umsMember
);
}
return
new
ResultMsg
(
true
,
"操作成功"
);
}
/**
* 生成账号
* @return
*/
@Override
public
String
getUsername
(){
//截取当前系统时间
Date
currentTime
=
new
Date
();
//改变输出格式(自己想要的格式)
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyyMMddHHmmss"
);
System
.
out
.
println
(
formatter
.
format
(
currentTime
));
return
formatter
.
format
(
currentTime
);
}
/**
* 插入一条供应商审核
* @param pmsSupplierAuditDto
* @return
*/
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ResultMsg
insertSupplierAudit
(
PmsSupplierAuditDto
pmsSupplierAuditDto
){
ResultMsg
res
=
this
.
checkSupplierAudit
(
pmsSupplierAuditDto
);
if
(!
res
.
isFlag
()){
//如果校验不同过 返回false
return
new
ResultMsg
(
false
,
res
.
getMsg
());
}
//插入供应商审核表
this
.
pmsSupplierAuditMapper
.
insertSelective
(
pmsSupplierAuditDto
);
//如果供应商审核商品不为空的话 还继续插入
if
(
pmsSupplierAuditDto
.
getPmsSupplierAuditProductList
()
!=
null
&&
pmsSupplierAuditDto
.
getPmsSupplierAuditProductList
().
size
()
>
0
){
//插入供应商审核商品表
pmsSupplierAuditDto
.
getPmsSupplierAuditProductList
().
forEach
(
pmsSupplierAuditProduct
->{
pmsSupplierAuditProduct
.
setAuditId
(
pmsSupplierAuditDto
.
getId
());
this
.
pmsSupplierAuditProductMapper
.
insertSelective
(
pmsSupplierAuditProduct
);
});
}
return
new
ResultMsg
(
true
,
"插入成功"
);
}
/**
* 校验传入数据
* @return
*/
private
ResultMsg
checkSupplierAudit
(
PmsSupplierAuditDto
pmsSupplierAuditDto
){
if
(
pmsSupplierAuditDto
==
null
){
return
new
ResultMsg
(
false
,
"传入数据为空"
);
}
if
(
pmsSupplierAuditDto
.
getPhone
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getPhone
())){
return
new
ResultMsg
(
false
,
"手机号为空"
);
}
else
{
//查询手机号是否已经存在
UmsMember
umsMember
=
this
.
umsMemberService
.
getByPhone
(
pmsSupplierAuditDto
.
getPhone
());
if
(
umsMember
!=
null
){
return
new
ResultMsg
(
false
,
"输入手机号已存在"
);
}
}
if
(
pmsSupplierAuditDto
.
getPassword
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getPassword
())){
return
new
ResultMsg
(
false
,
"密码传入为空"
);
}
else
{
//加密密码
pmsSupplierAuditDto
.
setPassword
(
passwordEncoder
.
encode
(
pmsSupplierAuditDto
.
getPassword
()));
}
if
(
pmsSupplierAuditDto
.
getBrandName
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getBrandName
())){
return
new
ResultMsg
(
false
,
"品牌名称为空"
);
}
if
(
pmsSupplierAuditDto
.
getCompanyName
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getCompanyName
())){
return
new
ResultMsg
(
false
,
"公司名称为空"
);
}
if
(
pmsSupplierAuditDto
.
getBusinessLicense
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getBusinessLicense
())){
return
new
ResultMsg
(
false
,
"经营许可证为空"
);
}
if
(
pmsSupplierAuditDto
.
getBusiness
()
==
null
||
""
.
equals
(
pmsSupplierAuditDto
.
getBusiness
())){
return
new
ResultMsg
(
false
,
"营业执照为空"
);
}
return
new
ResultMsg
(
true
,
"校验通过"
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment