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
66522b01
Commit
66522b01
authored
Mar 03, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app开发
parent
9f8b4ab2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
114 additions
and
26 deletions
+114
-26
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
+100
-15
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
+14
-11
No files found.
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
View file @
66522b01
...
...
@@ -11,7 +11,6 @@ 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
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
...
...
@@ -22,8 +21,6 @@ import java.text.DateFormat;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
static
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNumeric
;
@Slf4j
@RestController
...
...
@@ -49,7 +46,7 @@ public class PackageNewClothes {
}
/**
* 查询学校适用套餐
* 查询
用户
学校适用套餐
*
* @param partner
* @return
...
...
@@ -93,18 +90,99 @@ public class PackageNewClothes {
Date
date
=
new
Date
();
Integer
format
=
Integer
.
parseInt
(
yyyyMMdd
.
format
(
date
.
getTime
()));
Integer
time16
=
Integer
.
parseInt
(
String
.
valueOf
(
i
+
16
)
+
iDCard
.
substring
(
10
,
14
));
Integer
time25
=
Integer
.
parseInt
(
String
.
valueOf
(
i
+
25
)
+
iDCard
.
substring
(
10
,
14
))
;
if
(
format
<
time16
)
{
Integer
time25
=
Integer
.
parseInt
(
String
.
valueOf
(
i
+
25
)
+
iDCard
.
substring
(
10
,
14
));
if
(
format
<
time16
)
{
return
ResponseData
.
error
(
"根据工信部要求,未满16周岁的用户,应由法定代理人代为办理线上入网,如有疑问请联系客服,谢谢。"
);
}
if
(
format
>
time25
)
{
if
(
format
>
time25
)
{
return
ResponseData
.
error
(
"您已满25周岁,不符合办理条件,如有疑问请联系客服,谢谢。"
);
}
return
ResponseData
.
success
(
"身份证输入正确。"
);
}
/**
* 天翼学生证
* 新开手机卡 预制卡
*
* @param site 地址
* @param kapin 套餐名
* @param idCardz 身份证正面地址
* @param idCardf 身份证反面地址
* @param idCardzs 手持身份证正面地址
* @param studentCard 学生卡
* @param remarks 备注
* @param customerName 用户姓名
* @param contactNumber 联系电话
* @param cardId 套餐ID
* @param partner 用户ID
* @param idCard 用户身份证
* @param userSchool 学校
* @return
*/
@RequestMapping
(
value
=
"newMobilePhoneCard"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
newMobilePhoneCard
(
@RequestParam
(
"contactNumber"
)
String
contactNumber
,
@RequestParam
(
"site"
)
String
site
,
@RequestParam
(
"studentCard"
)
String
studentCard
,
@RequestParam
(
"cardId"
)
String
cardId
,
@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
)
{
if
(
contactNumber
.
length
()
!=
11
)
{
return
ResponseData
.
error
(
"联系号码有误,请重新输入"
);
}
Calendar
instance
=
Calendar
.
getInstance
();
instance
.
add
(
Calendar
.
DATE
,
-
94
);
Date
time
=
instance
.
getTime
();
Wrapper
<
Order
>
wrapper
=
new
EntityWrapper
();
wrapper
.
eq
(
"hehuoren_id"
,
partner
);
wrapper
.
gt
(
"create_time"
,
time
);
wrapper
.
ne
(
"order_status"
,
OrderStatus
.
ACCEPTEXCEPTCION
.
getName
());
wrapper
.
eq
(
"user_type"
,
UserType
.
NEWCUSTOMER
.
getId
());
List
<
Order
>
orders
=
orderMapper
.
selectList
(
wrapper
);
if
(
orders
.
size
()
!=
0
)
{
return
ResponseData
.
error
(
""
);
}
SysUser
sysUser
=
userMapper
.
selectById
(
partner
);
Order
order
=
new
Order
();
String
id
=
UUID
.
randomUUID
().
toString
();
order
.
setId
(
id
);
order
.
setIdCard
(
idCard
);
order
.
setOrderStatus
(
"待处理"
);
order
.
setUserSchool
(
userSchool
);
order
.
setHehuorenId
(
partner
);
order
.
setSite
(
site
);
order
.
setKapin
(
kapin
);
order
.
setPackageId
(
cardId
);
order
.
setCustomerName
(
customerName
);
order
.
setContactNumber
(
contactNumber
);
order
.
setIdCardzs
(
idCardzs
);
order
.
setIdCardz
(
idCardz
);
order
.
setIdCardf
(
idCardf
);
order
.
setRemarks
(
remarks
);
Date
date
=
new
Date
();
order
.
setCreateTime
(
date
);
order
.
setUserType
(
UserType
.
NEWCUSTOMER
.
getId
());
order
.
setTjType
(
0
);
SimpleDateFormat
yyyyMMdd
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
String
format
=
yyyyMMdd
.
format
(
date
);
String
s
=
String
.
valueOf
((
int
)
((
Math
.
random
()
*
9
+
1
)
*
1000
));
order
.
setOrderNumber
(
"YRYM"
+
format
+
s
);
order
.
setHehuorenArea
(
sysUser
.
getSubstName
());
order
.
setHehuorenName
(
sysUser
.
getName
());
String
schoolId
=
packageUpgradeMapper
.
selectSchoolId
(
partner
);
String
schoolName
=
packageUpgradeMapper
.
selectSchoolById
(
schoolId
);
order
.
setHehuorenSchool
(
schoolName
);
order
.
setHehuorenPhone
(
sysUser
.
getPhone
());
Integer
insert
=
orderMapper
.
insert
(
order
);
// MessageUtil.sent(contactNumber,"4","");
if
(
insert
==
1
)
{
packageUpgradeMapper
.
inserOrderHis
(
id
,
"资料已提交"
,
date
);
return
ResponseData
.
success
(
id
);
}
return
ResponseData
.
error
(
"升级失败!"
);
}
/**
* 新开手机卡 天翼学生卡
*
* @param site 地址
* @param kapin 套餐名
...
...
@@ -132,6 +210,9 @@ public class PackageNewClothes {
,
@RequestParam
(
value
=
"remarks"
,
required
=
false
)
String
remarks
,
@RequestParam
(
value
=
"kapin"
)
String
kapin
,
@RequestParam
(
value
=
"idCard"
)
String
idCard
,
@RequestParam
(
value
=
"studentNumber"
)
String
studentNumber
,
@RequestParam
(
value
=
"userSchool"
)
String
userSchool
)
{
if
(
contactNumber
.
length
()
!=
11
)
{
return
ResponseData
.
error
(
"联系号码有误,请重新输入"
);
}
Calendar
instance
=
Calendar
.
getInstance
();
instance
.
add
(
Calendar
.
DATE
,
-
94
);
Date
time
=
instance
.
getTime
();
...
...
@@ -150,6 +231,7 @@ public class PackageNewClothes {
order
.
setId
(
id
);
order
.
setIdCard
(
idCard
);
order
.
setOrderStatus
(
"待处理"
);
order
.
setUserSchool
(
userSchool
);
order
.
setHehuorenId
(
partner
);
order
.
setSite
(
site
);
order
.
setKapin
(
kapin
);
...
...
@@ -181,18 +263,21 @@ public class PackageNewClothes {
// MessageUtil.sent(contactNumber,"4","");
if
(
insert
==
1
)
{
packageUpgradeMapper
.
inserOrderHis
(
id
,
"
下单成功
"
,
date
);
packageUpgradeMapper
.
inserOrderHis
(
id
,
"
资料已提交
"
,
date
);
return
ResponseData
.
success
(
id
);
}
return
ResponseData
.
error
(
"升级失败!"
);
}
/**
* 新开手机卡 小白卡
*
* @return
*/
@RequestMapping
(
value
=
"XiaoBaiCard"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
XiaoBaiCard
()
{
return
null
;
}
}
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
View file @
66522b01
...
...
@@ -75,7 +75,7 @@ public class PackageUpgradeController extends BaseController {
if
(
packageUpgrade
.
size
()
!=
0
)
{
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
);
...
...
@@ -90,7 +90,7 @@ public class PackageUpgradeController extends BaseController {
if
(
packageUpgrade
.
size
()
!=
0
)
{
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
);
...
...
@@ -105,7 +105,7 @@ public class PackageUpgradeController extends BaseController {
if
(
packageUpgrade
.
size
()
!=
0
)
{
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
);
...
...
@@ -134,7 +134,7 @@ public class PackageUpgradeController extends BaseController {
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgradeMapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"
name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
wrapper2
.
eq
(
"
package_name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐!"
);
...
...
@@ -150,7 +150,7 @@ public class PackageUpgradeController extends BaseController {
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgradeMapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"
name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
wrapper2
.
eq
(
"
package_name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐!"
);
...
...
@@ -165,7 +165,7 @@ public class PackageUpgradeController extends BaseController {
List
<
Map
<
String
,
Object
>>
packageUpgrade
=
packageUpgradeMapper
.
selectPackage
(
wrapper
);
wrapper1
.
eq
(
"name"
,
packageUpgrade
.
get
(
0
).
get
(
"cdma_disc_desc"
));
List
<
Package
>
packages1
=
packageMapper
.
selectList
(
wrapper1
);
wrapper2
.
eq
(
"
name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
wrapper2
.
eq
(
"
package_name
"
,
packageUpgrade
.
get
(
0
).
get
(
"wxcl"
));
List
<
Package
>
packages2
=
packageMapper
.
selectList
(
wrapper2
);
if
(
packages2
.
size
()
==
0
)
{
return
ResponseData
.
error
(
"您没有升级套餐!"
);
...
...
@@ -194,10 +194,10 @@ public class PackageUpgradeController extends BaseController {
* @param is_yct
*
* 羊城通
* @param mark 羊城通是否办理
* @param addRess 地址
* @param custName 姓名
* @param userSchool 学校
* @param mark 羊城通是否办理
(空为不办理,不为空就办理)
* @param addRess 地址
(办理羊城通才使用,正常订单为空)
* @param custName 姓名
(办理羊城通才使用,正常订单为空)
* @param userSchool 学校
(办理羊城通才使用,正常订单为空)
* @return
*/
@RequestMapping
(
value
=
"oldUserUpade"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -210,6 +210,9 @@ public class PackageUpgradeController extends BaseController {
,
@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
(
"hehuoren_id"
,
partner
);
wrapper
.
eq
(
"business_number"
,
businessNumber
);
...
...
@@ -234,7 +237,7 @@ public class PackageUpgradeController extends BaseController {
order
.
setCreateTime
(
date
);
order
.
setNowPackage
(
nowPackage
);
order
.
setBusinessPackage
(
businessPackage
);
order
.
setUserId
(
oldU
serId
);
order
.
setUserId
(
u
serId
);
order
.
setUserType
(
UserType
.
OLDCUSTOMER
.
getId
());
SimpleDateFormat
yyyyMMdd
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
String
format
=
yyyyMMdd
.
format
(
date
);
...
...
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