clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HH 2022-04-24 18:19:25 +08:00
parent eaa59ba9a1 63501afc6b
commit 51205df3c7
12 changed files with 269 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-admin/src/main/resources/static/css/login.css
View File

@ -16,7 +16,9 @@ body.signin {
} }
.signinpanel .logopanel { .signinpanel .logopanel {
float:none; float:none;
width:auto; /*width:auto;*/
width: 121px;
height: 75px;
padding:0; padding:0;
background:0 0 background:0 0
} }

BIN
ghy-admin/src/main/resources/static/ruoyi.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 52 KiB

20
ghy-admin/src/main/resources/templates/login.html
View File

@ -3,8 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<title>登录工圈子系统</title> <title>登录叮咚工链系统</title>
<meta name="description" content="工圈子后台管理框架"> <meta name="description" content="叮咚工链后台管理框架">
<link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/> <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/> <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
<link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/> <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>
@ -26,16 +26,16 @@
<div class="col-sm-7"> <div class="col-sm-7">
<div class="signin-info"> <div class="signin-info">
<div class="logopanel m-b"> <div class="logopanel m-b">
<h1><img alt="[ 工圈子 ]" src="../static/ruoyi.png" th:src="@{/ruoyi.png}"></h1> <h1>[ 叮咚工链 ]</h1>
</div> </div>
<div class="m-b"></div> <div class="m-b"></div>
<h4>欢迎使用 <strong>工圈子 后台管理系统</strong></h4> <h4>欢迎使用 <strong>叮咚工链 后台管理系统</strong></h4>
<ul class="m-b"> <ul class="m-b">
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li> <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 再多平方米</li>
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li> <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 不如我懂你</li>
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Shiro</li> <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 叮咚工链</li>
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li> <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 在你需要的时候</li>
<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li> <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 总在您身边</li>
</ul> </ul>
<strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong> <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>
</div> </div>
@ -65,7 +65,7 @@
</div> </div>
<div class="signup-footer"> <div class="signup-footer">
<div class="pull-left"> <div class="pull-left">
Copyright © 2018-2021 ruoyi.vip All Rights Reserved. <br> Copyright © 2018-2021 opsoul.com All Rights Reserved. <br>
</div> </div>
</div> </div>
</div> </div>

30
ghy-common/src/main/java/com/ghy/common/enums/FinancialDetailType.java Normal file
View File

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

53
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java Normal file
View File

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

15
ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java Normal file
View File

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

46
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java Normal file
View File

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

15
ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java Normal file
View File

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

13
ghy-payment/src/main/java/com/ghy/payment/PaymentApplication.java
View File

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

51
ghy-payment/src/main/java/com/ghy/payment/domain/FinancialDetail.java Normal file
View File

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

45
ghy-payment/src/main/java/com/ghy/payment/domain/FinancialMaster.java Normal file
View File

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

1
ghy-payment/src/main/java/com/ghy/payment/package-info.java Normal file
View File

@ -0,0 +1 @@
package com.ghy.payment;