diff --git a/ghy-admin/src/main/resources/static/css/login.css b/ghy-admin/src/main/resources/static/css/login.css index 63a9b01c..b057fb11 100644 --- a/ghy-admin/src/main/resources/static/css/login.css +++ b/ghy-admin/src/main/resources/static/css/login.css @@ -16,7 +16,9 @@ body.signin { } .signinpanel .logopanel { float:none; - width:auto; + /*width:auto;*/ + width: 121px; + height: 75px; padding:0; background:0 0 } diff --git a/ghy-admin/src/main/resources/static/ruoyi.png b/ghy-admin/src/main/resources/static/ruoyi.png index b0af01fe..113bb792 100644 Binary files a/ghy-admin/src/main/resources/static/ruoyi.png and b/ghy-admin/src/main/resources/static/ruoyi.png differ diff --git a/ghy-admin/src/main/resources/templates/login.html b/ghy-admin/src/main/resources/templates/login.html index 2d002447..7be20233 100644 --- a/ghy-admin/src/main/resources/templates/login.html +++ b/ghy-admin/src/main/resources/templates/login.html @@ -3,8 +3,8 @@ - 登录工圈子系统 - + 登录叮咚工链系统 + @@ -26,16 +26,16 @@
-

[ 工圈子 ]

+

[ 叮咚工链 ]

-

欢迎使用 工圈子 后台管理系统

+

欢迎使用 叮咚工链 后台管理系统

