切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
5 years ago
提交
164959b4ee88fc29b19f074ed3ec01119728e7b8
1 个父辈
29098f16
master
...
dev
feature/multi-miniprogram
master20210315
master20210622
sample01
test
v0.8.0-dev
0.9.2
0.9.1
0.9.0
0.8.0
0.7.0
0.6.0
0.5.0
0.5.0-1
0.4.0
0.3.0
0.3.0-1
0.2.0
更新配置
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
36 行增加
和
31 行删除
deploy/k8s/test/install.sh
deploy/k8s/test/partner.yaml
pkg/application/order/command/create_order.go
pkg/application/order/command/update_order_real.go
pkg/port/beego/controllers/order_controller.go
deploy/k8s/test/install.sh
查看文件 @
164959b
#!/bin/bash
export
PATH
=
/root/local/bin:
$PATH
kubectl -n mmm-suplus-test get pods | grep -q
partner
kubectl -n mmm-suplus-test get pods | grep -q
mmm-partnermg
if
[
"
$?
"
==
"1"
]
;
then
kubectl create -f /tmp/test/partner/partner.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q partner
kubectl create -f /tmp/test/partnermg/partner.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
if
[
"
$?
"
==
"0"
]
;
then
echo
"partner service install success!"
else
echo
"partner service install fail!"
fi
kubectl -n mmm-suplus-test get pods | grep -q
partner
kubectl -n mmm-suplus-test get pods | grep -q
mmm-partnermg
if
[
"
$?
"
==
"0"
]
;
then
echo
"partner deployment install success!"
else
echo
"partner deployment install fail!"
fi
else
kubectl delete -f /tmp/test/partner/partner.yaml
kubectl -n mmm-suplus-test get svc | grep -q partner
kubectl delete -f /tmp/test/partnermg/partner.yaml
kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
while
[
"
$?
"
==
"0"
]
do
kubectl -n mmm-suplus-test get svc | grep -q pa
rtner
kubectl -n mmm-suplus-test get svc | grep -q pa
mmm-partnermg
done
kubectl -n mmm-suplus-test get pods | grep -q
partner
kubectl -n mmm-suplus-test get pods | grep -q
mmm-partnermg
while
[
"
$?
"
==
"0"
]
do
kubectl -n mmm-suplus-test get pods | grep -q
partner
kubectl -n mmm-suplus-test get pods | grep -q
mmm-partnermg
done
kubectl create -f /tmp/test/partner/partner.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q partner
kubectl create -f /tmp/test/partnermg/partner.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q mmm-partnermg
if
[
"
$?
"
==
"0"
]
;
then
echo
"partner service update success!"
else
echo
"partner service update fail!"
fi
kubectl -n mmm-suplus-test get pods | grep -q
partner
kubectl -n mmm-suplus-test get pods | grep -q
mmm-partnermg
if
[
"
$?
"
==
"0"
]
;
then
echo
"partner deployment update success!"
else
...
...
deploy/k8s/test/partner.yaml
查看文件 @
164959b
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
partner
name
:
mmm-partnermg
namespace
:
mmm-suplus-test
labels
:
k8s-app
:
partner
k8s-app
:
mmm-partnermg
spec
:
ports
:
-
name
:
"
http"
port
:
80
targetPort
:
8082
selector
:
k8s-app
:
partner
k8s-app
:
mmm-partnermg
---
apiVersion
:
extensions/v1beta1
kind
:
Deployment
metadata
:
name
:
partner
name
:
mmm-partnermg
namespace
:
mmm-suplus-test
labels
:
k8s-app
:
partner
k8s-app
:
mmm-partnermg
spec
:
replicas
:
1
template
:
metadata
:
labels
:
k8s-app
:
partner
k8s-app
:
mmm-partnermg
spec
:
affinity
:
nodeAffinity
:
...
...
@@ -43,8 +43,8 @@ spec:
-
cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
-
cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
containers
:
-
name
:
partner
image
:
192.168.0.243:5000/mmm/partner:test
-
name
:
mmm-partnermg
image
:
192.168.0.243:5000/mmm/partnermg:test
imagePullPolicy
:
Always
ports
:
-
containerPort
:
8082
...
...
@@ -64,14 +64,6 @@ spec:
value
:
"
15432"
-
name
:
LOG_LEVEL
value
:
"
debug"
-
name
:
ERROR_BASE_CODE
value
:
"
1"
-
name
:
ERROR_BASE_CODE_MULTIPLE
value
:
"
1000"
-
name
:
ABILITY_SERVICE_HOST
value
:
"
https://suplus-worth-app-gateway-test.fjmaimaimai.com"
-
name
:
MMM_OPEN_API_SERVICE_HOST
value
:
"
http://mmm-open-api-test.fjmaimaimai.com"
volumes
:
-
name
:
accesslogs
emptyDir
:
{}
\ No newline at end of file
emptyDir
:
{}
...
...
pkg/application/order/command/create_order.go
查看文件 @
164959b
...
...
@@ -51,8 +51,14 @@ func (command CreateOrderCommand) ValidateCommand() error {
if
len
(
command
.
OrderRegion
)
==
0
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单区域必填"
)
}
if
!
(
command
.
OrderType
==
domain
.
OrderReal
||
command
.
OrderType
==
domain
.
OrderIntention
)
{
if
!
(
command
.
OrderType
==
domain
.
OrderReal
||
command
.
OrderType
==
domain
.
OrderIntention
)
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单类型错误"
)
}
if
!
(
command
.
OrderStatus
==
domain
.
OrderStatusDeliverSome
||
command
.
OrderStatus
==
domain
.
OrderStatusDeliverAll
||
command
.
OrderStatus
==
domain
.
OrderStatusReserve
)
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单状态设置错误"
)
}
return
nil
}
...
...
pkg/application/order/command/update_order_real.go
查看文件 @
164959b
...
...
@@ -48,7 +48,8 @@ func (command UpdateOrderRealCommand) ValidateCommand() error {
if
len
(
command
.
OrderRegion
)
==
0
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单区域必填"
)
}
if
!
(
command
.
OrderStatus
==
domain
.
OrderStatusDeliverSome
||
command
.
OrderStatus
==
domain
.
OrderStatusDeliverAll
)
{
if
!
(
command
.
OrderStatus
==
domain
.
OrderStatusDeliverSome
||
command
.
OrderStatus
==
domain
.
OrderStatusDeliverAll
)
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单状态设置错误"
)
}
return
nil
...
...
pkg/port/beego/controllers/order_controller.go
查看文件 @
164959b
...
...
@@ -4,6 +4,8 @@ import (
"errors"
"strconv"
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/lib"
"github.com/astaxie/beego/logs"
orderCmd
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/command"
orderQuery
"gitlab.fjmaimaimai.com/mmm-go/partnermg/pkg/application/order/query"
...
...
@@ -436,6 +438,10 @@ func (c *OrderController) UpdateOrderReal() {
//addOrderReal 添加实发订单
func
(
c
*
OrderController
)
addOrderReal
(
param
orderDetail
)
error
{
orderSrv
:=
orderService
.
NewOrderService
(
nil
)
if
!
(
param
.
OrderStatue
==
domain
.
OrderStatusDeliverAll
||
param
.
OrderStatue
==
domain
.
OrderStatusDeliverSome
)
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"订单状态错误"
)
}
Createcmd
:=
orderCmd
.
CreateOrderCommand
{
//订单区域
OrderRegion
:
param
.
OrderDist
,
...
...
请
注册
或
登录
后发表评论