Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
reyun
manager
Commits
0c48071e
Commit
0c48071e
authored
5 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大后台
parent
6759745d
master
…
0727_bugfix
1151_bugfix
1209_bugfix
1315_bugfix
1439_bugfix
1608_bugfix
1608_from_1619
1619_bugfix
1990_bugfix
2578_bugfix
2580_fix
bigfix_20201028
bugfix_1608_new
bugfix_1760
bugfix_master_1760
change_double
liushaowei
master_mv
mobvista_master
month_flow
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
29 deletions
+29
-29
ContractController.java
src/main/java/common/controller/ContractController.java
+3
-3
Contract.java
src/main/java/common/model/Contract.java
+10
-19
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+8
-4
ContractStatusEnum.java
src/main/java/dic/ContractStatusEnum.java
+8
-3
No files found.
src/main/java/common/controller/ContractController.java
View file @
0c48071e
...
@@ -55,9 +55,9 @@ public class ContractController {
...
@@ -55,9 +55,9 @@ public class ContractController {
putdata
(
this
,
ContractStatusEnum
.
EXECUTING
);
putdata
(
this
,
ContractStatusEnum
.
EXECUTING
);
putdata
(
this
,
ContractStatusEnum
.
END
);
putdata
(
this
,
ContractStatusEnum
.
END
);
putdata
(
this
,
ContractStatusEnum
.
CANCEL
);
putdata
(
this
,
ContractStatusEnum
.
CANCEL
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_
BACK_ALL
);
putdata
(
this
,
ContractStatusEnum
.
BACK_ALL
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_PART
);
putdata
(
this
,
ContractStatusEnum
.
BACK_NONE
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_NONE
);
putdata
(
this
,
ContractStatusEnum
.
BACK_PART
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_FIRST
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_FIRST
);
putdata
(
this
,
ContractStatusEnum
.
DELETE
);
putdata
(
this
,
ContractStatusEnum
.
DELETE
);
putdata
(
this
,
ContractStatusEnum
.
FIRST_SIGNING
);
putdata
(
this
,
ContractStatusEnum
.
FIRST_SIGNING
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/model/Contract.java
View file @
0c48071e
...
@@ -33,10 +33,11 @@ public class Contract {
...
@@ -33,10 +33,11 @@ public class Contract {
private
Long
sale
;
private
Long
sale
;
//产品 trackingio or adi ...
//产品 trackingio or adi ...
private
String
platform
;
private
String
platform
;
private
String
status
;
private
String
status
;
// 作废 先回款待录入
private
String
saleName
;
private
String
saleName
;
private
Long
payMoney
;
// 回款金额
private
Long
payMoney
;
// 回款金额
private
Integer
backStatus
;
// 1 未回款 2 部分回款 3 已回款
private
Long
invoice
;
// 开票次数
private
Long
invoice
;
// 开票次数
private
BigDecimal
invoiceMoney
;
// 发票金额
private
BigDecimal
invoiceMoney
;
// 发票金额
private
String
createName
;
// 创建人NAME
private
String
createName
;
// 创建人NAME
...
@@ -66,10 +67,7 @@ public class Contract {
...
@@ -66,10 +67,7 @@ public class Contract {
/**
/**
* 新增字段 20190427
* 新增字段 20190427
*/
*/
// private Long discountFlow; // 优惠流量
private
Long
discountTimeLong
;
// 优惠时长
private
Long
discountTimeLong
;
// 优惠时长
// private BigDecimal rebateMoney; //回款金额
private
String
customerShort
;
// 客户简称
private
String
customerShort
;
// 客户简称
private
String
customerThird
;
// 三方客户
private
String
customerThird
;
// 三方客户
private
int
tradeType
;
// 行业id
private
int
tradeType
;
// 行业id
...
@@ -384,14 +382,6 @@ public class Contract {
...
@@ -384,14 +382,6 @@ public class Contract {
this
.
createName
=
createName
;
this
.
createName
=
createName
;
}
}
// public Long getDiscountFlow() {
// return discountFlow;
// }
//
// public void setDiscountFlow(Long discountFlow) {
// this.discountFlow = discountFlow;
// }
public
Long
getDiscountTimeLong
()
{
public
Long
getDiscountTimeLong
()
{
return
discountTimeLong
;
return
discountTimeLong
;
}
}
...
@@ -503,13 +493,6 @@ public class Contract {
...
@@ -503,13 +493,6 @@ public class Contract {
this
.
adjustmentFundForm
=
adjustmentFundForm
;
this
.
adjustmentFundForm
=
adjustmentFundForm
;
}
}
// public String getCreaterName() {
// return createrName;
// }
//
// public void setCreaterName(String createrName) {
// this.createrName = createrName;
// }
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
...
@@ -537,4 +520,12 @@ public class Contract {
...
@@ -537,4 +520,12 @@ public class Contract {
", ds='"
+
ds
+
'\''
+
", ds='"
+
ds
+
'\''
+
'}'
;
'}'
;
}
}
public
Integer
getBackStatus
()
{
return
backStatus
;
}
public
void
setBackStatus
(
Integer
backStatus
)
{
this
.
backStatus
=
backStatus
;
}
}
}
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
0c48071e
...
@@ -1048,11 +1048,13 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1048,11 +1048,13 @@ public class ContractServiceImpl implements ContractService {
}
else
if
(
resource
.
getPayMoney
().
longValue
()
<=
0
)
{
}
else
if
(
resource
.
getPayMoney
().
longValue
()
<=
0
)
{
//未回款
//未回款
resource
.
setStatus
(
ContractStatusEnum
.
MONEY_BACK_NONE
.
getKey
());
// resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
resource
.
setBackStatus
(
1
);
}
else
if
(
resource
.
getPayMoney
().
longValue
()
<
resource
.
getMoney
().
longValue
())
{
}
else
if
(
resource
.
getPayMoney
().
longValue
()
<
resource
.
getMoney
().
longValue
())
{
// 部分回款
// 部分回款
resource
.
setStatus
(
ContractStatusEnum
.
MONEY_BACK_PART
.
getKey
());
// resource.setStatus(ContractStatusEnum.MONEY_BACK_PART.getKey());
resource
.
setBackStatus
(
2
);
//记录收款记录
//记录收款记录
money
.
setType
(
"pay"
);
money
.
setType
(
"pay"
);
...
@@ -1061,7 +1063,8 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1061,7 +1063,8 @@ public class ContractServiceImpl implements ContractService {
}
else
{
}
else
{
// 已回款
// 已回款
resource
.
setStatus
(
ContractStatusEnum
.
MONEY_BACK_ALL
.
getKey
());
// resource.setStatus(ContractStatusEnum.MONEY_BACK_ALL.getKey());
resource
.
setBackStatus
(
3
);
money
.
setType
(
"pay"
);
money
.
setType
(
"pay"
);
money
=
saveContractMoney
(
money
,
loginUser
,
resource
,
type
);
money
=
saveContractMoney
(
money
,
loginUser
,
resource
,
type
);
}
}
...
@@ -1069,7 +1072,8 @@ public class ContractServiceImpl implements ContractService {
...
@@ -1069,7 +1072,8 @@ public class ContractServiceImpl implements ContractService {
}
else
{
}
else
{
//未回款
//未回款
resource
.
setStatus
(
ContractStatusEnum
.
MONEY_BACK_NONE
.
getKey
());
resource
.
setBackStatus
(
1
);
// resource.setStatus(ContractStatusEnum.MONEY_BACK_NONE.getKey());
}
}
if
(
money
.
getId
()
!=
null
)
{
if
(
money
.
getId
()
!=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/dic/ContractStatusEnum.java
View file @
0c48071e
...
@@ -10,10 +10,15 @@ public enum ContractStatusEnum {
...
@@ -10,10 +10,15 @@ public enum ContractStatusEnum {
EXECUTING
(
"executing"
,
"执行中"
),
EXECUTING
(
"executing"
,
"执行中"
),
END
(
"end"
,
"已结束"
),
END
(
"end"
,
"已结束"
),
MONEY_BACK_ALL
(
"backall"
,
"已回款"
),
// MONEY_BACK_ALL("backall", "已回款"),
// MONEY_BACK_NONE("backnone", "未回款"),
// MONEY_BACK_PART("backpart", "部分回款"),
BACK_NONE
(
"1"
,
"未回款"
),
BACK_PART
(
"2"
,
"部分回款"
),
BACK_ALL
(
"3"
,
"已回款"
),
MONEY_BACK_FIRST
(
"backfirst"
,
"先回款待录入"
),
MONEY_BACK_FIRST
(
"backfirst"
,
"先回款待录入"
),
MONEY_BACK_NONE
(
"backnone"
,
"未回款"
),
MONEY_BACK_PART
(
"backpart"
,
"部分回款"
),
CANCEL
(
"cancel"
,
"作废"
),
CANCEL
(
"cancel"
,
"作废"
),
DELETE
(
"del"
,
"已删除"
),
DELETE
(
"del"
,
"已删除"
),
...
...
This diff is collapsed.
Click to expand it.
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