liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料订单取消一周买一次的限制，改为优惠价

Browse Source
This commit is contained in:
苏尹岚
2020-04-10 09:05:36 +08:00
parent c635fcef85
commit 7680508cab
2 changed files with 78 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/partner/purchase/jx/localjx/order.go
View File

@@ -552,7 +552,11 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
} else { //以下else为物料订单袋子金额和数量处理 } else { //以下else为物料订单袋子金额和数量处理
if result.Count == 0 && result.Flag { //这个条件被认为是新店，袋子限量 if !result.Flag { //只要flag是false就按原价申请，是true再按订单量
outJxOrder.Skus = append(outJxOrder.Skus, jxSku)
outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice
} else {
if result.Count == 0 { //这个条件被认为是新店，袋子限量
if bagMap[jxSku.SkuID] != 0 { //如果他买了袋子，第一个袋子算1分钱，其余按原价（包括所有袋子） if bagMap[jxSku.SkuID] != 0 { //如果他买了袋子，第一个袋子算1分钱，其余按原价（包括所有袋子）
if !flag { if !flag {
salePirce := jxSku.SalePrice salePirce := jxSku.SalePrice
@@ -637,6 +641,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
} }
} }
}
outJxOrder.Weight += jxSku.Count * jxSku.Weight outJxOrder.Weight += jxSku.Count * jxSku.Weight
} }
} }

14
business/partner/purchase/jx/localjx/tonglianpay.go
View File

@@ -2,7 +2,6 @@ package localjx
import ( import (
"encoding/json" "encoding/json"
"fmt"
"strings" "strings"
"time" "time"
@@ -12,7 +11,6 @@ import (
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin" "git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
@@ -21,12 +19,12 @@ import (
) )
func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayType string) (orderPay *model.OrderPay, err error) { func pay4OrderByTL(ctx *jxcontext.Context, order *model.GoodsOrder, vendorPayType string) (orderPay *model.OrderPay, err error) {
if order.FromStoreID != 0 { // if order.FromStoreID != 0 {
result, _ := orderman.GetMatterStoreOrderCount(nil, order.FromStoreID) // result, _ := orderman.GetMatterStoreOrderCount(nil, order.FromStoreID)
if !result.Flag { // if !result.Flag {
return nil, fmt.Errorf("该门店[%v]已在一周内申请过物料，请勿重复申请！", order.FromStoreID) // return nil, fmt.Errorf("该门店[%v]已在一周内申请过物料，请勿重复申请！", order.FromStoreID)
} // }
} // }
payCreatedAt := time.Now() payCreatedAt := time.Now()
param := &tonglianpayapi.CreateUnitorderOrderParam{ param := &tonglianpayapi.CreateUnitorderOrderParam{
Trxamt: int(order.ActualPayPrice), Trxamt: int(order.ActualPayPrice),