danial/kami_boss
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🐛 修复构建错误

Browse Source
This commit is contained in:
sunxiaolong
2024-06-27 01:00:59 +08:00
parent 2eaebc68c5
commit b15292b90d
9 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@@ -7,7 +7,10 @@ pipeline {
script {
try {
echo 'Start Build'
sh "docker ps -a --format '{{.ID}} {{.Names}}' | awk '{if ($2 !~ /^1Panel-jenkins/) print $1}' | xargs -r docker stop"
sh 'docker compose -f docker-compose.yaml up -d --build'
sh 'docker start $(docker ps -a -q)'
sh "docker restart $(docker ps -a | grep kami_ | awk '{print $1}')"
echo 'Build success'
} catch (err) {
echo err.getMessage()

13
controllers/getController.go
View File

@@ -737,6 +737,7 @@ func (c *GetController) GetOrder() {
payWayCode := strings.TrimSpace(c.GetString("payWayCode"))
freeStatus := strings.TrimSpace(c.GetString("freeStatus"))
cardData := strings.TrimSpace(c.GetString("cardData"))
roadUid := strings.TrimSpace(c.GetString("roadUid"))
params := make(map[string]string)
params["create_time__gte"] = startTime
@@ -748,6 +749,7 @@ func (c *GetController) GetOrder() {
params["pay_product_code"] = supplierUid
params["pay_type_code"] = payWayCode
params["ex_value__icontains"] = cardData
params["road_uid"] = roadUid
switch freeStatus {
case "free":
params["free"] = "yes"
@@ -756,10 +758,8 @@ func (c *GetController) GetOrder() {
case "refund":
params["refund"] = "yes"
}
l := order.GetOrderLenByMap(params)
c.GetCutPage(l)
orderDataJSON := new(datas.OrderDataJSON)
orderDataJSON.DisplayCount = c.DisplayCount
orderDataJSON.Code = 200
@@ -810,8 +810,9 @@ func (c *GetController) GetOrderProfit() {
status := strings.TrimSpace(c.GetString("orderStatus"))
supplierUid := strings.TrimSpace(c.GetString("supplierUid"))
payWayCode := strings.TrimSpace(c.GetString("payWayCode"))
roadUid := strings.TrimSpace(c.GetString("roadUid"))
params := make(map[string]string)
params := make(map[string]interface{})
params["create_time__gte"] = startTime
params["create_time__lte"] = endTime
params["merchant_name__icontains"] = merchantName
@@ -820,6 +821,12 @@ func (c *GetController) GetOrderProfit() {
params["status"] = status
params["pay_product_code"] = supplierUid
params["pay_type_code"] = payWayCode
orderList := order.GetAllOrderByMap(map[string]string{"road_uid": roadUid})
orderIDList := make([]string, len(orderList))
for _, info := range orderList {
orderIDList = append(orderIDList, info.BankOrderId)
}
params["bank_order_id__in"] = orderIDList
l := order.GetOrderProfitLenByMap(params)
c.GetCutPage(l)

4
controllers/pageController.go
View File

@@ -120,6 +120,7 @@ func (c *PageAuthController) OrderSummary() {
}
c.Data["token"] = token
c.Data["portalHost"] = config.GetPortalHost()
c.Data["roadUid"] = c.GetString("roadUid")
c.TplName = "order_summary.html"
}
@@ -172,10 +173,13 @@ func (c *PageAuthController) SecondMenuPage() {
}
func (c *PageAuthController) OrderInfoPage() {
//从查询参数中获取商户uid
c.Data["roadUid"] = c.GetString("roadUid")
c.TplName = "order_info.html"
}
func (c *PageAuthController) OrderProfitPage() {
c.Data["roadUid"] = c.GetString("roadUid")
c.TplName = "order_profit.html"
}

18
models/order/order_info.go
View File

@@ -94,7 +94,25 @@ func GetOrderByMap(params map[string]string, display, offset int) []OrderInfo {
if err != nil {
logs.Error("get order by map fail: ", err)
}
return orderInfoList
}
func GetAllOrderByMap(params map[string]string) []OrderInfo {
o := orm.NewOrm()
var orderInfoList []OrderInfo
qs := o.QueryTable(ORDER_INFO)
for k, v := range params {
if k == "card_data" {
continue
}
if len(v) > 0 {
qs = qs.Filter(k, v)
}
}
_, err := qs.OrderBy("-create_time").All(&orderInfoList)
if err != nil {
logs.Error("get order by map fail: ", err)
}
return orderInfoList
}

18
models/order/order_profit_info.go
View File

@@ -80,11 +80,16 @@ func GetAllOrderProfit(params map[string]string) []OrderProfitInfo {
return orderProfit
}
func GetOrderProfitLenByMap(params map[string]string) int {
func GetOrderProfitLenByMap(params map[string]interface{}) int {
o := orm.NewOrm()
qs := o.QueryTable(ORDER_PROFIT_INFO)
for k, v := range params {
if len(v) > 0 {
switch v.(type) {
case string:
if len(v.(string)) > 0 {
qs = qs.Filter(k, v)
}
default:
qs = qs.Filter(k, v)
}
}
@@ -92,12 +97,17 @@ func GetOrderProfitLenByMap(params map[string]string) int {
return int(cnt)
}
func GetOrderProfitByMap(params map[string]string, display, offset int) []OrderProfitInfo {
func GetOrderProfitByMap(params map[string]interface{}, display, offset int) []OrderProfitInfo {
o := orm.NewOrm()
var orderProfitInfoList []OrderProfitInfo
qs := o.QueryTable(ORDER_PROFIT_INFO)
for k, v := range params {
if len(v) > 0 {
switch v.(type) {
case string:
if len(v.(string)) > 0 {
qs = qs.Filter(k, v)
}
default:
qs = qs.Filter(k, v)
}
}

23
views/index.html
View File

@@ -348,19 +348,34 @@
<div>
<a href="#" class="first-menu">
<span class="glyphicon glyphicon-book"></span>
<span class="first-title">订单管理({{RoadName}})</span>
<span class="first-title">订单管理({{.RoadName}})</span>
<span class="glyphicon glyphicon-plus last-glyphicon"></span>
</a>
<div class="second-menu">
<a href="#"
onclick='loadMainContent("/order_info.html?roadId={{{RoadUid}}")'><span>实时订单</span></a>
onclick='loadMainContent("/order_info.html?roadUid={{.RoadUid}}")'><span>实时订单</span></a>
<a href="#"
onclick='loadMainContent("/order_profit.html?roadId={{{RoadUid}}")'><span>订单收益</span></a>
onclick='loadMainContent("/order_profit.html?roadUid={{.RoadUid}}")'><span>订单收益</span></a>
<a href="#"
onclick='loadMainContent("/order-summary-info.html?roadId={{{RoadUid}}")'><span>订单汇总</span></a>
onclick='loadMainContent("/order-summary-info.html?roadUid={{.RoadUid}}")'><span>订单汇总</span></a>
</div>
</div>
{{end}}
<!-- <div>-->
<!-- <a href="#" class="first-menu">-->
<!-- <span class="glyphicon glyphicon-book"></span>-->
<!-- <span class="first-title">订单管理</span>-->
<!-- <span class="glyphicon glyphicon-plus last-glyphicon"></span>-->
<!-- </a>-->
<!-- <div class="second-menu">-->
<!-- <a href="#"-->
<!-- onclick='loadMainContent("/order_info.html?roadUid=")'><span>实时订单</span></a>-->
<!-- <a href="#"-->
<!-- onclick='loadMainContent("/order_profit.html?roadUid=")'><span>订单收益</span></a>-->
<!-- <a href="#"-->
<!-- onclick='loadMainContent("/order-summary-info.html?roadUid=")'><span>订单汇总</span></a>-->
<!-- </div>-->
<!-- </div>-->
<div>
<a href="#" class="first-menu">
<span class="glyphicon glyphicon-piggy-bank"></span>

3
views/order_info.html
View File

@@ -767,8 +767,8 @@
}
});
}
function AjaxOrderList(dataJSON) {
dataJSON["roadUid"] = "{{.roadUid}}"
$.ajax({
url: "/get/order",
data: dataJSON,
@@ -791,7 +791,6 @@
let dataJSON = getOrderSearchValues();
AjaxOrderList(dataJSON);
});
//点击上一页的按钮
$(".pre_page").click(function () {
let dataJSON = getOrderSearchValues();

2
views/order_profit.html
View File

@@ -152,7 +152,6 @@
<option value="100">100</option>
</select>
</li>
<li class="current_total_page">第<span class="current_page">0</span>/<span class="total_page">0</span>页</li>
<li class="pre_page">上一页</li>
<li class="next_page">下一页</li>
@@ -233,6 +232,7 @@
}
function AjaxOrderProfitList(dataJSON) {
dataJSON["roadUid"] = "{{.roadUid}}"
$.ajax({
url: "/get/orderProfit",
data: dataJSON,

2
views/order_summary.html
View File

@@ -12,7 +12,7 @@
</style>
<script>
// 构建链接
const url = "{{.portalHost}}" + "/iframe/orderSummary?token={{.token}}";
const url = "{{.portalHost}}" + "/iframe/orderSummary?roadUid={{.roadUid}}&token={{.token}}";
// 链接添加至到iframe中
document.getElementsByTagName("iframe")[0].src = url;
</script>