1

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