Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
9abcdc29
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1437
Star
162
Fork
130
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
9abcdc29
编写于
10月 18, 2021
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
财务模块---收预付款代码修改
上级
9eb5824c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
66 addition
and
95 deletion
+66
-95
skyeye-common/src/main/java/com/skyeye/common/constans/CrmConstants.java
...rc/main/java/com/skyeye/common/constans/CrmConstants.java
+1
-1
skyeye-ifs/src/main/java/com/skyeye/service/impl/AdvanceChargeServiceImpl.java
...ava/com/skyeye/service/impl/AdvanceChargeServiceImpl.java
+63
-92
skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml
skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml
+2
-2
未找到文件。
skyeye-common/src/main/java/com/skyeye/common/constans/CrmConstants.java
浏览文件 @
9abcdc29
...
@@ -36,7 +36,7 @@ public class CrmConstants {
...
@@ -36,7 +36,7 @@ public class CrmConstants {
// 获取已经上线的客户来源列表的redis的key
// 获取已经上线的客户来源列表的redis的key
public
static
final
String
SYS_CUSTOMER_FROM_UP_STATE_LIST
=
"sys_customer_from_up_state_list"
;
public
static
final
String
SYS_CUSTOMER_FROM_UP_STATE_LIST
=
"sys_customer_from_up_state_list"
;
// 获取已经上线的客户所属行业列表的redis的key
// 获取已经上线的客户所属行业列表的redis的key
public
static
final
String
SYS_CUSTOMER_INDUSTRY_UP_STATE_LIST
=
"sys_customer_industry_up_state_list"
;
public
static
final
String
SYS_CUSTOMER_INDUSTRY_UP_STATE_LIST
=
"sys_customer_industry_up_state_list"
;
public
static
String
sysCrmCustomerIndustryUpStateList
()
{
public
static
String
sysCrmCustomerIndustryUpStateList
()
{
...
...
skyeye-ifs/src/main/java/com/skyeye/service/impl/AdvanceChargeServiceImpl.java
浏览文件 @
9abcdc29
...
@@ -71,58 +71,55 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
...
@@ -71,58 +71,55 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
* @param outputObject
* @param outputObject
* @throws Exception
* @throws Exception
*/
*/
@SuppressWarnings
(
"unchecked"
)
@Override
@Override
@Transactional
(
value
=
"transactionManager"
)
@Transactional
(
value
=
"transactionManager"
)
public
void
insertAdvanceCharge
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
public
void
insertAdvanceCharge
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
String
initemStr
=
params
.
get
(
"initemStr"
).
toString
();
// 财务主表ID
if
(
ToolUtil
.
isJson
(
initemStr
))
{
String
useId
=
ToolUtil
.
getSurFaceId
();
//财务主表ID
// 处理数据
String
useId
=
ToolUtil
.
getSurFaceId
();
List
<
Map
<
String
,
Object
>>
entitys
=
new
ArrayList
<>();
//处理数据
BigDecimal
allPrice
=
getAllPriceAndChildList
(
useId
,
params
.
get
(
"initemStr"
).
toString
(),
entitys
);
List
<
Map
<
String
,
Object
>>
jArray
=
JSONUtil
.
toList
(
initemStr
,
null
);
if
(
entitys
.
size
()
==
0
){
//收预付款中间转换对象,财务子表存储对象
outputObject
.
setreturnMessage
(
"请选择账户"
);
Map
<
String
,
Object
>
bean
;
return
;
List
<
Map
<
String
,
Object
>>
entitys
=
new
ArrayList
<>();
//财务子表实体集合信息
BigDecimal
allPrice
=
new
BigDecimal
(
"0"
);
//主单总价
BigDecimal
itemAllPrice
=
null
;
//子单对象
for
(
int
i
=
0
;
i
<
jArray
.
size
();
i
++){
bean
=
jArray
.
get
(
i
);
Map
<
String
,
Object
>
entity
=
new
HashMap
<>();
//获取子项金额
itemAllPrice
=
new
BigDecimal
(
bean
.
get
(
"initemMoney"
).
toString
());
entity
.
put
(
"id"
,
ToolUtil
.
getSurFaceId
());
entity
.
put
(
"headerId"
,
useId
);
entity
.
put
(
"accountId"
,
bean
.
get
(
"accountId"
));
entity
.
put
(
"eachAmount"
,
bean
.
get
(
"initemMoney"
));
entity
.
put
(
"remark"
,
bean
.
get
(
"remark"
));
entity
.
put
(
"deleteFlag"
,
0
);
entitys
.
add
(
entity
);
//计算总金额
allPrice
=
allPrice
.
add
(
itemAllPrice
);
}
if
(
entitys
.
size
()
==
0
){
outputObject
.
setreturnMessage
(
"请选择账户"
);
return
;
}
Map
<
String
,
Object
>
accountHead
=
new
HashMap
<>();
String
orderNum
=
ErpConstants
.
DepoTheadSubType
.
getOrderNumBySubType
(
ORDER_TYPE
);
accountHead
.
put
(
"id"
,
useId
);
accountHead
.
put
(
"type"
,
ORDER_TYPE
);
//收预付款
accountHead
.
put
(
"billNo"
,
orderNum
);
accountHead
.
put
(
"totalPrice"
,
allPrice
);
accountHead
.
put
(
"organId"
,
params
.
get
(
"organId"
));
accountHead
.
put
(
"operTime"
,
params
.
get
(
"operTime"
));
accountHead
.
put
(
"handsPersonId"
,
params
.
get
(
"handsPersonId"
));
accountHead
.
put
(
"remark"
,
params
.
get
(
"remark"
));
accountHead
.
put
(
"changeAmount"
,
params
.
get
(
"changeAmount"
));
accountHead
.
put
(
"deleteFlag"
,
0
);
advanceChargeDao
.
insertAdvanceCharge
(
accountHead
);
advanceChargeDao
.
insertAdvanceChargeItem
(
entitys
);
}
else
{
outputObject
.
setreturnMessage
(
"数据格式错误"
);
}
}
Map
<
String
,
Object
>
accountHead
=
new
HashMap
<>();
String
orderNum
=
ErpConstants
.
DepoTheadSubType
.
getOrderNumBySubType
(
ORDER_TYPE
);
accountHead
.
put
(
"id"
,
useId
);
accountHead
.
put
(
"type"
,
ORDER_TYPE
);
//收预付款
accountHead
.
put
(
"billNo"
,
orderNum
);
accountHead
.
put
(
"totalPrice"
,
allPrice
);
accountHead
.
put
(
"organId"
,
params
.
get
(
"organId"
));
accountHead
.
put
(
"operTime"
,
params
.
get
(
"operTime"
));
accountHead
.
put
(
"handsPersonId"
,
params
.
get
(
"handsPersonId"
));
accountHead
.
put
(
"remark"
,
params
.
get
(
"remark"
));
accountHead
.
put
(
"changeAmount"
,
params
.
get
(
"changeAmount"
));
accountHead
.
put
(
"deleteFlag"
,
0
);
advanceChargeDao
.
insertAdvanceCharge
(
accountHead
);
advanceChargeDao
.
insertAdvanceChargeItem
(
entitys
);
}
private
BigDecimal
getAllPriceAndChildList
(
String
useId
,
String
initemStr
,
List
<
Map
<
String
,
Object
>>
entitys
)
{
List
<
Map
<
String
,
Object
>>
jArray
=
JSONUtil
.
toList
(
initemStr
,
null
);
// 主单总价
BigDecimal
allPrice
=
new
BigDecimal
(
"0"
);
for
(
int
i
=
0
;
i
<
jArray
.
size
();
i
++){
Map
<
String
,
Object
>
bean
=
jArray
.
get
(
i
);
Map
<
String
,
Object
>
entity
=
new
HashMap
<>();
//获取子项金额
BigDecimal
itemAllPrice
=
new
BigDecimal
(
bean
.
get
(
"initemMoney"
).
toString
());
entity
.
put
(
"id"
,
ToolUtil
.
getSurFaceId
());
entity
.
put
(
"headerId"
,
useId
);
entity
.
put
(
"accountId"
,
bean
.
get
(
"accountId"
));
entity
.
put
(
"eachAmount"
,
bean
.
get
(
"initemMoney"
));
entity
.
put
(
"remark"
,
bean
.
get
(
"remark"
));
entity
.
put
(
"deleteFlag"
,
0
);
entitys
.
add
(
entity
);
// 计算总金额
allPrice
=
allPrice
.
add
(
itemAllPrice
);
}
return
allPrice
;
}
}
/**
/**
...
@@ -153,55 +150,30 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
...
@@ -153,55 +150,30 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
* @param outputObject
* @param outputObject
* @throws Exception
* @throws Exception
*/
*/
@SuppressWarnings
(
"unchecked"
)
@Override
@Override
@Transactional
(
value
=
"transactionManager"
)
@Transactional
(
value
=
"transactionManager"
)
public
void
editAdvanceChargeById
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
public
void
editAdvanceChargeById
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
String
initemStr
=
params
.
get
(
"initemStr"
).
toString
();
String
useId
=
params
.
get
(
"id"
).
toString
();
if
(
ToolUtil
.
isJson
(
initemStr
))
{
// 处理数据
String
useId
=
params
.
get
(
"id"
).
toString
();
List
<
Map
<
String
,
Object
>>
entitys
=
new
ArrayList
<>();
//处理数据
BigDecimal
allPrice
=
getAllPriceAndChildList
(
useId
,
params
.
get
(
"initemStr"
).
toString
(),
entitys
);
List
<
Map
<
String
,
Object
>>
jArray
=
JSONUtil
.
toList
(
initemStr
,
null
);
if
(
entitys
.
size
()
==
0
){
//收预付款中间转换对象,财务子表存储对象
outputObject
.
setreturnMessage
(
"请选择账户"
);
Map
<
String
,
Object
>
bean
;
return
;
List
<
Map
<
String
,
Object
>>
entitys
=
new
ArrayList
<>();
//财务子表实体集合信息
BigDecimal
allPrice
=
new
BigDecimal
(
"0"
);
//主单总价
BigDecimal
itemAllPrice
=
null
;
//子单对象
for
(
int
i
=
0
;
i
<
jArray
.
size
();
i
++){
bean
=
jArray
.
get
(
i
);
Map
<
String
,
Object
>
entity
=
new
HashMap
<>();
//获取子项金额
itemAllPrice
=
new
BigDecimal
(
bean
.
get
(
"initemMoney"
).
toString
());
entity
.
put
(
"id"
,
ToolUtil
.
getSurFaceId
());
entity
.
put
(
"headerId"
,
useId
);
entity
.
put
(
"accountId"
,
bean
.
get
(
"accountId"
));
entity
.
put
(
"eachAmount"
,
bean
.
get
(
"initemMoney"
));
entity
.
put
(
"remark"
,
bean
.
get
(
"remark"
));
entity
.
put
(
"deleteFlag"
,
"0"
);
entitys
.
add
(
entity
);
//计算总金额
allPrice
=
allPrice
.
add
(
itemAllPrice
);
}
if
(
entitys
.
size
()
==
0
){
outputObject
.
setreturnMessage
(
"请选择账户"
);
return
;
}
Map
<
String
,
Object
>
accountHead
=
new
HashMap
<>();
accountHead
.
put
(
"id"
,
useId
);
accountHead
.
put
(
"totalPrice"
,
allPrice
);
accountHead
.
put
(
"organId"
,
params
.
get
(
"organId"
));
accountHead
.
put
(
"operTime"
,
params
.
get
(
"operTime"
));
accountHead
.
put
(
"handsPersonId"
,
params
.
get
(
"handsPersonId"
));
accountHead
.
put
(
"remark"
,
params
.
get
(
"remark"
));
accountHead
.
put
(
"changeAmount"
,
params
.
get
(
"changeAmount"
));
advanceChargeDao
.
editAdvanceChargeById
(
accountHead
);
//删除之前的绑定信息
advanceChargeDao
.
deleteAdvanceChargeItemById
(
params
);
advanceChargeDao
.
insertAdvanceChargeItem
(
entitys
);
}
else
{
outputObject
.
setreturnMessage
(
"数据格式错误"
);
}
}
Map
<
String
,
Object
>
accountHead
=
new
HashMap
<>();
accountHead
.
put
(
"id"
,
useId
);
accountHead
.
put
(
"totalPrice"
,
allPrice
);
accountHead
.
put
(
"organId"
,
params
.
get
(
"organId"
));
accountHead
.
put
(
"operTime"
,
params
.
get
(
"operTime"
));
accountHead
.
put
(
"handsPersonId"
,
params
.
get
(
"handsPersonId"
));
accountHead
.
put
(
"remark"
,
params
.
get
(
"remark"
));
accountHead
.
put
(
"changeAmount"
,
params
.
get
(
"changeAmount"
));
advanceChargeDao
.
editAdvanceChargeById
(
accountHead
);
// 删除之前的绑定信息
advanceChargeDao
.
deleteAdvanceChargeItemById
(
params
);
advanceChargeDao
.
insertAdvanceChargeItem
(
entitys
);
}
}
/**
/**
...
@@ -247,7 +219,6 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
...
@@ -247,7 +219,6 @@ public class AdvanceChargeServiceImpl implements AdvanceChargeService {
* @param outputObject
* @param outputObject
* @throws Exception
* @throws Exception
*/
*/
@SuppressWarnings
(
"static-access"
)
@Override
@Override
public
void
queryMationToExcel
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
public
void
queryMationToExcel
(
InputObject
inputObject
,
OutputObject
outputObject
)
throws
Exception
{
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
Map
<
String
,
Object
>
params
=
inputObject
.
getParams
();
...
...
skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml
浏览文件 @
9abcdc29
...
@@ -227,7 +227,7 @@
...
@@ -227,7 +227,7 @@
<property
id=
"handsPersonId"
name=
"handsPersonId"
ref=
"required"
var=
"经手人Id"
></property>
<property
id=
"handsPersonId"
name=
"handsPersonId"
ref=
"required"
var=
"经手人Id"
></property>
<property
id=
"remark"
name=
"remark"
ref=
""
var=
"备注"
></property>
<property
id=
"remark"
name=
"remark"
ref=
""
var=
"备注"
></property>
<property
id=
"changeAmount"
name=
"changeAmount"
ref=
"required,double"
var=
"优惠金额"
></property>
<property
id=
"changeAmount"
name=
"changeAmount"
ref=
"required,double"
var=
"优惠金额"
></property>
<property
id=
"initemStr"
name=
"initemStr"
ref=
"required"
var=
"账户列表"
/>
<property
id=
"initemStr"
name=
"initemStr"
ref=
"required
,json
"
var=
"账户列表"
/>
</url>
</url>
<url
id=
"advancecharge003"
path=
"/post/AdvanceChargeController/queryAdvanceChargeToEditById"
val=
"查询收预付款用于数据回显"
allUse=
"2"
method=
"GET"
groupName=
"收预付款模块"
>
<url
id=
"advancecharge003"
path=
"/post/AdvanceChargeController/queryAdvanceChargeToEditById"
val=
"查询收预付款用于数据回显"
allUse=
"2"
method=
"GET"
groupName=
"收预付款模块"
>
<property
id=
"rowId"
name=
"id"
ref=
"required"
var=
"收预付款Id"
></property>
<property
id=
"rowId"
name=
"id"
ref=
"required"
var=
"收预付款Id"
></property>
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
<property
id=
"handsPersonId"
name=
"handsPersonId"
ref=
"required"
var=
"经手人Id"
></property>
<property
id=
"handsPersonId"
name=
"handsPersonId"
ref=
"required"
var=
"经手人Id"
></property>
<property
id=
"remark"
name=
"remark"
ref=
""
var=
"备注"
></property>
<property
id=
"remark"
name=
"remark"
ref=
""
var=
"备注"
></property>
<property
id=
"changeAmount"
name=
"changeAmount"
ref=
"required,double"
var=
"优惠金额"
></property>
<property
id=
"changeAmount"
name=
"changeAmount"
ref=
"required,double"
var=
"优惠金额"
></property>
<property
id=
"initemStr"
name=
"initemStr"
ref=
"required"
var=
"账户列表"
/>
<property
id=
"initemStr"
name=
"initemStr"
ref=
"required
,json
"
var=
"账户列表"
/>
</url>
</url>
<url
id=
"advancecharge005"
path=
"/post/AdvanceChargeController/deleteAdvanceChargeById"
val=
"删除收预付款信息"
allUse=
"1"
method=
"DELETE"
groupName=
"收预付款模块"
>
<url
id=
"advancecharge005"
path=
"/post/AdvanceChargeController/deleteAdvanceChargeById"
val=
"删除收预付款信息"
allUse=
"1"
method=
"DELETE"
groupName=
"收预付款模块"
>
<property
id=
"rowId"
name=
"id"
ref=
"required"
var=
"收预付款Id"
></property>
<property
id=
"rowId"
name=
"id"
ref=
"required"
var=
"收预付款Id"
></property>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录