Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dm_project
Project
Project
Details
Activity
Releases
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
姚本章
dm_project
Commits
e8bb39cb
Commit
e8bb39cb
authored
Dec 02, 2020
by
machengbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mall
parent
1fcaba78
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
26 deletions
+42
-26
BaseController.java
...mmon/src/main/java/com/jz/common/base/BaseController.java
+13
-0
RedisMessageConstant.java
...ain/java/com/jz/common/constant/RedisMessageConstant.java
+1
-1
MallCustomerController.java
...ll/moduls/controller/customer/MallCustomerController.java
+1
-1
OrderDto.java
...com/jz/dm/mall/moduls/controller/order/bean/OrderDto.java
+10
-9
Order.java
...all/src/main/java/com/jz/dm/mall/moduls/entity/Order.java
+10
-9
OrderPayment.java
.../main/java/com/jz/dm/mall/moduls/entity/OrderPayment.java
+7
-6
No files found.
jz-dm-common/src/main/java/com/jz/common/base/BaseController.java
0 → 100644
View file @
e8bb39cb
package
com
.
jz
.
common
.
base
;
public
class
BaseController
{
/*public User getCurrentUser(){
User user = (User) SecurityUtils.getSubject().getPrincipals().iterator().next();
return user;
}
public Integer getCurrentUserId(){
return getCurrentUser().getUserId();
}*/
}
jz-dm-common/src/main/java/com/jz/common/constant/RedisMessageConstant.java
View file @
e8bb39cb
package
com
.
itheima
.
health
.
constant
;
package
com
.
jz
.
common
.
constant
;
public
interface
RedisMessageConstant
{
static
final
String
SENDTYPE_ORDER
=
"001"
;
//用于缓存体检预约时发送的验证码
...
...
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/customer/MallCustomerController.java
View file @
e8bb39cb
package
com
.
jz
.
dm
.
mall
.
moduls
.
controller
.
customer
;
import
com.jz.common.base.BaseController
;
import
com.jz.common.constant.RedisMessageConstant
;
import
com.jz.common.entity.MallCustomer
;
import
com.jz.common.entity.SysUser
;
import
com.jz.common.utils.Result
;
import
com.jz.common.utils.StatusCode
;
import
com.jz.dm.mall.moduls.service.MallCustomerService
;
import
com.jz.manage.moduls.controller.BaseController
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.RedisTemplate
;
import
org.springframework.util.StringUtils
;
...
...
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/order/bean/OrderDto.java
View file @
e8bb39cb
...
...
@@ -2,6 +2,7 @@ package com.jz.dm.mall.moduls.controller.order.bean;
import
io.swagger.annotations.ApiModel
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
...
...
@@ -33,7 +34,7 @@ public class OrderDto {
/**
* 订单金额
*/
private
Double
orderMoney
;
private
BigDecimal
orderMoney
;
/**
* 订单时间
*/
...
...
@@ -45,7 +46,7 @@ public class OrderDto {
/**
* 支付金额
*/
private
Double
paymentMoney
;
private
BigDecimal
paymentMoney
;
/**
* 支付时间
*/
...
...
@@ -57,7 +58,7 @@ public class OrderDto {
/**
* 优惠金额
*/
private
Double
districtMoney
;
private
BigDecimal
districtMoney
;
/**
* 购买方式:01年,02季,03月,04次(服务类型)
*/
...
...
@@ -148,11 +149,11 @@ public class OrderDto {
this
.
orderStatus
=
orderStatus
;
}
public
Double
getOrderMoney
()
{
public
BigDecimal
getOrderMoney
()
{
return
orderMoney
;
}
public
void
setOrderMoney
(
Double
orderMoney
)
{
public
void
setOrderMoney
(
BigDecimal
orderMoney
)
{
this
.
orderMoney
=
orderMoney
;
}
...
...
@@ -172,11 +173,11 @@ public class OrderDto {
this
.
sellerId
=
sellerId
;
}
public
Double
getPaymentMoney
()
{
public
BigDecimal
getPaymentMoney
()
{
return
paymentMoney
;
}
public
void
setPaymentMoney
(
Double
paymentMoney
)
{
public
void
setPaymentMoney
(
BigDecimal
paymentMoney
)
{
this
.
paymentMoney
=
paymentMoney
;
}
...
...
@@ -196,11 +197,11 @@ public class OrderDto {
this
.
paymentMethod
=
paymentMethod
;
}
public
Double
getDistrictMoney
()
{
public
BigDecimal
getDistrictMoney
()
{
return
districtMoney
;
}
public
void
setDistrictMoney
(
Double
districtMoney
)
{
public
void
setDistrictMoney
(
BigDecimal
districtMoney
)
{
this
.
districtMoney
=
districtMoney
;
}
...
...
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/entity/Order.java
View file @
e8bb39cb
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import
io.swagger.annotations.ApiModel
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
...
...
@@ -35,7 +36,7 @@ public class Order implements Serializable {
/**
* 订单金额
*/
private
Double
orderMoney
;
private
BigDecimal
orderMoney
;
/**
* 订单时间
*/
...
...
@@ -47,7 +48,7 @@ public class Order implements Serializable {
/**
* 支付金额
*/
private
Double
paymentMoney
;
private
BigDecimal
paymentMoney
;
/**
* 支付时间
*/
...
...
@@ -59,7 +60,7 @@ public class Order implements Serializable {
/**
* 优惠金额
*/
private
Double
districtMoney
;
private
BigDecimal
districtMoney
;
/**
* 购买方式:01年,02季,03月,04次(服务类型)
*/
...
...
@@ -142,11 +143,11 @@ public class Order implements Serializable {
this
.
orderStatus
=
orderStatus
;
}
public
Double
getOrderMoney
()
{
public
BigDecimal
getOrderMoney
()
{
return
orderMoney
;
}
public
void
setOrderMoney
(
Double
orderMoney
)
{
public
void
setOrderMoney
(
BigDecimal
orderMoney
)
{
this
.
orderMoney
=
orderMoney
;
}
...
...
@@ -166,11 +167,11 @@ public class Order implements Serializable {
this
.
sellerId
=
sellerId
;
}
public
Double
getPaymentMoney
()
{
public
BigDecimal
getPaymentMoney
()
{
return
paymentMoney
;
}
public
void
setPaymentMoney
(
Double
paymentMoney
)
{
public
void
setPaymentMoney
(
BigDecimal
paymentMoney
)
{
this
.
paymentMoney
=
paymentMoney
;
}
...
...
@@ -190,11 +191,11 @@ public class Order implements Serializable {
this
.
paymentMethod
=
paymentMethod
;
}
public
Double
getDistrictMoney
()
{
public
BigDecimal
getDistrictMoney
()
{
return
districtMoney
;
}
public
void
setDistrictMoney
(
Double
districtMoney
)
{
public
void
setDistrictMoney
(
BigDecimal
districtMoney
)
{
this
.
districtMoney
=
districtMoney
;
}
...
...
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/entity/OrderPayment.java
View file @
e8bb39cb
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import
io.swagger.annotations.ApiModel
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
...
...
@@ -31,7 +32,7 @@ public class OrderPayment implements Serializable {
/**
* 支付金额
*/
private
Double
paymentMoney
;
private
BigDecimal
paymentMoney
;
/**
* 支付时间
*/
...
...
@@ -43,7 +44,7 @@ public class OrderPayment implements Serializable {
/**
* 优惠金额
*/
private
Double
districtMoney
;
private
BigDecimal
districtMoney
;
/**
* 支付状态
*/
...
...
@@ -86,11 +87,11 @@ public class OrderPayment implements Serializable {
this
.
sellerId
=
sellerId
;
}
public
Double
getPaymentMoney
()
{
public
BigDecimal
getPaymentMoney
()
{
return
paymentMoney
;
}
public
void
setPaymentMoney
(
Double
paymentMoney
)
{
public
void
setPaymentMoney
(
BigDecimal
paymentMoney
)
{
this
.
paymentMoney
=
paymentMoney
;
}
...
...
@@ -110,11 +111,11 @@ public class OrderPayment implements Serializable {
this
.
paymentMethod
=
paymentMethod
;
}
public
Double
getDistrictMoney
()
{
public
BigDecimal
getDistrictMoney
()
{
return
districtMoney
;
}
public
void
setDistrictMoney
(
Double
districtMoney
)
{
public
void
setDistrictMoney
(
BigDecimal
districtMoney
)
{
this
.
districtMoney
=
districtMoney
;
}
...
...
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