Merge branch 'develop' into production
# Conflicts: # views/gen_link.html
This commit is contained in:
danial
20
.drone.yml
20
.drone.yml
@@ -19,27 +19,23 @@ steps:
|
||||
from_secret: docker_login
|
||||
DOCKER_TOKEN:
|
||||
from_secret: docker_token
|
||||
DOCKER_PASSWORD:
|
||||
from_secret: docker_password
|
||||
commands:
|
||||
- docker login git.kkknametrans.buzz -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
- docker build -t git.kkknametrans.buzz/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
|
||||
- docker tag git.kkknametrans.buzz/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.kkknametrans.buzz/danial/kami_merchant_${DRONE_BRANCH}:latest
|
||||
- docker push git.kkknametrans.buzz/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
||||
- docker push git.kkknametrans.buzz/danial/kami_merchant_${DRONE_BRANCH}:latest
|
||||
- docker logout git.kkknametrans.buzz
|
||||
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
- docker build -t git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
|
||||
- docker tag git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:latest
|
||||
- docker push git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
||||
- docker push git.oceanpay.cc/danial/kami_merchant_${DRONE_BRANCH}:latest
|
||||
- docker logout git.oceanpay.cc
|
||||
- name: deploy to docker compose
|
||||
environment:
|
||||
DOCKER_LOGIN:
|
||||
from_secret: docker_login
|
||||
DOCKER_TOKEN:
|
||||
from_secret: docker_token
|
||||
DOCKER_PASSWORD:
|
||||
from_secret: docker_password
|
||||
commands:
|
||||
- docker login git.kkknametrans.buzz -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
||||
- BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile merchant up -d
|
||||
- docker logout git.kkknametrans.buzz
|
||||
- docker logout git.oceanpay.cc
|
||||
|
||||
trigger:
|
||||
branch:
|
||||
|
||||
@@ -77,6 +77,7 @@ func (c *GenLink) UploadFile() {
|
||||
defer file.Close()
|
||||
|
||||
roadCode := c.GetString("mm-select-road")
|
||||
mmValue := c.GetString("mm-road-select")
|
||||
|
||||
us := c.GetSession(enum.UserSession)
|
||||
u := us.(merchant.MerchantInfo)
|
||||
@@ -103,23 +104,23 @@ func (c *GenLink) UploadFile() {
|
||||
|
||||
slice.ForEachConcurrent(lines, func(i int, line string) {
|
||||
i += 1
|
||||
parts := strings.Split(line, "--")
|
||||
if len(parts) < 3 {
|
||||
parts := strings.Split(line, "\t")
|
||||
if len(parts) < 2 {
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("A%d", i+1), "上传卡数据错误")
|
||||
logs.Error("卡密数据错误", line)
|
||||
return
|
||||
}
|
||||
price := strutil.Trim(parts[0])
|
||||
cardNo := strutil.Trim(parts[1])
|
||||
cardPasswd := strutil.Trim(parts[2])
|
||||
//price := strutil.Trim(parts[0])
|
||||
cardNo := strutil.Trim(parts[0])
|
||||
cardPasswd := strutil.Trim(parts[1])
|
||||
|
||||
orderNo := xid.New().String() + "-" + fmt.Sprintf("%04d", i)
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("A%d", i+1), orderNo)
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("B%d", i+1), price)
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("B%d", i+1), mmValue)
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("C%d", i+1), cardNo)
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("D%d", i+1), cardPasswd)
|
||||
|
||||
_, err = strconv.ParseFloat(price, 64)
|
||||
_, err = strconv.ParseFloat(mmValue, 64)
|
||||
if err != nil {
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("E%d", i+1), "价格转换失败")
|
||||
logs.Info("价格转换失败", err)
|
||||
@@ -131,8 +132,8 @@ func (c *GenLink) UploadFile() {
|
||||
"cardNo": cardNo,
|
||||
}
|
||||
|
||||
marshal, err := json.Marshal(&pp)
|
||||
if err != nil {
|
||||
marshal, err2 := json.Marshal(&pp)
|
||||
if err2 != nil {
|
||||
_ = excelFile.SetCellValue("Sheet1", fmt.Sprintf("E%d", i+1), "卡密数据解析错误")
|
||||
logs.Error("卡密数据解析错误", err)
|
||||
return
|
||||
@@ -141,7 +142,7 @@ func (c *GenLink) UploadFile() {
|
||||
err = service.SubmitOrderBackendTask(c.Ctx.Request.Context(), &order.SubmitOrder{
|
||||
PayKey: u.MerchantKey,
|
||||
OrderNo: orderNo,
|
||||
OrderPrice: price,
|
||||
OrderPrice: mmValue,
|
||||
OrderPeriod: 24,
|
||||
NotifyUrl: "http://kami_shop:12305/shop/notify",
|
||||
ProductCode: roadCode,
|
||||
|
||||
@@ -81,10 +81,6 @@
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="row bg-white">
|
||||
<div class="col-3 mm-select-label">
|
||||
<label>
|
||||
面值选择：
|
||||
@@ -100,6 +96,8 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-fluid">
|
||||
<div class="iframe-link row" style="text-align: center">
|
||||
<input hidden value="{{.payLink}}" id="payLink">
|
||||
<iframe src="" frameborder="0" class="mm-iframe"
|
||||
@@ -201,8 +199,10 @@
|
||||
if (res.code !== 0) {
|
||||
alert(res.msg)
|
||||
} else {
|
||||
globalSelectedValue = res.data;
|
||||
$("#mm-road-select").empty();
|
||||
for (let i = 0; i < res.data.length; i++) {
|
||||
$('#mm-road-select').append(`<option value="${res.data[i].productCode}">${res.data[i].roadName}</option>`)
|
||||
$("#mm-road-select").append(`<option value="${res.data[i].showLabel}">${res.data[i].showLabel}</option>`)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user