Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
605cb8c7
Commit
605cb8c7
authored
Dec 17, 2020
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
来佣比对列表-历史比对年月列表查询
parent
2577504d
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
51 additions
and
5 deletions
+51
-5
yd-api/src/main/java/com/yd/api/commission/LifeCommissionController.java
+16
-4
yd-api/src/main/java/com/yd/api/commission/service/LifeCommissionService.java
+1
-0
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
+14
-0
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QuerycheckBatchListResponseVO.java
+12
-0
yd-api/src/main/java/com/yd/dal/mapper/lifecommission/LifeCommissionMapper.java
+2
-1
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
+6
-0
No files found.
yd-api/src/main/java/com/yd/api/commission/LifeCommissionController.java
View file @
605cb8c7
...
@@ -2,10 +2,7 @@ package com.yd.api.commission;
...
@@ -2,10 +2,7 @@ package com.yd.api.commission;
import
com.yd.api.commission.service.LifeCommissionService
;
import
com.yd.api.commission.service.LifeCommissionService
;
import
com.yd.api.commission.vo.lifecommission.CheckComeCommissionRequestVO
;
import
com.yd.api.commission.vo.lifecommission.*
;
import
com.yd.api.commission.vo.lifecommission.CheckComeCommissionResponseVO
;
import
com.yd.api.commission.vo.lifecommission.ComeCommissionListResponseVO
;
import
com.yd.api.commission.vo.lifecommission.QueryComeCommissionListRequestVO
;
import
com.yd.api.result.JsonResult
;
import
com.yd.api.result.JsonResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestBody
;
...
@@ -49,4 +46,18 @@ public class LifeCommissionController {
...
@@ -49,4 +46,18 @@ public class LifeCommissionController {
return
result
;
return
result
;
}
}
/**
* 来佣比对-历史比对年月列表查询
*
* @return
*/
@RequestMapping
(
"/querycheckBatchList"
)
public
Object
querycheckBatchList
(){
JsonResult
result
=
new
JsonResult
();
QuerycheckBatchListResponseVO
responseVO
=
lifeCommissionService
.
querycheckBatchList
();
result
.
addResult
(
responseVO
);
result
.
setData
(
responseVO
);
return
result
;
}
}
}
\ No newline at end of file
yd-api/src/main/java/com/yd/api/commission/service/LifeCommissionService.java
View file @
605cb8c7
...
@@ -7,4 +7,5 @@ public interface LifeCommissionService {
...
@@ -7,4 +7,5 @@ public interface LifeCommissionService {
CheckComeCommissionResponseVO
updateCommissionCheckStatus
(
CheckComeCommissionRequestVO
requestVO
);
CheckComeCommissionResponseVO
updateCommissionCheckStatus
(
CheckComeCommissionRequestVO
requestVO
);
QuerycheckBatchListResponseVO
querycheckBatchList
();
}
}
yd-api/src/main/java/com/yd/api/commission/service/impl/LifeCommissionServiceImpl.java
View file @
605cb8c7
...
@@ -114,6 +114,20 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
...
@@ -114,6 +114,20 @@ public class LifeCommissionServiceImpl implements LifeCommissionService {
return
resp
;
return
resp
;
}
}
@Override
public
QuerycheckBatchListResponseVO
querycheckBatchList
()
{
QuerycheckBatchListResponseVO
resp
=
new
QuerycheckBatchListResponseVO
();
try
{
List
<
String
>
checkBatchList
=
lifeCommissionMapper
.
querycheckBatchList
();
resp
.
setCheckBatchList
(
checkBatchList
);
resp
.
setCommonResult
(
new
CommonResult
(
true
,
ZHBErrorConfig
.
getErrorInfo
(
"800000"
)));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
resp
.
setCommonResult
(
new
CommonResult
(
false
,
e
.
getMessage
()));
}
return
resp
;
}
private
void
orderCommissionCheckCancelSendMail
(
List
<
PoOrder
>
orders
)
{
private
void
orderCommissionCheckCancelSendMail
(
List
<
PoOrder
>
orders
)
{
//发送邮件
//发送邮件
List
<
String
>
ccList
=
systemConfigService
.
getListConfigValue
(
"CancelPolicyNotifyCommissionChecking"
);
List
<
String
>
ccList
=
systemConfigService
.
getListConfigValue
(
"CancelPolicyNotifyCommissionChecking"
);
...
...
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QuerycheckBatchListResponseVO.java
0 → 100644
View file @
605cb8c7
package
com
.
yd
.
api
.
commission
.
vo
.
lifecommission
;
import
com.yd.api.result.CommonResult
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
QuerycheckBatchListResponseVO
{
private
CommonResult
commonResult
;
private
List
<
String
>
checkBatchList
;
}
yd-api/src/main/java/com/yd/dal/mapper/lifecommission/LifeCommissionMapper.java
View file @
605cb8c7
...
@@ -5,7 +5,6 @@ import com.yd.api.commission.vo.lifecommission.QueryComeCommissionListRequestVO;
...
@@ -5,7 +5,6 @@ import com.yd.api.commission.vo.lifecommission.QueryComeCommissionListRequestVO;
import
com.yd.dal.entity.commission.OrderCommissonCheck
;
import
com.yd.dal.entity.commission.OrderCommissonCheck
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Param
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -19,4 +18,6 @@ public interface LifeCommissionMapper {
...
@@ -19,4 +18,6 @@ public interface LifeCommissionMapper {
List
<
OrderCommissonCheck
>
findByCheckYearmonth
(
String
orderCommissionCheckBatch
);
List
<
OrderCommissonCheck
>
findByCheckYearmonth
(
String
orderCommissionCheckBatch
);
Map
<
String
,
Object
>
getSummaries
(
QueryComeCommissionListRequestVO
requestVO
);
Map
<
String
,
Object
>
getSummaries
(
QueryComeCommissionListRequestVO
requestVO
);
List
<
String
>
querycheckBatchList
();
}
}
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
View file @
605cb8c7
...
@@ -148,5 +148,10 @@
...
@@ -148,5 +148,10 @@
</choose>
</choose>
</select>
</select>
<select
id=
"querycheckBatchList"
resultType=
"java.lang.String"
>
select distinct check_yearmonth from ag_po_order_commission_check
order by check_yearmonth desc
</select>
</mapper>
</mapper>
\ No newline at end of file
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