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
24590c2f
Commit
24590c2f
authored
Mar 26, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二维码提交
parent
e9a67ee8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
189 additions
and
100 deletions
+189
-100
apply-net/src/main/java/com/winsun/controller/DankuanController.java
+4
-4
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
+185
-96
No files found.
apply-net/src/main/java/com/winsun/controller/DankuanController.java
View file @
24590c2f
...
...
@@ -38,10 +38,10 @@ public class DankuanController {
@Autowired
public
DankuanController
(
ProductMapper
productMapper
,
SchoolMapper
schoolMapper
,
AppMapper
appMapper
,
UniversityInfoMapper
universityInfoMapper
){
this
.
productMapper
=
productMapper
;
this
.
schoolMapper
=
schoolMapper
;
this
.
appMapper
=
appMapper
;
this
.
universityInfoMapper
=
universityInfoMapper
;
DankuanController
.
productMapper
=
productMapper
;
DankuanController
.
schoolMapper
=
schoolMapper
;
DankuanController
.
appMapper
=
appMapper
;
DankuanController
.
universityInfoMapper
=
universityInfoMapper
;
}
/**
...
...
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
View file @
24590c2f
package
com
.
winsun
.
controller
;
import
com.baomidou.mybatisplus.enums.SqlLike
;
import
com.baomidou.mybatisplus.mapper.EntityWrapper
;
import
com.baomidou.mybatisplus.mapper.Wrapper
;
import
com.winsun.auth.core.base.controller.BaseController
;
...
...
@@ -9,6 +10,7 @@ import com.winsun.bean.*;
import
com.winsun.constant.OrderStatus
;
import
com.winsun.constant.UserType
;
import
com.winsun.mapper.*
;
import
com.winsun.utils.IDCardUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -20,10 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
import
java.util.*
;
import
java.util.concurrent.TimeUnit
;
/**
...
...
@@ -68,56 +67,59 @@ public class PackageUpgradeController extends BaseController {
* @return
*/
@RequestMapping
(
value
=
"sendVerificationCode"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
sendVerificationCode
(
@RequestParam
(
"selectOrder"
)
String
selectOrder
)
{
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
}
else
{
return
ResponseData
.
error
(
"当前宽带账号未查询出套餐数据!"
);
}
public
ResponseData
<
List
<
Map
<
String
,
Object
>>>
sendVerificationCode
(
@RequestParam
(
"selectOrder"
)
String
selectOrder
,
@RequestParam
(
value
=
"servId"
,
required
=
false
)
String
servId
)
{
if
(
StringUtils
.
isNotBlank
(
servId
))
{
PackageUpgrade
packageUpgrade
=
appMapper
.
selectById
(
servId
);
String
s
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
100000
));
log
.
info
(
"验证码:"
+
s
);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为:"+s+",半小时内有效。");
redisTemplate
.
opsForValue
().
set
(
selectOrder
,
s
,
30
,
TimeUnit
.
MINUTES
);
return
ResponseData
.
success
(
"已发送验证码到手机:"
+
nbr
.
substring
(
0
,
3
)
+
"****"
+
nbr
.
substring
(
7
,
11
)
+
"验证码:"
+
s
);
redisTemplate
.
opsForValue
().
set
(
servId
,
s
,
30
,
TimeUnit
.
MINUTES
);
return
ResponseData
.
success
(
null
,
"已发送验证码到手机:"
+
packageUpgrade
.
getAccNbr
().
substring
(
0
,
3
)
+
"****"
+
packageUpgrade
.
getAccNbr
().
substring
(
7
,
11
)
+
"验证码:"
+
s
);
}
List
<
Map
<
String
,
Object
>>
list
=
new
ArrayList
<>();
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
wrapper
.
setSqlSelect
(
"serv_id"
,
"cust_name"
,
"user_type"
,
"school_name"
,
"acc_nbr"
,
"acc_nbr2"
,
"cdma_disc_desc"
,
"is_bltc1"
,
"is_bltc2"
,
"is_bltc3"
,
"speed_kd"
,
"wxcl"
);
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
}
if
(
selectOrder
.
length
()
==
18
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"social_id"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
}
else
{
return
ResponseData
.
error
(
"当前身份证号未查询出套餐数据!"
);
if
(!
IDCardUtil
.
IDCardValidate
(
selectOrder
))
{
return
ResponseData
.
error
(
"身份证输入有误!"
);
}
String
s
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
100000
));
log
.
info
(
"验证码:"
+
s
);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为:"+s+",半小时内有效。");
redisTemplate
.
opsForValue
().
set
(
selectOrder
,
s
,
30
,
TimeUnit
.
MINUTES
);
return
ResponseData
.
success
(
"已发送验证码到手机:"
+
nbr
.
substring
(
0
,
3
)
+
"****"
+
nbr
.
substring
(
7
,
11
)
+
"验证码:"
+
s
);
wrapper
.
like
(
"social_id"
,
selectOrder
.
substring
(
5
,
18
),
SqlLike
.
LEFT
);
}
if
(
selectOrder
.
length
()
==
11
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectPackage
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
!=
0
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
}
else
{
return
ResponseData
.
error
(
"当前手机号码未查询出套餐数据!"
);
}
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectMaps
(
wrapper
);
String
nbr
=
null
;
if
(
packageUpgrade
.
size
()
>
1
)
{
for
(
Map
<
String
,
Object
>
map
:
packageUpgrade
)
{
map
.
put
(
"acc_nbr"
,
map
.
get
(
"acc_nbr"
).
toString
().
substring
(
0
,
3
)
+
"****"
+
map
.
get
(
"acc_nbr"
).
toString
().
substring
(
7
,
11
));
if
(
map
.
containsKey
(
"acc_nbr2"
))
{
String
[]
split
=
map
.
get
(
"acc_nbr2"
).
toString
().
split
(
"@"
);
map
.
put
(
"acc_nbr"
,
map
.
get
(
"acc_nbr2"
).
toString
().
substring
(
0
,
4
)
+
"*****@"
+
split
[
1
]);
}
}
String
s
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
100000
));
log
.
info
(
"验证码:"
+
s
);
// MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为:"+s+",半小时内有效。");
redisTemplate
.
opsForValue
().
set
(
selectOrder
,
s
,
30
,
TimeUnit
.
MINUTES
);
return
ResponseData
.
success
(
"已发送验证码到手机:"
+
nbr
.
substring
(
0
,
3
)
+
"****"
+
nbr
.
substring
(
7
,
11
)
+
"验证码:"
+
s
);
return
ResponseData
.
success
(
packageUpgrade
);
}
if
(
packageUpgrade
.
size
()
==
1
)
{
nbr
=
packageUpgrade
.
get
(
0
).
get
(
"acc_nbr"
).
toString
();
}
else
{
return
ResponseData
.
error
(
"当前查询条件未查出套餐升级数据,如有疑问请联系客服!"
);
}
return
ResponseData
.
error
(
"当前查询条件有误!"
);
String
s
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
100000
));
log
.
info
(
"验证码:"
+
s
);
//MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为:"+s+",半小时内有效。");
redisTemplate
.
opsForValue
().
set
(
selectOrder
,
s
,
30
,
TimeUnit
.
MINUTES
);
return
ResponseData
.
success
(
null
,
"已发送验证码到手机:"
+
nbr
.
substring
(
0
,
3
)
+
"****"
+
nbr
.
substring
(
7
,
11
)
+
"验证码:"
+
s
);
}
/**
* 查询套餐升级信息
*
...
...
@@ -126,57 +128,144 @@ public class PackageUpgradeController extends BaseController {
* @return
*/
@RequestMapping
(
value
=
"selectPackage"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
Map
<
String
,
Object
>>
selectPackage
(
@RequestParam
(
"selectOrder"
)
String
selectOrder
,
@RequestParam
(
"verificationCode"
)
String
verificationCode
)
{
if
(
redisTemplate
.
opsForValue
().
get
(
selectOrder
).
toString
().
equals
(
verificationCode
))
{
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
Wrapper
<
Package
>
wrapper1
=
new
EntityWrapper
();
Wrapper
<
Package
>
wrapper2
=
new
EntityWrapper
();
public
ResponseData
<
Map
<
String
,
Object
>>
selectPackage
(
@RequestParam
(
"selectOrder"
)
String
selectOrder
,
@RequestParam
(
"verificationCode"
)
String
verificationCode
,
@RequestParam
(
value
=
"servId"
,
required
=
false
)
String
servId
)
{
String
ver
=
null
;
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
wrapper
.
setSqlSelect
(
"serv_id"
,
"cust_name"
,
"user_type"
,
"school_name"
,
"acc_nbr"
,
"acc_nbr2"
,
"cdma_disc_desc"
,
"is_bltc1"
,
"is_bltc2"
,
"is_bltc3"
,
"speed_kd"
,
"wxcl"
);
if
(
StringUtils
.
isNotBlank
(
servId
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
servId
),
"serv_id"
,
servId
);
try
{
ver
=
redisTemplate
.
opsForValue
().
get
(
servId
).
toString
();
}
catch
(
NullPointerException
n
)
{
return
ResponseData
.
error
(
"验证码已失效,请重新登入!"
);
}
}
else
{
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
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"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐"
);
}
Map
<
String
,
Object
>
map
=
packageUpgrade
.
get
(
0
);
map
.
remove
(
"social_id"
);
map
.
put
(
"oldPackage"
,
packages1
.
get
(
0
));
map
.
put
(
"newPackage"
,
packages2
.
get
(
0
));
return
ResponseData
.
success
(
map
);
}
if
(
selectOrder
.
length
()
==
11
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr"
,
selectOrder
);
}
if
(
selectOrder
.
length
()
==
18
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"social_id"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
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"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐"
);
}
try
{
ver
=
redisTemplate
.
opsForValue
().
get
(
selectOrder
).
toString
();
}
catch
(
NullPointerException
n
)
{
return
ResponseData
.
error
(
"验证码已失效,请重新登入!"
);
}
}
if
(
ver
.
equals
(
verificationCode
))
{
Wrapper
<
Package
>
wrapper1
=
new
EntityWrapper
();
Wrapper
<
Package
>
wrapper2
=
new
EntityWrapper
();
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectMaps
(
wrapper
);
if
(
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
).
equals
(
"(预付费)天翼不限量99元套餐201802"
))
{
String
is_bltc1
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc1"
).
toString
();
String
is_bltc2
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc2"
).
toString
();
String
is_bltc3
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc3"
).
toString
();
if
(
is_bltc1
.
equals
(
"是"
)
&&
is_bltc2
.
equals
(
"否"
)
&&
is_bltc3
.
equals
(
"否"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-49元畅享"
);
}
else
if
(
is_bltc1
.
equals
(
"否"
)
&&
is_bltc2
.
equals
(
"是"
)
&&
is_bltc3
.
equals
(
"是"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-29元畅享"
);
}
else
if
(
is_bltc1
.
equals
(
"否"
)
&&
is_bltc2
.
equals
(
"是"
)
&&
is_bltc3
.
equals
(
"否"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-39元畅享"
);
}
Map
<
String
,
Object
>
map
=
packageUpgrade
.
get
(
0
);
}
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"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐"
);
}
Map
<
String
,
Object
>
map
=
packageUpgrade
.
get
(
0
);
map
.
put
(
"acc_nbr"
,
map
.
get
(
"acc_nbr"
).
toString
().
substring
(
0
,
3
)
+
"****"
+
map
.
get
(
"acc_nbr"
).
toString
().
substring
(
7
,
11
));
if
(
map
.
containsKey
(
"acc_nbr2"
))
{
String
[]
split
=
map
.
get
(
"acc_nbr2"
).
toString
().
split
(
"@"
);
map
.
put
(
"acc_nbr"
,
map
.
get
(
"acc_nbr2"
).
toString
().
substring
(
0
,
4
)
+
"*****@"
+
split
[
1
]);
}
if
(
packages1
.
size
()
==
0
)
{
map
.
put
(
"oldPackage"
,
null
);
}
else
{
map
.
put
(
"oldPackage"
,
packages1
.
get
(
0
));
map
.
put
(
"newPackage"
,
packages2
.
get
(
0
));
return
ResponseData
.
success
(
map
);
}
map
.
put
(
"newPackage"
,
packages2
.
get
(
0
));
return
ResponseData
.
success
(
map
);
}
return
ResponseData
.
error
(
"验证码有误"
);
}
/**
* 查询套餐升级信息
*
* @param selectOrder 查询的手机号、身份证、宽带账号
* @param verificationCode 验证码
* @return
*/
@RequestMapping
(
value
=
"selectPackageUpgrade"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
Map
<
String
,
Object
>>
selectPackageUpgrade
(
@RequestParam
(
"selectOrder"
)
String
selectOrder
,
@RequestParam
(
"verificationCode"
)
String
verificationCode
,
@RequestParam
(
value
=
"servId"
,
required
=
false
)
String
servId
)
{
String
ver
=
null
;
Wrapper
<
PackageUpgrade
>
wrapper
=
new
EntityWrapper
();
wrapper
.
setSqlSelect
(
"serv_id"
,
"cust_name"
,
"user_type"
,
"school_name"
,
"acc_nbr"
,
"acc_nbr2"
,
"cdma_disc_desc"
,
"is_bltc1"
,
"is_bltc2"
,
"is_bltc3"
,
"speed_kd"
,
"wxcl"
);
if
(
StringUtils
.
isNotBlank
(
servId
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
servId
),
"serv_id"
,
servId
);
try
{
ver
=
redisTemplate
.
opsForValue
().
get
(
servId
).
toString
();
}
catch
(
NullPointerException
n
)
{
return
ResponseData
.
error
(
"验证码已失效,请重新登入!"
);
}
}
else
{
if
(
selectOrder
.
contains
(
"@"
))
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr2"
,
selectOrder
);
}
if
(
selectOrder
.
length
()
==
11
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"acc_nbr"
,
selectOrder
);
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
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"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐"
);
}
if
(
selectOrder
.
length
()
==
18
)
{
wrapper
.
eq
(
StringUtils
.
isNotBlank
(
selectOrder
),
"social_id"
,
selectOrder
);
}
try
{
ver
=
redisTemplate
.
opsForValue
().
get
(
selectOrder
).
toString
();
}
catch
(
NullPointerException
n
)
{
return
ResponseData
.
error
(
"验证码已失效,请重新登入!"
);
}
}
if
(
ver
.
equals
(
verificationCode
))
{
Wrapper
<
Package
>
wrapper1
=
new
EntityWrapper
();
Wrapper
<
Package
>
wrapper2
=
new
EntityWrapper
();
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
appMapper
.
selectMaps
(
wrapper
);
if
(
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
).
equals
(
"(预付费)天翼不限量99元套餐201802"
))
{
String
is_bltc1
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc1"
).
toString
();
String
is_bltc2
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc2"
).
toString
();
String
is_bltc3
=
packageUpgrade
.
get
(
0
).
get
(
"is_bltc3"
).
toString
();
if
(
is_bltc1
.
equals
(
"是"
)
&&
is_bltc2
.
equals
(
"否"
)
&&
is_bltc3
.
equals
(
"否"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-49元畅享"
);
}
else
if
(
is_bltc1
.
equals
(
"否"
)
&&
is_bltc2
.
equals
(
"是"
)
&&
is_bltc3
.
equals
(
"是"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-29元畅享"
);
}
else
if
(
is_bltc1
.
equals
(
"否"
)
&&
is_bltc2
.
equals
(
"是"
)
&&
is_bltc3
.
equals
(
"否"
))
{
packageUpgrade
.
get
(
0
).
put
(
"cdma_disc_desc"
,
"(预付费)天翼不限量99元套餐201802-39元畅享"
);
}
Map
<
String
,
Object
>
map
=
packageUpgrade
.
get
(
0
);
map
.
put
(
"oldPackage"
,
packages1
.
get
(
0
));
map
.
put
(
"newPackage"
,
packages2
.
get
(
0
));
return
ResponseData
.
success
(
map
);
}
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"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
Map
<
String
,
Object
>
map
=
packageUpgrade
.
get
(
0
);
if
(
packages1
.
size
()
==
0
)
{
map
.
put
(
"oldPackage"
,
null
);
}
else
{
map
.
put
(
"oldPackage"
,
packages1
.
get
(
0
).
getPackageName
());
}
map
.
put
(
"newPackage"
,
packages2
.
get
(
0
).
getPackageName
());
map
.
put
(
"newPackageId"
,
packages2
.
get
(
0
).
getId
());
if
(
map
.
containsKey
(
"acc_nbr2"
))
{
String
[]
split
=
map
.
get
(
"acc_nbr2"
).
toString
().
split
(
"@"
);
map
.
put
(
"acc_nbr"
,
map
.
get
(
"acc_nbr2"
).
toString
().
substring
(
0
,
4
)
+
"*****@"
+
split
[
1
]);
}
return
ResponseData
.
success
(
map
);
}
return
ResponseData
.
error
(
"验证码有误"
);
}
...
...
@@ -186,35 +275,32 @@ public class PackageUpgradeController extends BaseController {
*
* @param servId
* @param contactNumber 联系号码
* @param oldUserId
* @param businessNumber 办理号码
* @param cardId 套餐ID
* @param customerName 客户姓名
* @param userId
* @param userId
老用户Id
* @param nowPackage 现有套餐
* @param partner
用户
ID
* @param partner
合伙人
ID
* @param businessPackage 办理套餐
* @param is_yct 羊城通
* @param mark 羊城通是否办理(空为不办理,不为空就办理)
* @param addRess 地址(办理羊城通才使用,正常订单为空)
* @param custName 姓名 (办理羊城通才使用,正常订单为空)
* @param userSchool 学校 (办理羊城通才使用,正常订单为空)
* @return
*/
@RequestMapping
(
value
=
"oldUserUpade"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
oldUserUpade
(
@RequestParam
(
"contactNumber"
)
String
contactNumber
,
@RequestParam
(
"oldUserId"
)
String
oldUserId
public
ResponseData
<
String
>
oldUserUpade
(
@RequestParam
(
"contactNumber"
)
String
contactNumber
,
@RequestParam
(
"businessNumber"
)
String
businessNumber
,
@RequestParam
(
"cardId"
)
String
cardId
,
@RequestParam
(
"customerName"
)
String
customerName
,
@RequestParam
(
"userId"
)
String
userId
,
@RequestParam
(
"nowPackage"
)
String
nowPackage
,
@RequestParam
(
"partner"
)
String
partner
,
@RequestParam
(
"businessPackage"
)
String
businessPackage
,
@RequestParam
(
value
=
"
is_yct"
,
required
=
false
)
String
is_yct
,
@RequestParam
(
"businessPackage"
)
String
businessPackage
,
@RequestParam
(
value
=
"
servId"
)
String
servId
,
@RequestParam
(
value
=
"mark"
,
required
=
false
)
String
mark
,
@RequestParam
(
value
=
"addRess"
,
required
=
false
)
String
addRess
,
@RequestParam
(
value
=
"servId"
)
String
servId
,
@RequestParam
(
value
=
"custName"
,
required
=
false
)
String
custName
,
@RequestParam
(
value
=
"userSchool"
,
required
=
false
)
String
userSchool
)
{
if
(
contactNumber
.
length
()
!=
11
)
{
return
ResponseData
.
error
(
"联系号码有误,请重新输入"
);
}
Wrapper
<
Order
>
wrapper
=
new
EntityWrapper
();
wrapper
.
eq
(
"business_number"
,
businessNumber
);
wrapper
.
ne
(
"order_status"
,
"已完成"
).
and
().
ne
(
"order_status"
,
"异常单"
);
wrapper
.
eq
(
"user_id"
,
userId
);
wrapper
.
eq
(
"user_type"
,
UserType
.
OLDCUSTOMER
.
getId
());
List
<
Order
>
orders
=
orderMapper
.
selectList
(
wrapper
);
if
(
orders
.
size
()
!=
0
)
{
...
...
@@ -222,14 +308,15 @@ public class PackageUpgradeController extends BaseController {
}
PackageUpgrade
packageUpgrade
=
appMapper
.
selectById
(
servId
);
SysUser
sysUser
=
userMapper
.
selectById
(
partner
);
if
(
sysUser
==
null
)
{
if
(
sysUser
==
null
)
{
return
ResponseData
.
error
(
"当前二维码已失效,如有疑问请联系客服!"
);
}
Order
order
=
new
Order
();
String
uuid
=
UUID
.
randomUUID
().
toString
();
String
id
=
uuid
.
split
(
"-"
)[
0
]+
uuid
.
split
(
"-"
)[
1
];
String
id
=
uuid
.
split
(
"-"
)[
0
]
+
uuid
.
split
(
"-"
)[
1
];
order
.
setId
(
id
);
order
.
setIdCard
(
packageUpgrade
.
getSocialId
());
order
.
setKapin
(
businessPackage
);
order
.
setOrderStatus
(
OrderStatus
.
PENDINGACCEPTANCE
.
getName
());
order
.
setHehuorenId
(
partner
);
order
.
setPackageId
(
cardId
);
...
...
@@ -249,15 +336,18 @@ public class PackageUpgradeController extends BaseController {
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
appMapper
.
selectSchoolId
(
partner
);
List
<
String
>
dudao
=
appMapper
.
selectsupervisorBySchool
(
schoolId
);
SysUser
user
=
userMapper
.
selectById
(
dudao
.
get
(
0
));
order
.
setSupervisorName
(
user
.
getName
());
String
schoolName
=
appMapper
.
selectSchoolById
(
schoolId
);
order
.
setHehuorenSchool
(
schoolName
);
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
Integer
insert
=
orderMapper
.
insert
(
order
);
appMapper
.
inserOrderHis
(
id
,
"下单成功"
,
date
,
sysUser
.
getName
());
appMapper
.
inserOrderHis
(
id
,
"下单成功"
,
date
,
sysUser
.
getName
());
// MessageUtil.sent(contactNumber,"4","");
if
(
StringUtils
.
isNotBlank
(
mark
))
{
String
uuid1
=
UUID
.
randomUUID
().
toString
();
String
id1
=
uuid1
.
split
(
"-"
)[
0
]+
uuid1
.
split
(
"-"
)[
1
];
String
id1
=
uuid1
.
split
(
"-"
)[
0
]
+
uuid1
.
split
(
"-"
)[
1
];
String
s1
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
1000
));
order
.
setId
(
id1
);
order
.
setOrderNumber
(
"YRYM"
+
format
+
s1
);
...
...
@@ -268,12 +358,12 @@ public class PackageUpgradeController extends BaseController {
insert
+=
orderMapper
.
insert
(
order
);
YangChengTong
yangChengTong
=
new
YangChengTong
();
yangChengTong
.
setSchool
(
schoolName
);
yangChengTong
.
setCustomerName
(
custName
);
yangChengTong
.
setContactAddress
(
addRess
);
yangChengTong
.
setContactPhone
(
contactNumber
);
yangChengTong
.
setCustomerPhone
(
businessNumber
);
yangChengTong
.
setCustomerName
(
customerName
);
insert
+=
yangChengTongrMapper
.
insert
(
yangChengTong
);
appMapper
.
inserOrderHis
(
id1
,
"下单成功"
,
date
,
sysUser
.
getName
());
appMapper
.
inserOrderHis
(
id1
,
"下单成功"
,
date
,
sysUser
.
getName
());
return
ResponseData
.
success
(
id
+
":"
+
id1
,
"下单成功!"
);
}
if
(
insert
==
1
)
{
...
...
@@ -283,5 +373,4 @@ public class PackageUpgradeController extends BaseController {
}
}
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