diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index e359cd27b..cf6ee8248 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -9,6 +9,9 @@ spring: url: jdbc:mysql://www.ks1.top:20336/Bizz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 + #url: jdbc:mysql://101.200.139.69:3306/majiang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #username: root + #password: jaLZ;nr+O2rC # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java index e5bd6a8d3..3ad612454 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizMember.java @@ -33,9 +33,6 @@ public class BizMember extends BaseEntity @Excel(name = "推荐人ID") private Long recommendId; - /** 所有上级推荐人ID */ - private String recommendAllId; - /** 推荐人手机 */ private String recommendMobile; @@ -53,6 +50,19 @@ public class BizMember extends BaseEntity @Excel(name = "是否禁用：0-否，1-是") private Integer isEnable; + /** 福豆相关数据 */ + @Excel(name = "福豆余额") + private Long douBalance; + + @Excel(name = "福豆余额") + private Long douPerson; + + @Excel(name = "团队福豆") + private Long douTeam; + + @Excel(name = "福豆田") + private Long douField; + public void setId(Long id) { this.id = id; @@ -98,15 +108,7 @@ public class BizMember extends BaseEntity { return recommendId; } - public void setRecommendAllId(String recommendAllId) - { - this.recommendAllId = recommendAllId; - } - public String getRecommendAllId() - { - return recommendAllId; - } public void setRecommendMobile(String recommendMobile) { this.recommendMobile = recommendMobile; @@ -153,6 +155,38 @@ public class BizMember extends BaseEntity return isEnable; } + public Long getDouBalance() { + return douBalance; + } + + public void setDouBalance(Long douBalance) { + this.douBalance = douBalance; + } + + public Long getDouPerson() { + return douPerson; + } + + public void setDouPerson(Long douPerson) { + this.douPerson = douPerson; + } + + public Long getDouTeam() { + return douTeam; + } + + public void setDouTeam(Long douTeam) { + this.douTeam = douTeam; + } + + public Long getDouField() { + return douField; + } + + public void setDouField(Long douField) { + this.douField = douField; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -161,7 +195,6 @@ public class BizMember extends BaseEntity .append("memberName", getMemberName()) .append("password", getPassword()) .append("recommendId", getRecommendId()) - .append("recommendAllId", getRecommendAllId()) .append("recommendMobile", getRecommendMobile()) .append("recommendName", getRecommendName()) .append("memberType", getMemberType()) diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizOrder.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizOrder.java index e3d8eb09a..f4cc12f18 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizOrder.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizOrder.java @@ -64,10 +64,10 @@ public class BizOrder extends BaseEntity private String productName; @Excel(name = "商品单价") - private String productAmount; + private Long productAmount; @Excel(name = "商品数量") - private String productCount; + private Integer productCount; /** 收货人地址信息 */ @Excel(name = "收货人姓名") @@ -182,19 +182,19 @@ public class BizOrder extends BaseEntity this.productName = productName; } - public String getProductAmount() { + public Long getProductAmount() { return productAmount; } - public void setProductAmount(String productAmount) { + public void setProductAmount(Long productAmount) { this.productAmount = productAmount; } - public String getProductCount() { + public Integer getProductCount() { return productCount; } - public void setProductCount(String productCount) { + public void setProductCount(Integer productCount) { this.productCount = productCount; } diff --git a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml index 06717836a..f55cfd73b 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml @@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -23,7 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, mobile, member_name, password, recommend_id, recommend_all_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time from biz_member + select a.id, mobile, member_name, password, recommend_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time, + (select amount from biz_account where member_id = a.id and account_type = 0) douBalance, + (select amount from biz_account where member_id = a.id and account_type = 1) douPerson, + (select amount from biz_account where member_id = a.id and account_type = 0) douTeam, + (select amount from biz_account where member_id = a.id and account_type = 0) douField + from biz_member a diff --git a/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml index 1771ec275..535803963 100644 --- a/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml +++ b/ruoyi-business/src/main/resources/mapper/business/BizOrderMapper.xml @@ -23,11 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.id, order_sn, a.member_id, a.mobile, a.member_name, order_amount, order_status, remark, address_detail, address_id, a.create_by, a.create_time, a.update_by, a.update_time, - b.mobile addressMobile, b.member_name addressName, b.province_name addressProvince, b.city_name addressCity, b.area_name addressArea + b.mobile addressMobile, b.member_name addressName, b.province_name addressProvince, b.city_name addressCity, b.area_name addressArea, + c.productName, c.productCount, c.productAmount from biz_order a left join biz_member_address b on a.member_id = b.member_id - left join (select max(id), product_id, product_code productName, product_count productCount, product_amount productAmount from biz_order_detail group by product_id) c - on a.id = c.product_id + left join (select max(id), order_id, product_code productName, product_count productCount, product_amount productAmount from biz_order_detail group by product_id) c + on a.id = c.order_id
  • @@ -117,11 +117,11 @@ title: '订单状态', formatter: function(value, row, index) { switch (value){ - case 0: return "待支付"; - case 1: return "已支付"; - case 2: return "已取消"; - case 3: return "待收货"; - case 4: return "已完成"; + case 0: return "待支付"; + case 1: return "已支付"; + case 2: return "已取消"; + case 3: return "待收货"; + case 4: return "已完成"; } } }, @@ -135,10 +135,10 @@ formatter: function(value, row, index) { var actions = []; if(row.orderStatus == 1){ - actions.push('设为已发货 '); + actions.push('发货 '); } - actions.push('修改备注 '); - actions.push('修改收货地址 '); + actions.push('修改备注 '); + actions.push('收货地址 '); return actions.join(''); } }] diff --git a/sql/biz.sql b/sql/biz.sql index e2e1a876f..09fac3cdc 100644 --- a/sql/biz.sql +++ b/sql/biz.sql @@ -168,7 +168,7 @@ CREATE TABLE `biz_order_detail` ( `order_sn` varchar(64) NOT NULL DEFAULT '' COMMENT '订单编码', `product_id` bigint(20) NOT NULL COMMENT '产品ID', `product_code` varchar(64) NOT NULL DEFAULT '' COMMENT '产品编码', - `product_count` decimal(12,2) NOT NULL DEFAULT 0.0 COMMENT '商品数量', + `product_count` int NOT NULL DEFAULT 0 COMMENT '商品数量', `product_amount` decimal(12,2) NOT NULL DEFAULT 0.0 COMMENT '商品金额', `create_by` varchar(64) DEFAULT '' COMMENT '创建者', `create_time` datetime DEFAULT NULL COMMENT '创建时间',