Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
吴学德
gdtel-gztel-school-center
Commits
09dc9c2f
Commit
09dc9c2f
authored
Mar 06, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app开发
parent
16eab68a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
163 additions
and
66 deletions
+163
-66
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
+44
-43
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
+21
-21
common/src/main/java/com/winsun/mapper/AppMapper.java
+2
-1
task/pom.xml
+5
-0
task/src/main/java/com/winsun/TaskServiceApplication.java
+1
-1
task/src/main/java/com/winsun/TimingTask/OrderTask.java
+90
-0
No files found.
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
View file @
09dc9c2f
...
...
@@ -35,7 +35,7 @@ import java.util.*;
@RequestMapping
(
"/packageNewClothes"
)
public
class
PackageNewClothes
{
private
static
PackageUpgradeMapper
packageUpgrade
Mapper
;
private
static
AppMapper
app
Mapper
;
private
static
PackageMapper
packageMapper
;
...
...
@@ -46,9 +46,9 @@ public class PackageNewClothes {
private
static
SysUserMapper
userMapper
;
@Autowired
public
PackageNewClothes
(
PackageUpgradeMapper
packageUpgrade
Mapper
,
PackageMapper
packageMapper
,
public
PackageNewClothes
(
AppMapper
app
Mapper
,
PackageMapper
packageMapper
,
OrderMapper
orderMapper
,
SchoolMapper
schoolMapper
,
SysUserMapper
userMapper
)
{
PackageNewClothes
.
packageUpgradeMapper
=
packageUpgrade
Mapper
;
PackageNewClothes
.
appMapper
=
app
Mapper
;
PackageNewClothes
.
packageMapper
=
packageMapper
;
PackageNewClothes
.
orderMapper
=
orderMapper
;
PackageNewClothes
.
userMapper
=
userMapper
;
...
...
@@ -63,8 +63,8 @@ public class PackageNewClothes {
*/
@RequestMapping
(
value
=
"selectSchoolPackage"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
Package
>>
selectSchoolPackage
(
@RequestParam
(
"partner"
)
String
partner
)
{
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
List
<
String
>
packageIds
=
packageUpgrade
Mapper
.
selectPackageId
(
schoolId
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
List
<
String
>
packageIds
=
app
Mapper
.
selectPackageId
(
schoolId
);
List
<
Package
>
packages
=
new
ArrayList
<>();
packageIds
.
forEach
(
packageId
->
{
Package
package1
=
packageMapper
.
selectById
(
packageId
);
...
...
@@ -81,17 +81,17 @@ public class PackageNewClothes {
* @return
*/
@RequestMapping
(
value
=
"getNumber"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
JSONObject
>
getNumber
(
@RequestParam
(
"cardId"
)
String
cardId
,
@RequestParam
(
"partner"
)
String
partner
,
@RequestParam
(
value
=
"contNumber"
,
required
=
false
)
String
contNumber
){
public
ResponseData
<
JSONObject
>
getNumber
(
@RequestParam
(
"cardId"
)
String
cardId
,
@RequestParam
(
"partner"
)
String
partner
,
@RequestParam
(
value
=
"contNumber"
,
required
=
false
)
String
contNumber
)
{
Package
aPackage
=
packageMapper
.
selectById
(
cardId
);
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
School
school
=
schoolMapper
.
selectById
(
schoolId
);
String
xbId
=
aPackage
.
getXbId
();
String
netId
=
school
.
getNetId
();
JSONObject
jsonObject
=
null
;
try
{
jsonObject
=
XbkUtil
.
getNumberJT0001
(
contNumber
,
xbId
,
netId
);
}
catch
(
Exception
e
)
{
log
.
info
(
"JT0001获取手机号码接口异常"
,
e
.
getMessage
());
jsonObject
=
XbkUtil
.
getNumberJT0001
(
contNumber
,
xbId
,
netId
);
}
catch
(
Exception
e
)
{
log
.
info
(
"JT0001获取手机号码接口异常"
,
e
.
getMessage
());
ResponseData
.
error
(
"手机号码获取失败,请重新获取。"
);
}
return
ResponseData
.
success
(
jsonObject
);
...
...
@@ -134,20 +134,20 @@ public class PackageNewClothes {
,
@RequestParam
(
"customerName"
)
String
customerName
,
@RequestParam
(
"partner"
)
String
partner
,
@RequestParam
(
value
=
"idCardzs"
)
String
idCardzs
,
@RequestParam
(
value
=
"idCardz"
)
String
idCardz
,
@RequestParam
(
value
=
"idCardf"
)
String
idCardf
,
@RequestParam
(
value
=
"remarks"
,
required
=
false
)
String
remarks
,
@RequestParam
(
value
=
"kapin"
)
String
kapin
,
@RequestParam
(
value
=
"idCard"
)
String
idCard
,
@RequestParam
(
value
=
"userSchool"
)
String
userSchool
){
,
@RequestParam
(
value
=
"idCard"
)
String
idCard
,
@RequestParam
(
value
=
"userSchool"
)
String
userSchool
)
{
if
(
contactNumber
.
length
()
!=
11
)
{
return
ResponseData
.
error
(
"联系号码有误,请重新输入"
);
}
/**
* 身份证验证
*/
JSONObject
jsonObject
=
null
;
JSONObject
jsonObject
=
null
;
try
{
jsonObject
=
XbkUtil
.
idCardCheckJT0005
(
idCard
,
customerName
);
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
if
(
jsonObject
==
null
)
{
if
(
jsonObject
==
null
)
{
return
ResponseData
.
error
(
"身份证验证失败。"
);
}
if
(
"1"
.
equals
(
jsonObject
.
getString
(
"code"
)))
{
...
...
@@ -207,15 +207,15 @@ public class PackageNewClothes {
order
.
setOrderNumber
(
"YRYM"
+
format
+
s
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
packageUpgrade
Mapper
.
selectSchoolById
(
schoolId
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
app
Mapper
.
selectSchoolById
(
schoolId
);
order
.
setHehuorenSchool
(
schoolName
);
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
Integer
insert
=
orderMapper
.
insert
(
order
);
// MessageUtil.sent(contactNumber,"4","");
if
(
insert
==
1
)
{
packageUpgrade
Mapper
.
inserOrderHis
(
id
,
"资料已提交"
,
date
);
app
Mapper
.
inserOrderHis
(
id
,
"资料已提交"
,
date
);
return
ResponseData
.
success
(
id
);
}
return
ResponseData
.
error
(
"开卡失败!"
);
...
...
@@ -256,13 +256,13 @@ public class PackageNewClothes {
/**
* 身份证验证
*/
JSONObject
jsonObject1
=
null
;
JSONObject
jsonObject1
=
null
;
try
{
jsonObject1
=
XbkUtil
.
idCardCheckJT0005
(
idCard
,
customerName
);
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
if
(
jsonObject1
==
null
)
{
if
(
jsonObject1
==
null
)
{
log
.
info
(
"身份证验证接口调用异常"
);
return
ResponseData
.
error
(
"身份证验证失败。"
);
}
...
...
@@ -325,15 +325,15 @@ public class PackageNewClothes {
order
.
setOrderNumber
(
"YRYM"
+
format
+
s
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
packageUpgrade
Mapper
.
selectSchoolById
(
schoolId
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
app
Mapper
.
selectSchoolById
(
schoolId
);
order
.
setHehuorenSchool
(
schoolName
);
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
Integer
insert
=
orderMapper
.
insert
(
order
);
// MessageUtil.sent(contactNumber,"4","");
if
(
insert
==
1
)
{
packageUpgrade
Mapper
.
inserOrderHis
(
id
,
"资料已提交"
,
date
);
app
Mapper
.
inserOrderHis
(
id
,
"资料已提交"
,
date
);
return
ResponseData
.
success
(
id
);
}
return
ResponseData
.
error
(
"开卡失败!"
);
...
...
@@ -365,7 +365,7 @@ public class PackageNewClothes {
if
(
contactNumber
.
length
()
!=
11
)
{
return
ResponseData
.
error
(
"联系号码有误,请重新输入"
);
}
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
School
school
=
schoolMapper
.
selectById
(
schoolId
);
String
netId
=
school
.
getNetId
();
Package
aPackage
=
packageMapper
.
selectById
(
cardId
);
...
...
@@ -373,14 +373,14 @@ public class PackageNewClothes {
/**
* 小白卡下单
*/
JSONObject
jsonObject
=
null
;
JSONObject
jsonObject
=
null
;
try
{
jsonObject
=
XbkUtil
.
xbkOrderJT0002
(
cardId
,
partner
,
businessNumber
,
idCard
,
customerName
,
contactNumber
,
xbId
,
netId
);
}
catch
(
Exception
e
)
{
log
.
info
(
"小白卡下单接口调用异常"
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
log
.
info
(
"小白卡下单接口调用异常"
,
e
.
getMessage
());
}
if
(
jsonObject
==
null
)
{
if
(
jsonObject
==
null
)
{
return
ResponseData
.
error
(
"小白卡下单失败,如有疑问请联系客服,谢谢。"
);
}
if
(!
"0"
.
equals
(
jsonObject
.
getString
(
"code"
)))
{
...
...
@@ -390,13 +390,13 @@ public class PackageNewClothes {
/**
* 身份证验证
*/
JSONObject
jsonObject1
=
null
;
JSONObject
jsonObject1
=
null
;
try
{
jsonObject1
=
XbkUtil
.
idCardCheckJT0005
(
idCard
,
customerName
);
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
catch
(
Exception
e
)
{
log
.
info
(
"身份证验证接口调用异常"
,
e
.
getMessage
());
}
if
(
jsonObject1
==
null
)
{
if
(
jsonObject1
==
null
)
{
log
.
info
(
"身份证验证接口调用异常"
);
return
ResponseData
.
error
(
"身份证验证失败。"
);
}
...
...
@@ -459,7 +459,7 @@ public class PackageNewClothes {
order
.
setHehuorenName
(
sysUser
.
getName
());
order
.
setHehuorenSchool
(
school
.
getSchoolName
());
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
List
<
String
>
userId
=
packageUpgrade
Mapper
.
selectsupervisorBySchool
(
schoolId
);
List
<
String
>
userId
=
app
Mapper
.
selectsupervisorBySchool
(
schoolId
);
SysUser
user
=
userMapper
.
selectById
(
userId
.
get
(
0
));
order
.
setSupervisorName
(
user
.
getName
());
order
.
setLzgh
(
school
.
getLzgh
());
...
...
@@ -467,7 +467,7 @@ public class PackageNewClothes {
// MessageUtil.sent(contactNumber,"4","");
if
(
insert
==
1
)
{
packageUpgrade
Mapper
.
inserOrderHis
(
id
,
"资料提交成功,等待上传证件"
,
date
);
app
Mapper
.
inserOrderHis
(
id
,
"资料提交成功,等待上传证件"
,
date
);
return
ResponseData
.
success
(
id
);
}
return
ResponseData
.
error
(
"开卡失败!"
);
...
...
@@ -475,20 +475,21 @@ public class PackageNewClothes {
/**
* 上传图片
*
* @param file
* @return
*/
@RequestMapping
(
value
=
"uploadPictures/{partner}"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
uploadPictures
(
@RequestParam
(
value
=
"file"
)
MultipartFile
file
,
@RequestParam
(
"partner"
)
String
partner
)
{
public
ResponseData
<
String
>
uploadPictures
(
@RequestParam
(
value
=
"file"
)
MultipartFile
file
,
@RequestParam
(
"partner"
)
String
partner
)
{
Date
date
=
new
Date
();
String
originalFilename
=
file
.
getOriginalFilename
();
String
picturesType
=
originalFilename
.
substring
(
originalFilename
.
indexOf
(
"."
),
originalFilename
.
length
());
String
backgroundpath
=
FilePath
.
IDCARD
.
getValue
()+
partner
;
String
fileName
=
date
.
getTime
()+
picturesType
;
boolean
makefile
=
FileUtil
.
makefile
(
backgroundpath
,
file
,
fileName
);
if
(!
makefile
){
String
picturesType
=
originalFilename
.
substring
(
originalFilename
.
indexOf
(
"."
),
originalFilename
.
length
());
String
backgroundpath
=
FilePath
.
IDCARD
.
getValue
()
+
partner
;
String
fileName
=
date
.
getTime
()
+
picturesType
;
boolean
makefile
=
FileUtil
.
makefile
(
backgroundpath
,
file
,
fileName
);
if
(!
makefile
)
{
return
ResponseData
.
error
(
"上传失败!"
);
}
return
ResponseData
.
success
(
backgroundpath
+
"/"
+
fileName
,
"上传成功"
);
return
ResponseData
.
success
(
backgroundpath
+
"/"
+
fileName
,
"上传成功"
);
}
}
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
View file @
09dc9c2f
...
...
@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
/**
* 套餐新装
*
* @Author: chancy
* @Date: 2020/2/25 11:14
*/
...
...
@@ -35,7 +36,7 @@ import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping
(
"/packageUpgrade"
)
public
class
PackageUpgradeController
extends
BaseController
{
private
static
PackageUpgradeMapper
packageUpgrade
Mapper
;
private
static
AppMapper
app
Mapper
;
private
static
PackageMapper
packageMapper
;
...
...
@@ -50,10 +51,10 @@ public class PackageUpgradeController extends BaseController {
private
RedisTemplate
redisTemplate
;
@Autowired
public
PackageUpgradeController
(
PackageUpgradeMapper
packageUpgrade
Mapper
,
PackageMapper
packageMapper
,
public
PackageUpgradeController
(
AppMapper
app
Mapper
,
PackageMapper
packageMapper
,
YangChengTongrMapper
yangChengTongrMapper
,
OrderMapper
orderMapper
,
SysUserMapper
userMapper
)
{
PackageUpgradeController
.
packageUpgradeMapper
=
packageUpgrade
Mapper
;
PackageUpgradeController
.
appMapper
=
app
Mapper
;
PackageUpgradeController
.
packageMapper
=
packageMapper
;
PackageUpgradeController
.
yangChengTongrMapper
=
yangChengTongrMapper
;
PackageUpgradeController
.
orderMapper
=
orderMapper
;
...
...
@@ -71,7 +72,7 @@ public class PackageUpgradeController extends BaseController {
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
...
...
@@ -86,7 +87,7 @@ public class PackageUpgradeController extends BaseController {
}
if
(
selectOrder
.
length
()
==
18
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"social_id"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
...
...
@@ -101,7 +102,7 @@ public class PackageUpgradeController extends BaseController {
}
if
(
selectOrder
.
length
()
==
11
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
...
...
@@ -132,7 +133,7 @@ public class PackageUpgradeController extends BaseController {
Wrapper
<
Package
>
wrapper2
=
new
EntityWrapper
();
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"package_name "
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
...
...
@@ -148,7 +149,7 @@ public class PackageUpgradeController extends BaseController {
}
if
(
selectOrder
.
length
()
==
18
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"social_id"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"package_name "
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
...
...
@@ -163,7 +164,7 @@ public class PackageUpgradeController extends BaseController {
}
if
(
selectOrder
.
length
()
==
11
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgrade
Mapper
.
selectPackage
(
wrapper
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
app
Mapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"package_name "
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
...
...
@@ -182,6 +183,7 @@ public class PackageUpgradeController extends BaseController {
/**
* 套餐升级
*
* @param servId
* @param contactNumber 联系号码
* @param oldUserId
...
...
@@ -192,9 +194,7 @@ public class PackageUpgradeController extends BaseController {
* @param nowPackage 现有套餐
* @param partner 用户ID
* @param businessPackage 办理套餐
* @param is_yct
*
* 羊城通
* @param is_yct 羊城通
* @param mark 羊城通是否办理(空为不办理,不为空就办理)
* @param addRess 地址(办理羊城通才使用,正常订单为空)
* @param custName 姓名 (办理羊城通才使用,正常订单为空)
...
...
@@ -220,7 +220,7 @@ public class PackageUpgradeController extends BaseController {
if
(
orders
.
size
()
!=
0
)
{
return
ResponseData
.
error
(
"套餐升级订单已存在,请不要重复申请!"
);
}
PackageUpgrade
packageUpgrade
=
packageUpgrade
Mapper
.
selectById
(
servId
);
PackageUpgrade
packageUpgrade
=
app
Mapper
.
selectById
(
servId
);
SysUser
sysUser
=
userMapper
.
selectById
(
partner
);
Order
order
=
new
Order
();
String
id
=
UUID
.
randomUUID
().
toString
();
...
...
@@ -244,12 +244,12 @@ public class PackageUpgradeController extends BaseController {
order
.
setOrderNumber
(
"YRYM"
+
format
+
s
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
packageUpgrade
Mapper
.
selectSchoolById
(
schoolId
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
app
Mapper
.
selectSchoolById
(
schoolId
);
order
.
setHehuorenSchool
(
schoolName
);
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
Integer
insert
=
orderMapper
.
insert
(
order
);
packageUpgrade
Mapper
.
inserOrderHis
(
id
,
"下单成功"
,
date
);
app
Mapper
.
inserOrderHis
(
id
,
"下单成功"
,
date
);
// MessageUtil.sent(contactNumber,"4","");
if
(
StringUtils
.
isNotBlank
(
mark
))
{
String
id1
=
UUID
.
randomUUID
().
toString
();
...
...
@@ -268,8 +268,8 @@ public class PackageUpgradeController extends BaseController {
yangChengTong
.
setContactPhone
(
contactNumber
);
yangChengTong
.
setCustomerPhone
(
businessNumber
);
insert
+=
yangChengTongrMapper
.
insert
(
yangChengTong
);
packageUpgrade
Mapper
.
inserOrderHis
(
id1
,
"下单成功"
,
date
);
return
ResponseData
.
success
(
id
+
":"
+
id1
,
"下单成功!"
);
app
Mapper
.
inserOrderHis
(
id1
,
"下单成功"
,
date
);
return
ResponseData
.
success
(
id
+
":"
+
id1
,
"下单成功!"
);
}
if
(
insert
==
1
)
{
return
ResponseData
.
success
(
id
);
...
...
@@ -295,8 +295,8 @@ public class PackageUpgradeController extends BaseController {
@RequestMapping
(
value
=
"selectUserInfo"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
Map
<
String
,
Object
>>
selectUserInfo
(
@RequestParam
(
"partner"
)
String
partner
)
{
SysUser
sysUser
=
userMapper
.
selectById
(
partner
);
String
schoolId
=
packageUpgrade
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
packageUpgrade
Mapper
.
selectSchoolById
(
schoolId
);
String
schoolId
=
app
Mapper
.
selectSchoolId
(
partner
);
String
schoolName
=
app
Mapper
.
selectSchoolById
(
schoolId
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"schoolName"
,
schoolName
);
map
.
put
(
"substName"
,
sysUser
.
getSubstName
());
...
...
@@ -312,7 +312,7 @@ public class PackageUpgradeController extends BaseController {
*/
@RequestMapping
(
value
=
"selectOrderHis"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
Map
<
String
,
Object
>>>
selectOrderHis
(
@RequestParam
(
"orderId"
)
String
orderId
)
{
List
<
Map
<
String
,
Object
>>
list
=
packageUpgrade
Mapper
.
selectOrderHis
(
orderId
);
List
<
Map
<
String
,
Object
>>
list
=
app
Mapper
.
selectOrderHis
(
orderId
);
return
ResponseData
.
success
(
list
);
}
...
...
common/src/main/java/com/winsun/mapper/
PackageUpgrade
Mapper.java
→
common/src/main/java/com/winsun/mapper/
App
Mapper.java
View file @
09dc9c2f
...
...
@@ -19,7 +19,7 @@ import java.util.Map;
*/
@Mapper
@Component
public
interface
PackageUpgrade
Mapper
extends
BaseMapper
<
PackageUpgrade
>
{
public
interface
App
Mapper
extends
BaseMapper
<
PackageUpgrade
>
{
@Select
(
"<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>"
)
List
<
Map
<
String
,
Object
>>
selectPackage
(
@Param
(
"ew"
)
Wrapper
<
PackageUpgrade
>
wrapper
);
...
...
@@ -43,4 +43,5 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
List
<
String
>
selectPackageId
(
String
schoolId
);
}
task/pom.xml
View file @
09dc9c2f
...
...
@@ -66,6 +66,11 @@
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-netflix-hystrix
</artifactId>
</dependency>
<dependency>
<groupId>
com.winsun.gdtel.gztel
</groupId>
<artifactId>
common
</artifactId>
<version>
${service.version}
</version>
</dependency>
<dependency>
<groupId>
com.winsun.framework
</groupId>
...
...
task/src/main/java/com/winsun/TaskServiceApplication.java
View file @
09dc9c2f
...
...
@@ -29,6 +29,6 @@ public class TaskServiceApplication {
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
TaskServiceApplication
.
class
,
args
);
logger
.
info
(
"
集约平台
定时任务模块启动成功!!!"
);
logger
.
info
(
"定时任务模块启动成功!!!"
);
}
}
task/src/main/java/com/winsun/TimingTask/OrderTask.java
0 → 100644
View file @
09dc9c2f
package
com
.
winsun
.
TimingTask
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.mapper.EntityWrapper
;
import
com.baomidou.mybatisplus.mapper.Wrapper
;
import
com.winsun.bean.Order
;
import
com.winsun.mapper.*
;
import
com.winsun.utils.MyBatisPlusUpdateUtils
;
import
com.winsun.utils.XbkUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.scheduling.annotation.EnableScheduling
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.ParseException
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
@Slf4j
@RestController
@Configuration
@EnableScheduling
public
class
OrderTask
{
private
static
OrderMapper
orderMapper
;
@Autowired
public
OrderTask
(
OrderMapper
orderMapper
)
{
OrderTask
.
orderMapper
=
orderMapper
;
}
@Scheduled
(
cron
=
"0/5 * * * * ? "
)
//@Scheduled(fixedRate=1000*60)
@PostMapping
(
"/orderTask"
)
public
void
general
()
throws
ParseException
{
Wrapper
<
Order
>
wrapper
=
new
EntityWrapper
();
wrapper
.
eq
(
"order_status"
,
"待识别1"
);
List
<
Order
>
orders
=
orderMapper
.
selectList
(
wrapper
);
orders
.
forEach
(
order
->
{
try
{
JSONObject
jsonObject
=
XbkUtil
.
orderInfoJT0006
(
order
.
getXbOrderId
());
String
dataArray
=
jsonObject
.
getString
(
"dataArray"
);
Map
<
String
,
Object
>
Map
=
JSON
.
parseObject
(
dataArray
,
HashMap
.
class
);
if
(
Map
.
get
(
"orderStatus"
).
toString
().
equals
(
"3"
)
||
Map
.
get
(
"orderStatus"
).
toString
().
equals
(
"13"
)
||
Map
.
get
(
"orderStatus"
).
toString
().
equals
(
"8"
)
||
Map
.
get
(
"orderStatus"
).
toString
().
equals
(
"22"
)
||
Map
.
get
(
"orderStatus"
).
toString
().
equals
(
"21"
)
){
Wrapper
<
Order
>
wrapper1
=
new
EntityWrapper
();
wrapper1
.
eq
(
"xb_order_id"
,
Map
.
get
(
"orderCode"
));
wrapper1
.
eq
(
"id"
,
order
.
getId
());
Map
<
String
,
Object
>
dataMapping
=
new
HashMap
<>();
dataMapping
.
put
(
"order_status"
,
"待处理"
);
orderMapper
.
updateForSet
(
MyBatisPlusUpdateUtils
.
toUpdateSet
(
dataMapping
),
wrapper1
);
}
}
catch
(
Exception
e
)
{
log
.
info
(
order
.
getXbOrderId
()+
"订单更新失败"
,
e
.
getMessage
());
}
});
/* Wrapper<Order> wrapper2 = new EntityWrapper();
wrapper2.eq("order_status", "待活体");
List<Order> orders1 = orderMapper.selectList(wrapper);
orders1.forEach(order -> {
try {
JSONObject jsonObject = XbkUtil.orderInfoJT0006(order.getXbOrderId());
String dataArray = jsonObject.getString("dataArray");
Map<String,Object> Map = JSON.parseObject(dataArray, HashMap.class);
if(Map.get("orderStatus").toString().equals("3") || Map.get("orderStatus").toString().equals("13")){
Wrapper<Order> wrapper1 = new EntityWrapper();
wrapper1.eq("xb_order_id",Map.get("orderCode"));
wrapper1.eq("id",order.getId());
Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "已完成");
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
}
} catch (Exception e) {
log.info(order.getXbOrderId()+"订单更新失败",e.getMessage());
}
});*/
}
}
\ 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