还没有账号？ 立即注册»
@@ -65,7 +65,7 @@
- Copyright © 2018-2021 ruoyi.vip All Rights Reserved.
+ Copyright © 2018-2021 opsoul.com All Rights Reserved.
diff --git a/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java new file mode 100644 index 00000000..f4068a56 --- /dev/null +++ b/ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java @@ -0,0 +1,30 @@ +package com.ghy.common.enums; + +/** + * 财务细单类型.所有类型合起来等于主订单实付金额 + * @author clunt + */ +public enum FinancialDetailType { + + ORDER_FEE(0, "订单金额"), + WORKER_FEE(1,"大师傅/店铺提成金额"), + PLATFORM_FEE(2,"平台提成金额"), + PLACE_FEE(3, "分销金额,可能存在多级"), + RETURN_FEE(4, "退款金额"); + + private final Integer code; + private final String desc; + + FinancialDetailType(Integer code, String desc) { + this.code = code; + this.desc = desc; + } + + public Integer getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java new file mode 100644 index 00000000..1a0e038a --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java @@ -0,0 +1,53 @@ +package com.ghy.order.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 细单表(转派后产生的订单) + */ +@Data +public class OrderDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "订单编码", cellType = Excel.ColumnType.STRING) + private String code; + + @Excel(name = "主单id", cellType = Excel.ColumnType.NUMERIC) + private Integer orderMasterId; + + @Excel(name = "主单编码", cellType = Excel.ColumnType.STRING) + private String orderMasterCode; + + @Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC) + private Long customerId; + + @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC) + private Integer orderType; + + @Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC) + private Integer orderStatus; + + @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC) + private Integer workerId; + + @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) + private String payTime; + + @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING) + private String revTime; + + @Excel(name = "服务开始时间/上门时间", cellType = Excel.ColumnType.STRING) + private String workBeginTime; + + @Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING) + private String workFinishTime; + + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java new file mode 100644 index 00000000..24a18c9d --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java @@ -0,0 +1,15 @@ +package com.ghy.order.domain; + +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 拆单后细单关联商品 + */ +@Data +public class OrderDetailGoods extends BaseEntity { + + + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java new file mode 100644 index 00000000..c610666c --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -0,0 +1,46 @@ +package com.ghy.order.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 主单表(对应付款订单) + */ +@Data +public class OrderMaster extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "订单编码", cellType = Excel.ColumnType.STRING) + private String code; + + @Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC) + private Long customerId; + + @Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC) + private Integer orderType; + + @Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC) + private Integer orderStatus; + + @Excel(name = "付款类型",cellType = Excel.ColumnType.NUMERIC) + private Integer payType; + + @Excel(name = "付款状态", cellType = Excel.ColumnType.NUMERIC) + private Integer payStatus; + + @Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC) + private Integer workerId; + + @Excel(name = "付款时间间", cellType = Excel.ColumnType.STRING) + private String payTime; + + @Excel(name = "接单时间", cellType = Excel.ColumnType.STRING) + private String revTime; + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java new file mode 100644 index 00000000..63b7e4b5 --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java @@ -0,0 +1,15 @@ +package com.ghy.order.domain; + +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 主单关联商品，即所有商品清单 + */ +@Data +public class OrderMasterGoods extends BaseEntity { + + private static final long serialVersionUID = 1L; + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java b/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java deleted file mode 100644 index 5e0ce97d..00000000 --- a/ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ghy.payment; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class PaymentApplication { - - public static void main(String[] args) { - SpringApplication.run(PaymentApplication.class, args); - } - -} diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java new file mode 100644 index 00000000..598d389a --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java @@ -0,0 +1,51 @@ +package com.ghy.payment.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author clunt + * 财务细单(可能是师傅分佣后的细单关联，也可能是分佣账单，平台提成账单等类型) + */ +@Data +public class FinancialDetail extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "编码") + private String code; + + @Excel(name = "子订单序号", cellType = Excel.ColumnType.NUMERIC) + private Long orderMasterId; + + @Excel(name = "子订单编码", cellType = Excel.ColumnType.NUMERIC) + private String orderMasterCode; + + @Excel(name = "子单总金额", cellType = Excel.ColumnType.STRING) + private BigDecimal totalMoney; + + @Excel(name = "优惠金额", cellType = Excel.ColumnType.STRING) + private BigDecimal discountMoney; + + @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING) + private BigDecimal payMoney; + + @Excel(name = "财务子单类型,师傅转派/多级分销/平台抽成", cellType = Excel.ColumnType.NUMERIC) + private Integer financialDetailType; + + @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + private Integer payType; + + @Excel(name = "支付状态, 未付款/已付款", cellType = Excel.ColumnType.NUMERIC) + private Integer payStatus; + + @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) + private String payTime; + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java new file mode 100644 index 00000000..728f8d0f --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java @@ -0,0 +1,45 @@ +package com.ghy.payment.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author clunt + * 财务单主单(对应付款) + */ +@Data +public class FinancialMaster extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC) + private Long id; + + @Excel(name = "主订单序号", cellType = Excel.ColumnType.NUMERIC) + private Long orderMasterId; + + @Excel(name = "主订单编码", cellType = Excel.ColumnType.NUMERIC) + private String orderMasterCode; + + @Excel(name = "整单总金额", cellType = Excel.ColumnType.STRING) + private BigDecimal totalMoney; + + @Excel(name = "优惠金额", cellType = Excel.ColumnType.STRING) + private BigDecimal discountMoney; + + @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING) + private BigDecimal payMoney; + + @Excel(name = "支付方式,微信/支付宝/线下", cellType = Excel.ColumnType.NUMERIC) + private Integer payType; + + @Excel(name = "支付状态, 未付款/已付款", cellType = Excel.ColumnType.NUMERIC) + private Integer payStatus; + + @Excel(name = "付款时间", cellType = Excel.ColumnType.STRING) + private String payTime; + +} diff --git a/ghy-payment/src/main/java/com/ghy/payment/package-info.java b/ghy-payment/src/main/java/com/ghy/payment/package-info.java new file mode 100644 index 00000000..c6c26132 --- /dev/null +++ b/ghy-payment/src/main/java/com/ghy/payment/package-info.java @@ -0,0 +1 @@ +package com.ghy.payment; \ No newline at end of file