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
298adca5
Commit
298adca5
authored
6 years ago
by
kangxiaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
111
parent
bcbeee19
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
33 deletions
+26
-33
ContractController.java
src/main/java/common/controller/ContractController.java
+22
-8
IOpenApiService.java
src/main/java/common/service/IOpenApiService.java
+0
-1
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+2
-4
ContractTask.java
src/main/java/common/task/ContractTask.java
+2
-20
No files found.
src/main/java/common/controller/ContractController.java
View file @
298adca5
...
...
@@ -42,17 +42,31 @@ public class ContractController {
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
ContractController
.
class
);
private
static
final
Map
<
String
,
String
>
CONTRACT_STATUS
=
new
HashMap
<
String
,
String
>()
{{
put
(
ContractStatusEnum
.
WAIT
.
getKey
(),
ContractStatusEnum
.
WAIT
.
getValue
());
put
(
ContractStatusEnum
.
EXECUTING
.
getKey
(),
ContractStatusEnum
.
EXECUTING
.
getValue
());
put
(
ContractStatusEnum
.
END
.
getKey
(),
ContractStatusEnum
.
END
.
getValue
());
put
(
ContractStatusEnum
.
CANCEL
.
getKey
(),
ContractStatusEnum
.
CANCEL
.
getValue
());
put
(
ContractStatusEnum
.
MONEY_BACK_ALL
.
getKey
(),
ContractStatusEnum
.
MONEY_BACK_ALL
.
getValue
());
put
(
ContractStatusEnum
.
MONEY_BACK_PART
.
getKey
(),
ContractStatusEnum
.
MONEY_BACK_PART
.
getValue
());
put
(
ContractStatusEnum
.
MONEY_BACK_NONE
.
getKey
(),
ContractStatusEnum
.
MONEY_BACK_NONE
.
getValue
());
put
(
ContractStatusEnum
.
DELETE
.
getKey
(),
ContractStatusEnum
.
DELETE
.
getValue
());
// put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
// put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
// put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
// put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
// put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
// put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
// put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
// put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
putdata
(
this
,
ContractStatusEnum
.
WAIT
);
putdata
(
this
,
ContractStatusEnum
.
EXECUTING
);
putdata
(
this
,
ContractStatusEnum
.
END
);
putdata
(
this
,
ContractStatusEnum
.
CANCEL
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_ALL
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_PART
);
putdata
(
this
,
ContractStatusEnum
.
MONEY_BACK_NONE
);
putdata
(
this
,
ContractStatusEnum
.
DELETE
);
}};
private
static
void
putdata
(
Map
map
,
ContractStatusEnum
a
){
map
.
put
(
a
.
getKey
(),
a
.
getValue
());
}
@Autowired
private
ContractService
service
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/IOpenApiService.java
View file @
298adca5
package
common
.
service
;
import
java.util.List
;
/**
* description:
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
298adca5
...
...
@@ -745,8 +745,6 @@ public class ContractServiceImpl implements ContractService {
}
}
List
<
Long
>
contractIds
=
null
;
List
<
String
>
platforms
=
new
ArrayList
<>();
Map
<
String
,
String
>
idsDic
=
new
HashMap
<>();
platforms
.
add
(
platform
);
...
...
@@ -780,7 +778,7 @@ public class ContractServiceImpl implements ContractService {
if
(!
StringUtils
.
isEmpty
(
contractId
)){
//查看关联合同
if
(
contractIds
!=
null
&&
contractI
ds
.
size
()
>
0
)
{
if
(
ids
!=
null
&&
i
ds
.
size
()
>
0
)
{
contractList
=
contractRepository
.
findByDsAndRoileRelation
(
startDate
,
endDate
,
platforms
,
idList
,
ids
);
}
...
...
@@ -793,7 +791,7 @@ public class ContractServiceImpl implements ContractService {
// contractList = contractRepository.findByDs(startDate, endDate, platform);
if
(!
StringUtils
.
isEmpty
(
contractId
)){
if
(
contractIds
!=
null
&&
contractI
ds
.
size
()
>
0
)
{
if
(
ids
!=
null
&&
i
ds
.
size
()
>
0
)
{
contractList
=
contractRepository
.
findByDsRelation
(
startDate
,
endDate
,
platforms
,
ids
);
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/common/task/ContractTask.java
View file @
298adca5
package
common
.
task
;
import
com.google.common.base.Splitter
;
import
common.model.AppCategory
;
import
common.model.AppInfo
;
import
common.model.Contract
;
import
common.repository.AppCategoryRepository
;
import
common.repository.AppInfoRepository
;
import
common.repository.CityRepository
;
import
common.repository.ContractRepository
;
import
dmp.model.OtPkgDevStats
;
import
dmp.repository.OtPkgDevStatsRepository
;
import
dmp.repository.TagCrawlerAppsWandoujiaRepository
;
import
net.sf.json.JSONArray
;
import
net.sf.json.JSONObject
;
import
org.anarres.lzo.LzoAlgorithm
;
import
org.anarres.lzo.LzoDecompressor
;
import
org.anarres.lzo.LzoInputStream
;
import
org.anarres.lzo.LzoLibrary
;
import
org.apache.commons.collections.map.HashedMap
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
util.*
;
import
util.DateUtil
;
import
util.ValidateUtil
;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
* Created by zxy on 2017/12/26.
...
...
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