From 6c55460ddb9a2dd2e94be6d20a25609be988f2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 29 Mar 2023 14:07:45 +0800 Subject: [PATCH] 1 --- business/partner/purchase/jx/localjx/order.go | 10 ++-------- controllers/jx_order2.go | 7 ++----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 5c7597ff4..f0d5fb8a0 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -228,13 +228,10 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta //fromStoreID 在后面 generateOrder中有用 //IsAuto 是否是守价结算而自动创建的守价订单 func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool, couponIDs []int) (outJxOrder *JxOrderInfo, err error) { - globals.SugarLogger.Debugf("CreateOrder jxOrder %s", utils.Format4Output(jxOrder, false)) outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf, couponIDs) if err != nil { return nil, err } - globals.SugarLogger.Debugf("outJxOrder outJxOrder %s", utils.Format4Output(outJxOrder, false)) - globals.SugarLogger.Debugf("deliveryAddress deliveryAddress %s", utils.Format4Output(deliveryAddress, false)) if jxOrder.OrderType == model.OrderTypeMatter { checkMatterDeliveryAddress(deliveryAddress) @@ -245,10 +242,6 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) return outJxOrder, err } - //discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) - //if err != nil { - // return nil, err - //} if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES { return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") @@ -322,6 +315,7 @@ func Pay4Order(ctx *jxcontext.Context, orderID int64, payType int, vendorPayType db = dao.GetDB() ) order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDJX) + globals.SugarLogger.Debugf("goodsorder := %s", utils.Format4Output(order, false)) if err == nil { switch payType { case model.PayTypeWX: @@ -845,7 +839,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 if jxOrder.OrderType != model.OrderTypeMatter || (jxOrder.OrderType == model.OrderTypeMatter && fromStoreID == -1) { outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice - } else { //以下else为物料订单袋子金额和数量处理 + } else { //以下else为物料订单袋子金额和数量处理 if !result.Flag { //只要flag是false就按原价申请，是true再按订单量 outJxOrder.Skus = append(outJxOrder.Skus, jxSku) outJxOrder.OrderPrice += int64(jxSku.Count) * jxSku.SalePrice diff --git a/controllers/jx_order2.go b/controllers/jx_order2.go index e7394736c..b8f1220c1 100644 --- a/controllers/jx_order2.go +++ b/controllers/jx_order2.go @@ -7,8 +7,8 @@ import ( "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx" - "git.rosy.net.cn/jx-callback/globals" "github.com/astaxie/beego/server/web" + "time" ) type JxOrderController struct { @@ -103,17 +103,14 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() { UserID: params.Ctx.GetUserID(), } outJxOrder, err := localjx.CreateOrder(params.Ctx, jxOrder, int64(142), 1, 0, true, nil) - globals.SugarLogger.Debugf("outJxOrder := %s", utils.Format4Output(outJxOrder, false)) if err != nil { - globals.SugarLogger.Debugf(" localjx.CreateOrder err := %s", utils.Format4Output(err, false)) return nil, "", err } if outJxOrder.OrderID == 0 { return nil, "", errors.New("orderId 不能为空") } + time.Sleep(200 * time.Millisecond) retVal, err := localjx.Pay4Order(params.Ctx, outJxOrder.OrderID, params.PayType, params.VendorPayType, params.SubAppID) - globals.SugarLogger.Debugf("retVal :=========%s", utils.Format4Output(retVal, false)) - globals.SugarLogger.Debugf("errrrr :=========%s", utils.Format4Output(err, false)) return retVal, "", err }) }