Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev

jz-dm-common/src/main/java/com/jz/common/base/BaseController.java

+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-mall/src/main/java/com/jz/dm/mall/moduls/controller/customer/MallCustomerController.java

 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

@@ -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

@@ -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

@@ -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;
     }