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-08-27 09:37:26 +08:00
parent b998721f1d
commit 635b84049c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,16 +228,17 @@ func GetMyOrderCountInfo(ctx *jxcontext.Context, fromDate, toDate time.Time, sta
//fromStoreID 为 门店ID ，表示是物料订单，fromStoreID表示是哪个门店申请的物料,或者进货方门店 //fromStoreID 为 门店ID ，表示是物料订单，fromStoreID表示是哪个门店申请的物料,或者进货方门店
//fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的 //fromStoreID 为-1 表示也是物料订单，但是不是门店申请，是个人申请的
//fromStoreID 在后面 generateOrder中有用 //fromStoreID 在后面 generateOrder中有用
func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf bool) (outJxOrder *JxOrderInfo, err error) { //IsAuto 是否是守价结算而自动创建的守价订单
func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, createType int, fromStoreID int, IsDeliverySelf, IsAuto bool) (outJxOrder *JxOrderInfo, err error) {
outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf) outJxOrder, deliveryAddress, err := generateOrder(ctx, jxOrder, addressID, fromStoreID, "", IsDeliverySelf)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if fromStoreID != 0 { if jxOrder.OrderType == model.OrderTypeMatter {
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
} }
if createType == OrderCreateTypeNormal { if createType == OrderCreateTypeNormal {
if jxOrder.OrderType == model.OrderTypeDefendPrice { if jxOrder.OrderType == model.OrderTypeDefendPrice && !IsAuto {
vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID) vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)
outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
return outJxOrder, err return outJxOrder, err
@@ -1952,12 +1953,10 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
) )
globals.SugarLogger.Debugf("CreateOrderByPriceDefend Begin:") globals.SugarLogger.Debugf("CreateOrderByPriceDefend Begin:")
priceDefends, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) priceDefends, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
fmt.Println("test1111111111111111111111111111111111", utils.Format4Output(priceDefends, false))
if len(priceDefends) > 0 { if len(priceDefends) > 0 {
for _, v := range priceDefends { for _, v := range priceDefends {
userOrderMap[v.AddressID] = append(userOrderMap[v.AddressID], v) userOrderMap[v.AddressID] = append(userOrderMap[v.AddressID], v)
} }
fmt.Println("test22222222222222222222222", utils.Format4Output(userOrderMap, false))
for kk, vv := range userOrderMap { for kk, vv := range userOrderMap {
if len(vv) == 1 { if len(vv) == 1 {
jxOrder := &JxOrderInfo{ jxOrder := &JxOrderInfo{
@@ -1972,7 +1971,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
IsPriceDefend: model.YES, IsPriceDefend: model.YES,
OrderID: utils.Str2Int64(vv[0].VendorOrderID), OrderID: utils.Str2Int64(vv[0].VendorOrderID),
} }
if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil { if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil {
err = SettleDiscountActByPriceDefend(ctx, vv[0], false) err = SettleDiscountActByPriceDefend(ctx, vv[0], false)
} }
} else { } else {
@@ -1997,7 +1996,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
} }
jxOrder.Skus = skus jxOrder.Skus = skus
jxOrder.OrderID2 = strings.Join(orderIDs, ",") jxOrder.OrderID2 = strings.Join(orderIDs, ",")
if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false); err == nil { if _, err := CreateOrder(ctx, jxOrder, kk, OrderCreateTypeNormal, 0, false, true); err == nil {
} }
} }
} }

2
controllers/jx_order2.go
View File

@@ -26,7 +26,7 @@ func (c *JxOrderController) CreateOrder() {
c.callCreateOrder(func(params *tJxorderCreateOrderParams) (retVal interface{}, errCode string, err error) { c.callCreateOrder(func(params *tJxorderCreateOrderParams) (retVal interface{}, errCode string, err error) {
var jxOrder *localjx.JxOrderInfo var jxOrder *localjx.JxOrderInfo
if err = utils.UnmarshalUseNumber([]byte(params.JxOrder), &jxOrder); err == nil { if err = utils.UnmarshalUseNumber([]byte(params.JxOrder), &jxOrder); err == nil {
retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf) retVal, err = localjx.CreateOrder(params.Ctx, jxOrder, int64(params.AddressID), params.CreateType, params.FromStoreID, params.IsDeliverySelf, false)
} }
return retVal, "", err return retVal, "", err
}) })