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
952026b1
Commit
952026b1
authored
Aug 23, 2019
by
tangf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加修改公司消息
parent
3b2c1067
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
CompanyMsgDaoImpl.java
...om/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java
+1
-1
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+1
-1
DataServiceImpl.java
.../pangding/web/authority/service/impl/DataServiceImpl.java
+2
-2
CompanyExtendVo.java
...n/java/com/pangding/web/authority/vo/CompanyExtendVo.java
+11
-11
No files found.
src/main/java/com/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java
View file @
952026b1
...
...
@@ -21,7 +21,7 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
table
.
add
(
QUERY_LIST
,
"select m.*,cm.company_id,cm.type "
+
"from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 "
)
.
add
(
"
C
ompanyId"
,
"and cm.company_id = ? "
)
.
add
(
"
c
ompanyId"
,
"and cm.company_id = ? "
)
.
add
(
"type"
,
"and cm.type = ? "
);
}
...
...
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
952026b1
...
...
@@ -209,7 +209,7 @@ public class CompanyServiceImpl implements CompanyService {
if
(
reqVo
.
getCompanyType
()
==
1
)
{
CompanyBankCardVo
companyBankCardVo
=
new
CompanyBankCardVo
();
ObjectHelper
.
writeWithFrom
(
companyBankCardVo
,
reqVo
);
companyBankCardVo
.
setId
(
reqVo
.
getCompanyBankCardId
()!=
null
?
reqVo
.
getCompanyBankCardId
():
StringHelper
.
getNewID
());
companyBankCardVo
.
setId
(
reqVo
.
getCompanyBankCardId
()!=
null
?
reqVo
.
getCompanyBankCardId
():
StringHelper
.
getNewID
());
companyBankCardVo
.
setName
(
reqVo
.
getContactName
());
companyBankCardVo
.
setPhone
(
reqVo
.
getContactPhone
());
companyBankCardVo
.
setIsDefault
(
CompanyBankCardConstant
.
IS_DEFAULT
);
...
...
src/main/java/com/pangding/web/authority/service/impl/DataServiceImpl.java
View file @
952026b1
...
...
@@ -128,9 +128,9 @@ public class DataServiceImpl implements DataService {
companyExtendVo
.
setQrCode
(
enterpriseVo
.
getQrcodesrc
());
companyExtendVo
.
setInvitationCode
(
enterpriseVo
.
getInvitationCode
());
if
(
null
==
enterpriseVo
.
getIsShare
()){
companyExtendVo
.
setDiv
e
deStatus
(
0
);
companyExtendVo
.
setDiv
i
deStatus
(
0
);
}
else
{
companyExtendVo
.
setDiv
e
deStatus
(
Integer
.
parseInt
(
enterpriseVo
.
getIsShare
()));
companyExtendVo
.
setDiv
i
deStatus
(
Integer
.
parseInt
(
enterpriseVo
.
getIsShare
()));
}
if
(
null
!=
tyyCompanyExtendVo
){
companyExtendVo
.
setWithdrawTotalCash
(
tyyCompanyExtendVo
.
getMoney
());
...
...
src/main/java/com/pangding/web/authority/vo/CompanyExtendVo.java
View file @
952026b1
...
...
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* @create 2019/5/16 15:35
*/
@TableAnnotation
(
"pd_company_extend"
)
public
class
CompanyExtendVo
extends
BaseVo
{
public
class
CompanyExtendVo
{
private
String
id
;
@TableAnnotation
(
"QR_code"
)
...
...
@@ -39,7 +39,7 @@ public class CompanyExtendVo extends BaseVo {
* 是否分润
*/
@TableAnnotation
(
"divide_status"
)
private
Integer
div
e
deStatus
;
private
Integer
div
i
deStatus
;
/**
* 是够可提现
...
...
@@ -63,7 +63,7 @@ public class CompanyExtendVo extends BaseVo {
* 邀请规则
*/
@TableAnnotation
(
"invitation_rule_id"
)
private
String
invitat
e
RuleId
;
private
String
invitat
ion
RuleId
;
@TableAnnotation
(
"invitation_code"
)
private
String
invitationCode
;
...
...
@@ -130,12 +130,12 @@ public class CompanyExtendVo extends BaseVo {
this
.
subledgerRuleId
=
subledgerRuleId
;
}
public
Integer
getDiv
e
deStatus
()
{
return
div
e
deStatus
;
public
Integer
getDiv
i
deStatus
()
{
return
div
i
deStatus
;
}
public
void
setDiv
edeStatus
(
Integer
dive
deStatus
)
{
this
.
div
edeStatus
=
dive
deStatus
;
public
void
setDiv
ideStatus
(
Integer
divi
deStatus
)
{
this
.
div
ideStatus
=
divi
deStatus
;
}
public
Double
getWithdrawTotalCash
()
{
...
...
@@ -162,12 +162,12 @@ public class CompanyExtendVo extends BaseVo {
this
.
invitationStatus
=
invitationStatus
;
}
public
String
getInvitat
e
RuleId
()
{
return
invitat
e
RuleId
;
public
String
getInvitat
ion
RuleId
()
{
return
invitat
ion
RuleId
;
}
public
void
setInvitat
eRuleId
(
String
invitate
RuleId
)
{
this
.
invitat
eRuleId
=
invitate
RuleId
;
public
void
setInvitat
ionRuleId
(
String
invitation
RuleId
)
{
this
.
invitat
ionRuleId
=
invitation
RuleId
;
}
public
String
getInvitationCode
()
{
...
...
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