Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
T
tcm-system
Project
Project
Details
Activity
Releases
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
TCM
tcm-system
Commits
8b14df73
Commit
8b14df73
authored
Jul 01, 2019
by
tangf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加公司分润信息
parent
de6a1139
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
259 additions
and
1 deletion
+259
-1
CompanyManagementController.java
...web/authority/controller/CompanyManagementController.java
+10
-1
CompanyDao.java
src/main/java/com/pangding/web/authority/dao/CompanyDao.java
+4
-0
CompanyDaoImpl.java
...a/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
+15
-0
CompanyService.java
...va/com/pangding/web/authority/service/CompanyService.java
+3
-0
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+14
-0
CompanyDivideRuleVo.java
...va/com/pangding/web/authority/vo/CompanyDivideRuleVo.java
+185
-0
CompanyDivideReqVo.java
...m/pangding/web/authority/vo/reqvo/CompanyDivideReqVo.java
+28
-0
No files found.
src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java
View file @
8b14df73
...
@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
...
@@ -2,6 +2,7 @@ package com.pangding.web.authority.controller;
import
com.pangding.web.authority.service.CompanyService
;
import
com.pangding.web.authority.service.CompanyService
;
import
com.pangding.web.authority.vo.CompanyBankCardVo
;
import
com.pangding.web.authority.vo.CompanyBankCardVo
;
import
com.pangding.web.authority.vo.CompanyDivideRuleVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.resvo.CompanyResVo
;
import
com.pangding.web.authority.vo.resvo.CompanyResVo
;
...
@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -13,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.http.MediaType
;
import
org.springframework.http.MediaType
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
/**
* 公司我的管理controller
* 公司我的管理controller
* @author tangfang
* @author tangfang
...
@@ -247,4 +250,10 @@ public class CompanyManagementController {
...
@@ -247,4 +250,10 @@ public class CompanyManagementController {
.
checkException
();
.
checkException
();
return
ResponseResult
.
result
(
companyServiceImpl
.
invitation
(
reqVo
));
return
ResponseResult
.
result
(
companyServiceImpl
.
invitation
(
reqVo
));
}
}
}
@RequestMapping
(
value
=
"findCompanyDivideInfo"
)
public
ResponseResult
<
List
<
CompanyDivideRuleVo
>>
findCompanyList
(
@RequestBody
CompanyDivideReqVo
req
){
CheckerHelper
.
newInstance
().
notBlankCheck
(
"companyIdList"
,
req
.
getCompanyIdList
()).
checkException
();
return
ResponseResult
.
result
(
companyServiceImpl
.
findCompanyDivideInfo
(
req
));
}
}
src/main/java/com/pangding/web/authority/dao/CompanyDao.java
View file @
8b14df73
package
com
.
pangding
.
web
.
authority
.
dao
;
package
com
.
pangding
.
web
.
authority
.
dao
;
import
com.pangding.web.authority.vo.CompanyDivideRuleVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo
;
import
com.pangding.web.authority.vo.reqvo.ListCompanyReqVo
;
import
com.pangding.web.authority.vo.reqvo.ListCompanyReqVo
;
import
com.yanzuoguang.dao.BaseDao
;
import
com.yanzuoguang.dao.BaseDao
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.PageSizeData
;
...
@@ -23,4 +25,6 @@ public interface CompanyDao extends BaseDao {
...
@@ -23,4 +25,6 @@ public interface CompanyDao extends BaseDao {
* @return
* @return
*/
*/
PageSizeData
<
CompanyVo
>
getCompanyList
(
ListCompanyReqVo
reqVo
);
PageSizeData
<
CompanyVo
>
getCompanyList
(
ListCompanyReqVo
reqVo
);
CompanyDivideRuleVo
findCompanyDivideInfo
(
CompanyDivideReqVo
req
);
}
}
src/main/java/com/pangding/web/authority/dao/impl/CompanyDaoImpl.java
View file @
8b14df73
package
com
.
pangding
.
web
.
authority
.
dao
.
impl
;
package
com
.
pangding
.
web
.
authority
.
dao
.
impl
;
import
com.pangding.web.authority.dao.CompanyDao
;
import
com.pangding.web.authority.dao.CompanyDao
;
import
com.pangding.web.authority.vo.CompanyDivideRuleVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.reqvo.CompanyDivideReqVo
;
import
com.pangding.web.authority.vo.reqvo.ListCompanyReqVo
;
import
com.pangding.web.authority.vo.reqvo.ListCompanyReqVo
;
import
com.yanzuoguang.dao.impl.BaseDaoImpl
;
import
com.yanzuoguang.dao.impl.BaseDaoImpl
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
/**
/**
* @Author zhangjinyao
* @Author zhangjinyao
* @create 2019/5/13 14:25
* @create 2019/5/13 14:25
...
@@ -16,6 +20,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
...
@@ -16,6 +20,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
private
static
final
String
CHECK_PHONE
=
"CHECK_PHONE"
;
private
static
final
String
CHECK_PHONE
=
"CHECK_PHONE"
;
private
static
final
String
SELECT
=
"SELECT"
;
private
static
final
String
SELECT
=
"SELECT"
;
private
static
final
String
QUERY_COMPANY_DIVIDE
=
"QUERY_COMPANY_DIVIDE"
;
@Override
@Override
protected
void
init
()
{
protected
void
init
()
{
...
@@ -30,6 +35,11 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
...
@@ -30,6 +35,11 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
.
add
(
"companyAttribute"
,
"and company_attribute = ? "
)
.
add
(
"companyAttribute"
,
"and company_attribute = ? "
)
.
add
(
"examineStatus"
,
"and examine_status = ?"
)
.
add
(
"examineStatus"
,
"and examine_status = ?"
)
.
add
(
"companyId"
,
"and pid = ? "
);
.
add
(
"companyId"
,
"and pid = ? "
);
table
.
add
(
QUERY_COMPANY_DIVIDE
,
"select c.id as comanyId,c.company_name,ce.divide_status,cd.* from pd_company c "
+
"left join pd_company_extend ce on c.id = ce.id left join pd_company_divide_rule cd on c.id = cd.company_id "
+
"where c.examine_status = 1 "
)
.
add
(
"companyId"
,
"and c.id = ? "
);
}
}
@Override
@Override
...
@@ -41,4 +51,9 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
...
@@ -41,4 +51,9 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
public
PageSizeData
<
CompanyVo
>
getCompanyList
(
ListCompanyReqVo
reqVo
)
{
public
PageSizeData
<
CompanyVo
>
getCompanyList
(
ListCompanyReqVo
reqVo
)
{
return
this
.
queryPage
(
CompanyVo
.
class
,
reqVo
,
SELECT
,
reqVo
);
return
this
.
queryPage
(
CompanyVo
.
class
,
reqVo
,
SELECT
,
reqVo
);
}
}
@Override
public
CompanyDivideRuleVo
findCompanyDivideInfo
(
CompanyDivideReqVo
req
){
return
this
.
queryFirst
(
CompanyDivideRuleVo
.
class
,
QUERY_COMPANY_DIVIDE
,
req
);
}
}
}
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @
8b14df73
...
@@ -2,6 +2,7 @@ package com.pangding.web.authority.service;
...
@@ -2,6 +2,7 @@ package com.pangding.web.authority.service;
import
com.pangding.web.authority.vo.CompanyBankCardVo
;
import
com.pangding.web.authority.vo.CompanyBankCardVo
;
import
com.pangding.web.authority.vo.CompanyDivideRuleVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.resvo.CompanyResVo
;
import
com.pangding.web.authority.vo.resvo.CompanyResVo
;
...
@@ -149,4 +150,6 @@ public interface CompanyService{
...
@@ -149,4 +150,6 @@ public interface CompanyService{
PageSizeData
<
CompanyVo
>
myInvite
(
ListCompanyReqVo
reqVo
);
PageSizeData
<
CompanyVo
>
myInvite
(
ListCompanyReqVo
reqVo
);
String
invitation
(
InvitationReqVo
reqVo
);
String
invitation
(
InvitationReqVo
reqVo
);
List
<
CompanyDivideRuleVo
>
findCompanyDivideInfo
(
CompanyDivideReqVo
req
);
}
}
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
8b14df73
...
@@ -25,6 +25,7 @@ import com.yanzuoguang.util.vo.ResponseResult;
...
@@ -25,6 +25,7 @@ import com.yanzuoguang.util.vo.ResponseResult;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -737,4 +738,17 @@ public class CompanyServiceImpl implements CompanyService{
...
@@ -737,4 +738,17 @@ public class CompanyServiceImpl implements CompanyService{
public
String
invitation
(
InvitationReqVo
reqVo
)
{
public
String
invitation
(
InvitationReqVo
reqVo
)
{
return
pangdingPartnerServiceImpl
.
invitation
(
reqVo
);
return
pangdingPartnerServiceImpl
.
invitation
(
reqVo
);
}
}
@Override
public
List
<
CompanyDivideRuleVo
>
findCompanyDivideInfo
(
CompanyDivideReqVo
req
){
List
<
String
>
companyIdList
=
req
.
getCompanyIdList
();
List
<
CompanyDivideRuleVo
>
companyDivideRuleVoList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
companyIdList
.
size
();
i
++){
String
companyId
=
companyIdList
.
get
(
i
);
req
.
setCompanyId
(
companyId
);
CompanyDivideRuleVo
companyDivideRule
=
companyDao
.
findCompanyDivideInfo
(
req
);
companyDivideRuleVoList
.
add
(
companyDivideRule
);
}
return
companyDivideRuleVoList
;
}
}
}
src/main/java/com/pangding/web/authority/vo/CompanyDivideRuleVo.java
0 → 100644
View file @
8b14df73
package
com
.
pangding
.
web
.
authority
.
vo
;
import
com.yanzuoguang.dao.TableAnnotation
;
@TableAnnotation
(
"pd_company_divide_rule"
)
public
class
CompanyDivideRuleVo
extends
CompanyVo
{
@TableAnnotation
(
"id"
)
private
String
companyDivideId
;
@TableAnnotation
(
"company_id"
)
private
String
companyId
;
@TableAnnotation
(
"source_value"
)
private
double
sourceValue
;
@TableAnnotation
(
"real_source_value"
)
private
double
realSourceValue
;
@TableAnnotation
(
"source_explain"
)
private
String
sourceExplain
;
@TableAnnotation
(
"pass_value"
)
private
double
passValue
;
@TableAnnotation
(
"real_pass_value"
)
private
double
realPassValue
;
@TableAnnotation
(
"pass_explain"
)
private
String
passExplain
;
@TableAnnotation
(
"super_value"
)
private
double
superValue
;
@TableAnnotation
(
"real_super_value"
)
private
double
realSuperValue
;
@TableAnnotation
(
"super_explain"
)
private
String
superExplain
;
private
double
fee
;
@TableAnnotation
(
"bonus_type"
)
private
int
bonusType
;
@TableAnnotation
(
"bonus_value"
)
private
double
bonusValue
;
@TableAnnotation
(
"real_bonus_value"
)
private
double
realBonusValue
;
@TableAnnotation
(
"bonus_explain"
)
private
String
bonusExlain
;
@TableAnnotation
(
"divide_status"
)
private
int
divideStatus
;
public
String
getCompanyDivideId
()
{
return
companyDivideId
;
}
public
void
setCompanyDivideId
(
String
companyDivideId
)
{
this
.
companyDivideId
=
companyDivideId
;
}
public
String
getCompanyId
()
{
return
companyId
;
}
public
void
setCompanyId
(
String
companyId
)
{
this
.
companyId
=
companyId
;
}
public
double
getSourceValue
()
{
return
sourceValue
;
}
public
void
setSourceValue
(
double
sourceValue
)
{
this
.
sourceValue
=
sourceValue
;
}
public
double
getRealSourceValue
()
{
return
realSourceValue
;
}
public
void
setRealSourceValue
(
double
realSourceValue
)
{
this
.
realSourceValue
=
realSourceValue
;
}
public
String
getSourceExplain
()
{
return
sourceExplain
;
}
public
void
setSourceExplain
(
String
sourceExplain
)
{
this
.
sourceExplain
=
sourceExplain
;
}
public
double
getPassValue
()
{
return
passValue
;
}
public
void
setPassValue
(
double
passValue
)
{
this
.
passValue
=
passValue
;
}
public
double
getRealPassValue
()
{
return
realPassValue
;
}
public
void
setRealPassValue
(
double
realPassValue
)
{
this
.
realPassValue
=
realPassValue
;
}
public
String
getPassExplain
()
{
return
passExplain
;
}
public
void
setPassExplain
(
String
passExplain
)
{
this
.
passExplain
=
passExplain
;
}
public
double
getSuperValue
()
{
return
superValue
;
}
public
void
setSuperValue
(
double
superValue
)
{
this
.
superValue
=
superValue
;
}
public
double
getRealSuperValue
()
{
return
realSuperValue
;
}
public
void
setRealSuperValue
(
double
realSuperValue
)
{
this
.
realSuperValue
=
realSuperValue
;
}
public
String
getSuperExplain
()
{
return
superExplain
;
}
public
void
setSuperExplain
(
String
superExplain
)
{
this
.
superExplain
=
superExplain
;
}
public
double
getFee
()
{
return
fee
;
}
public
void
setFee
(
double
fee
)
{
this
.
fee
=
fee
;
}
public
int
getBonusType
()
{
return
bonusType
;
}
public
void
setBonusType
(
int
bonusType
)
{
this
.
bonusType
=
bonusType
;
}
public
double
getBonusValue
()
{
return
bonusValue
;
}
public
void
setBonusValue
(
double
bonusValue
)
{
this
.
bonusValue
=
bonusValue
;
}
public
double
getRealBonusValue
()
{
return
realBonusValue
;
}
public
void
setRealBonusValue
(
double
realBonusValue
)
{
this
.
realBonusValue
=
realBonusValue
;
}
public
String
getBonusExlain
()
{
return
bonusExlain
;
}
public
void
setBonusExlain
(
String
bonusExlain
)
{
this
.
bonusExlain
=
bonusExlain
;
}
}
src/main/java/com/pangding/web/authority/vo/reqvo/CompanyDivideReqVo.java
0 → 100644
View file @
8b14df73
package
com
.
pangding
.
web
.
authority
.
vo
.
reqvo
;
import
java.util.List
;
public
class
CompanyDivideReqVo
{
public
String
companyId
;
private
List
<
String
>
companyIdList
;
public
String
getCompanyId
()
{
return
companyId
;
}
public
void
setCompanyId
(
String
companyId
)
{
this
.
companyId
=
companyId
;
}
public
List
<
String
>
getCompanyIdList
()
{
return
companyIdList
;
}
public
void
setCompanyIdList
(
List
<
String
>
companyIdList
)
{
this
.
companyIdList
=
companyIdList
;
}
}
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