作者 yangfu

Merge branch 'feature_order_number' into test

apiVersion: v1
kind: Service
metadata:
name: allied-creation-gateway
namespace: mmm-suplus-prd
labels:
k8s-app: allied-creation-gateway
spec:
ports:
- name: "http"
port: 80
targetPort: 8082
- name: "https"
port: 443
targetPort: 443
selector:
k8s-app: allied-creation-gateway
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: allied-creation-gateway
namespace: mmm-suplus-prd
labels:
k8s-app: allied-creation-gateway
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: allied-creation-gateway
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- cn-hangzhou.i-bp1djh1xn7taumbue1ze
- cn-hangzhou.i-bp1djh1xn7taumbue1zd
- cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
- cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
containers:
- name: allied-creation-gateway
image: 192.168.0.243:5000/mmm/allied-creation-gateway:master
imagePullPolicy: Always
ports:
- containerPort: 8082
- containerPort: 443
volumeMounts:
- mountPath: /opt/logs
name: accesslogs
env:
- name: POSTGRESQL_DB_NAME
valueFrom:
configMapKeyRef:
name: suplus-config
key: postgresqlalliedcreation.dbname
- name: POSTGRESQL_USER
valueFrom:
configMapKeyRef:
name: suplus-config
key: postgresql.user
- name: POSTGRESQL_PASSWORD
valueFrom:
configMapKeyRef:
name: suplus-config
key: postgresql.password
- name: POSTGRESQL_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: postgresql.host
- name: POSTGRESQL_PORT
valueFrom:
configMapKeyRef:
name: suplus-config
key: postgresql.port
- name: REDIS_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: redis.ip
- name: REDIS_PORT
valueFrom:
configMapKeyRef:
name: suplus-config
key: redis.port
- name: REDIS_AUTH
value: ""
- name: LOG_LEVEL
value: "debug"
- name: LOG_FRAMEWORK
value: "beego"
- name: LOG_TYPE
value: "file"
- name: ERROR_BASE_CODE
value: "1"
- name: ERROR_BASE_CODE_MULTIPLE
value: "1000"
- name: ENABLE_KAFKA_LOG
value: "false"
- name: HTTP_PORT
value: "8082"
- name: ALLIED_CREATION_USER_HOST
value: "https://allied-creation-user-prd.fjmaimaimai.com"
- name: ALLIED_CREATION_COOPERATION_HOST
value: "https://allied-creation-cooperation-prd.fjmaimaimai.com"
- name: ALLIED_CREATION_BASIC_HOST
value: "https://allied-creation-basic-prd.fjmaimaimai.com"
- name: SMS_SERVE_HOST
value: "https://sms.fjmaimaimai.com:9897"
# - name: REDIS_HOST
# valueFrom:
# configMapKeyRef:
# name: suplus-config
# key: redis.ip
# - name: REDIS_PORT
# valueFrom:
# configMapKeyRef:
# name: suplus-config
# key: redis.port
volumes:
- name: accesslogs
emptyDir: {}
... ...
#!/bin/bash
export PATH=/root/local/bin:$PATH
kubectl -n mmm-suplus-prd get pods | grep -q allied-creation-gateway
if [ "$?" == "1" ];then
kubectl create -f /tmp/prd/allied-creation-gateway/allied-creation-gateway.yaml --record
kubectl -n mmm-suplus-prd get svc | grep -q allied-creation-gateway
if [ "$?" == "0" ];then
echo "allied-creation-gateway service install success!"
else
echo "allied-creation-gateway service install fail!"
fi
kubectl -n mmm-suplus-prd get pods | grep -q allied-creation-gateway
if [ "$?" == "0" ];then
echo "allied-creation-gateway deployment install success!"
else
echo "allied-creation-gateway deployment install fail!"
fi
else
kubectl delete -f /tmp/prd/allied-creation-gateway/allied-creation-gateway.yaml
kubectl -n mmm-suplus-prd get svc | grep -q allied-creation-gateway
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-prd get svc | grep -q allied-creation-gateway
done
kubectl -n mmm-suplus-prd get pods | grep -q allied-creation-gateway
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-prd get pods | grep -q allied-creation-gateway
done
kubectl create -f /tmp/prd/allied-creation-gateway/allied-creation-gateway.yaml --record
kubectl -n mmm-suplus-prd get svc | grep -q allied-creation-gateway
if [ "$?" == "0" ];then
echo "allied-creation-gateway service update success!"
else
echo "allied-creation-gateway service update fail!"
fi
kubectl -n mmm-suplus-prd get pods | grep -q allied-creation-gateway
if [ "$?" == "0" ];then
echo "allied-creation-gateway deployment update success!"
else
echo "allied-creation-gateway deployment update fail!"
fi
fi
\ No newline at end of file
... ...
... ... @@ -12,6 +12,7 @@ type SearchDividendsEstimateQuery struct {
Operator domain.Operator `json:"-"`
// 承接人分红预算单号
DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"`
OrderOrReturnedOrderNum string `json:"orderOrReturnedOrderNum"` // 分红订单号或退货单号
// 分红类型,1订单分红,2退货冲销,3金额激励
DividendsType int `json:"dividendsType"`
PageNumber int `json:"pageNumber"`
... ...
... ... @@ -75,6 +75,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
searchDividendsEstimateQuery.Operator)
result, err := creationCooperationGateway.DividendsEstimatesSearch(allied_creation_cooperation.ReqDividendsEstimateSearch{
DividendsEstimateOrderNumber: searchDividendsEstimateQuery.DividendsEstimateOrderNumber, //承接人分红预算单号
OrderOrReturnedOrderNum: searchDividendsEstimateQuery.OrderOrReturnedOrderNum,
DividendsType: searchDividendsEstimateQuery.DividendsType, //分红类型,1订单分红,2退货冲销,3金额激励
PageNumber: searchDividendsEstimateQuery.PageNumber,
PageSize: searchDividendsEstimateQuery.PageSize,
... ...
... ... @@ -11,6 +11,8 @@ type SearchDividendsOrderQuery struct {
DividendsOrderNumber string `json:"dividendsOrderNumber,omitempty"`
// 客户名称
CustomerName string `json:"customerName,omitempty"`
// 来源单号
DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"`
// 页码
PageNumber int `json:"pageNumber"`
// 每页限制
... ...
... ... @@ -87,6 +87,7 @@ func (dividendsOrderService *DividendsOrderService) SearchDividendsOrder(searchD
PageSize: searchDividendsOrderQuery.PageSize,
CustomerName: searchDividendsOrderQuery.CustomerName,
DividendsOrderNumber: searchDividendsOrderQuery.DividendsOrderNumber,
DividendsOriginalOrderNum: searchDividendsOrderQuery.DividendsOriginalOrderNum,
OrgIds: searchDividendsOrderQuery.Operator.OrgIds,
CompanyId: int(searchDividendsOrderQuery.Operator.CompanyId),
})
... ...
... ... @@ -11,6 +11,7 @@ type SearchDividendsReturnedOrderQuery struct {
DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName,omitempty"`
// 分红退货单号
DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber,omitempty"`
OriginalOrderNum string `json:"originalOrderNum"` //源单号(原始订单号)
// 查询偏离量
PageNumber int `json:"pageNumber"`
// 每页
... ...
... ... @@ -80,6 +80,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
PageSize: searchDividendsReturnedOrderQuery.PageSize,
DividendsReturnedOrderNumber: searchDividendsReturnedOrderQuery.DividendsReturnedOrderNumber,
DividendsReturnedCustomerName: searchDividendsReturnedOrderQuery.DividendsReturnedCustomerName,
OriginalOrderNum: searchDividendsReturnedOrderQuery.OriginalOrderNum,
OrgIds: searchDividendsReturnedOrderQuery.Operator.OrgIds,
})
if err != nil {
... ...
... ... @@ -42,6 +42,7 @@ type (
ReqDividendsEstimateSearch struct {
DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号
CooperationContractNumber string `json:"orderOrReturnedOrderNum"` //合约编号
OrderOrReturnedOrderNum string `json:"matchOrderOrReturnedOrderNum"` // 分红订单号或退货单号
DividendsType int `json:"dividendsType"` //分红类型,1订单分红,2退货冲销,3金额激励
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
... ...
... ... @@ -127,6 +127,7 @@ type (
CompanyId int `json:"companyId"`
CustomerName string `json:"customerName"`
DividendsOrderNumber string `json:"dividendsOrderNumber"`
DividendsOriginalOrderNum string `json:"dividendsOriginalOrderNum"`
OrgId int64 `json:"orgId"`
OrgIds []int64 `json:"orgIds"`
PageNumber int `json:"pageNumber"`
... ...
... ... @@ -101,6 +101,7 @@ type (
OrgId int `json:"orgId"`
PageNumber int `json:"pageNumber"`
PageSize int `json:"pageSize"`
OriginalOrderNum string `json:"originalOrderNum"` //源单号(原始订单号)
DividendsReturnedOrderNumber string `json:"dividendsReturnedOrderNumber"`
DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
UserId int `json:"userId"`
... ...