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
ba9eda5f
Commit
ba9eda5f
authored
Mar 03, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app开发
parent
f76410fe
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
212 additions
and
15 deletions
+212
-15
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
+198
-0
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
+0
-0
common/src/main/java/com/winsun/bean/Order.java
+2
-0
common/src/main/java/com/winsun/bean/PackageUpgrade.java
+2
-0
common/src/main/java/com/winsun/bean/SysUser.java
+0
-5
common/src/main/java/com/winsun/bean/YangChengTong.java
+4
-4
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java
+5
-5
common/src/main/java/com/winsun/utils/IDCardUtil.java
+1
-1
No files found.
apply-net/src/main/java/com/winsun/controller/PackageNewClothes.java
0 → 100644
View file @
ba9eda5f
package
com
.
winsun
.
controller
;
import
com.baomidou.mybatisplus.mapper.EntityWrapper
;
import
com.baomidou.mybatisplus.mapper.Wrapper
;
import
com.winsun.auth.core.common.model.ResponseData
;
import
com.winsun.bean.Order
;
import
com.winsun.bean.Package
;
import
com.winsun.bean.SysUser
;
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
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.text.DateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
static
org
.
apache
.
commons
.
lang
.
StringUtils
.
isNumeric
;
@Slf4j
@RestController
@RequestMapping
(
"/packageNewClothes"
)
public
class
PackageNewClothes
{
private
static
PackageUpgradeMapper
packageUpgradeMapper
;
private
static
PackageMapper
packageMapper
;
private
static
OrderMapper
orderMapper
;
private
static
SysUserMapper
userMapper
;
@Autowired
public
PackageNewClothes
(
PackageUpgradeMapper
packageUpgradeMapper
,
PackageMapper
packageMapper
,
OrderMapper
orderMapper
,
SysUserMapper
userMapper
)
{
PackageNewClothes
.
packageUpgradeMapper
=
packageUpgradeMapper
;
PackageNewClothes
.
packageMapper
=
packageMapper
;
PackageNewClothes
.
orderMapper
=
orderMapper
;
PackageNewClothes
.
userMapper
=
userMapper
;
}
/**
* 查询学校适用套餐
*
* @param partner
* @return
*/
@RequestMapping
(
value
=
"selectSchoolPackage"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
List
<
Package
>>
selectSchoolPackage
(
@RequestParam
(
"partner"
)
String
partner
)
{
String
schoolId
=
packageUpgradeMapper
.
selectSchoolId
(
partner
);
List
<
String
>
packageIds
=
packageUpgradeMapper
.
selectPackageId
(
schoolId
);
List
<
Package
>
packages
=
new
ArrayList
<>();
packageIds
.
forEach
(
packageId
->
{
Package
package1
=
packageMapper
.
selectById
(
packageId
);
packages
.
add
(
package1
);
});
return
ResponseData
.
success
(
packages
);
}
/**
* 查询套餐详情
*
* @param packageId
* @return
*/
@RequestMapping
(
value
=
"selectPackageInfo"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
Package
>
selectPackageInfo
(
@RequestParam
(
"packageId"
)
String
packageId
)
{
return
ResponseData
.
success
(
packageMapper
.
selectById
(
packageId
));
}
/**
* 身份证验证
*
* @param iDCard
* @return
*/
@RequestMapping
(
value
=
"iDCard"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
iDCard
(
@RequestParam
(
"iDCard"
)
String
iDCard
)
{
if
(!
IDCardUtil
.
IDCardValidate
(
iDCard
))
{
return
ResponseData
.
error
(
"身份证输入错误!"
);
}
Integer
i
=
Integer
.
parseInt
(
iDCard
.
substring
(
6
,
10
));
DateFormat
yyyyMMdd
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
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
){
return
ResponseData
.
error
(
"根据工信部要求,未满16周岁的用户,应由法定代理人代为办理线上入网,如有疑问请联系客服,谢谢。"
);
}
if
(
format
>
time25
){
return
ResponseData
.
error
(
"您已满25周岁,不符合办理条件,如有疑问请联系客服,谢谢。"
);
}
return
ResponseData
.
success
(
"身份证输入正确。"
);
}
/**
* 天翼学生证
*
* @param site 地址
* @param kapin 套餐名
* @param idCardz
* @param idCardf
* @param idCardzs
* @param remarks 备注
* @param studentNumber 学号
* @param classNumber 班级
* @param parentName 家长姓名
* @param contactNumber 家长电话
* @param cardId 套餐ID
* @param customerName 学生姓名
* @param partner 用户ID
* @param idCard 家长身份证
* @param userSchool 学校
* @return
*/
@RequestMapping
(
value
=
"skywingCard"
,
method
=
RequestMethod
.
POST
)
public
ResponseData
<
String
>
SkywingCard
(
@RequestParam
(
"contactNumber"
)
String
contactNumber
,
@RequestParam
(
"site"
)
String
site
,
@RequestParam
(
"classNumber"
)
String
classNumber
,
@RequestParam
(
"cardId"
)
String
cardId
,
@RequestParam
(
"customerName"
)
String
customerName
,
@RequestParam
(
"partner"
)
String
partner
,
@RequestParam
(
value
=
"idCardzs"
)
String
idCardzs
,
@RequestParam
(
value
=
"idCardz"
)
String
idCardz
,
@RequestParam
(
value
=
"parentName"
)
String
parentName
,
@RequestParam
(
value
=
"idCardf"
)
String
idCardf
,
@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
)
{
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
.
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
);
order
.
setClassNumber
(
classNumber
);
order
.
setParentName
(
parentName
);
order
.
setStudentNumber
(
studentNumber
);
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
(
"升级失败!"
);
}
}
apply-net/src/main/java/com/winsun/controller/PackageUpgradeController.java
View file @
ba9eda5f
This diff is collapsed.
Click to expand it.
common/src/main/java/com/winsun/bean/Order.java
View file @
ba9eda5f
...
...
@@ -3,6 +3,7 @@ package com.winsun.bean;
import
java.io.Serializable
;
import
java.util.Date
;
import
com.baomidou.mybatisplus.annotations.TableField
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
lombok.Data
;
...
...
@@ -226,6 +227,7 @@ public class Order implements Serializable{
/**
* 学校
*/
@TableField
(
value
=
"userSchool"
)
private
String
userSchool
;
/**
...
...
common/src/main/java/com/winsun/bean/PackageUpgrade.java
View file @
ba9eda5f
package
com
.
winsun
.
bean
;
import
com.baomidou.mybatisplus.annotations.TableField
;
import
com.baomidou.mybatisplus.annotations.TableId
;
import
com.baomidou.mybatisplus.annotations.TableName
;
import
com.baomidou.mybatisplus.enums.IdType
;
...
...
@@ -184,6 +185,7 @@ public class PackageUpgrade implements Serializable {
/**
* 是否受理“DM0002-A01 (0元宽带标识)
*/
@TableField
(
"is_0ykd"
)
private
String
is0ykd
;
/**
* 宽带速率
...
...
common/src/main/java/com/winsun/bean/SysUser.java
View file @
ba9eda5f
...
...
@@ -89,11 +89,6 @@ public class SysUser {
private
String
version
;
/**
* 工号
*/
private
String
staffId
;
/**
* 渠道大类
*/
@TableField
(
value
=
"channelType"
)
...
...
common/src/main/java/com/winsun/bean/YangChengTong.java
View file @
ba9eda5f
...
...
@@ -24,12 +24,12 @@ public class YangChengTong implements Serializable {
/**
*姓名
*/
private
String
customer
_n
ame
;
private
String
customer
N
ame
;
/**
* 登记的手机号
*/
private
String
customer
_p
hone
;
private
String
customer
P
hone
;
/**
* 学校
...
...
@@ -39,12 +39,12 @@ public class YangChengTong implements Serializable {
/**
* '联系方式 手机号'
*/
private
String
contact
_p
hone
;
private
String
contact
P
hone
;
/**
* 联系地址
*/
private
String
contact
_a
ddress
;
private
String
contact
A
ddress
;
}
common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java
View file @
ba9eda5f
...
...
@@ -24,19 +24,19 @@ public interface PackageUpgradeMapper 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
);
@Select
(
"select school from `hhr_user_view` where id = #{partner}"
)
String
selectShoolByUserId
(
String
partner
);
@Insert
(
"insert into `hhr_order_history` values(#{id},#{status},#{date}) "
)
Integer
inserOrderHis
(
@Param
(
"id"
)
String
id
,
@Param
(
"status"
)
String
status
,
@Param
(
"date"
)
Date
date
);
@Insert
(
"select * from `hhr_order_history` where or
ed
r_id = #{oredrId}"
)
@Insert
(
"select * from `hhr_order_history` where or
de
r_id = #{oredrId}"
)
List
<
Map
<
String
,
Object
>>
selectOrderHis
(
String
oredrId
);
@Select
(
"select school_id schoolId from `hhr_user_school` where user_id = #{partner}"
)
String
selectSchoolId
(
String
partner
);
@Select
(
"select package_id packageId from `hhr_user_school` where school_id = #{schoolId}"
)
@Select
(
"select school_name schoolName from `hhr_school` where id = #{schoolId}"
)
String
selectSchoolById
(
String
schoolId
);
@Select
(
"select package_id packageId from `hhr_school_package` where school_id = #{schoolId}"
)
List
<
String
>
selectPackageId
(
String
schoolId
);
...
...
common/src/main/java/com/winsun/utils/IDCardUtil.java
View file @
ba9eda5f
...
...
@@ -101,7 +101,7 @@ public class IDCardUtil {
}
else
{
return
false
;
}
return
fals
e
;
return
tru
e
;
}
...
...
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