diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 74b7e4cdb..2ef299d39 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,8 +4,6 @@ import ( "bytes" "context" "fmt" - "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" - "net" "regexp" "strings" "time" @@ -1986,14 +1984,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } //} - timeList := []string{ - "2021-05-01 00:00:00", - "2021-06-01 00:00:00", - "2021-07-01 00:00:00", - } - for _, v := range timeList { - orderman.FixedOrderManager.AmendMissingOrders(ctx, []int{model.VendorIDEBAI}, 667112, utils.Str2Time(v), utils.Str2Time(v).AddDate(0, 1, 0), true, true) - } return err } @@ -2001,19 +1991,6 @@ var ( textChan chan string ) -func connHandler(c net.Conn) { - fmt.Println("Please input data...") - go func() { - s := <-textChan - //写入数据 - n, err := c.Write([]byte(s)) - if err != nil { - fmt.Println("Write err:", err, n) - return - } - }() -} - func FreeBatchInfo2(name string, handler func(tasksch.ITask, []*jdapi.SkuIdEntity) (interface{}, int, error), ctx *jxcontext.Context, parentTask tasksch.ITask, storeSkuList []*jdapi.SkuIdEntity, batchSize int, isContinueWhenError bool) (resultList []interface{}, err error) { task := tasksch.NewParallelTask2(fmt.Sprintf("FreeBatchInfo:%s", name), tasksch.NewParallelConfig().SetParallelCount(1).SetBatchSize(batchSize).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, successCount int, err error) { diff --git a/business/partner/purchase/mtwm/order_afs.go b/business/partner/purchase/mtwm/order_afs.go index 30882bbba..77a6f85a5 100644 --- a/business/partner/purchase/mtwm/order_afs.go +++ b/business/partner/purchase/mtwm/order_afs.go @@ -138,6 +138,10 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma } } if afsOrder != nil { + //直接就来一个新的售后单,并且还是售后完成的 + if orderStatus.Status == model.AfsOrderStatusFinished { + afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt + } err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } } else {