From 3d72db5318f86f3620d4ac22d0f53309bd0d3c85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Wed, 29 Mar 2023 13:47:27 +0800
Subject: [PATCH] 1

---
 business/partner/purchase/jx/localjx/order.go |  9 ++++++++-
 controllers/jx_order2.go                      | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index e72ce6fd2..5c7597ff4 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -3,6 +3,7 @@ package localjx
 import (
 	"errors"
 	"fmt"
+	"git.rosy.net.cn/jx-callback/globals"
 	"math"
 	"regexp"
 	"strings"
@@ -227,10 +228,14 @@ 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)
 	}
@@ -254,6 +259,8 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
 			outJxOrder.OrderID = jxutils.GenOrderNo()
 		}
 		order, err2 := jxOrder2GoodsOrder(ctx, outJxOrder, deliveryAddress, "", IsDeliverySelf, couponIDs)
+		globals.SugarLogger.Debugf("order  order %s", utils.Format4Output(order, false))
+
 		if err = err2; err == nil {
 			order.AddressID = addressID
 			if jxOrder.IsPriceDefend == model.YES {
@@ -838,7 +845,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 30f5fcc02..e7394736c 100644
--- a/controllers/jx_order2.go
+++ b/controllers/jx_order2.go
@@ -1,11 +1,13 @@
 package controllers
 
 import (
+	"errors"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"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"
 )
 
@@ -89,7 +91,7 @@ func (c *JxOrderController) Pay4StoreMyselfDeliverOrder() {
 			FreightPrice:               0,
 			OrderPrice:                 int64(params.PayMoney),
 			ActualPayPrice:             int64(params.PayMoney),
-			OrderID:                    0,
+			OrderID:                    jxutils.GenOrderNo(),
 			StoreName:                  orderDetail.Name,
 			Weight:                     500,
 			FromStoreID:                0,
@@ -101,11 +103,17 @@ 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 不能为空")
+		}
 		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
 	})
 }