Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -81,7 +81,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven
 			}
 
 			// 上面是真的转自送,支持美团,饿百,京东,如果时抖店,抖店暂时全部是自送的!但是有骑手信息时,就是一个白嫖单子!
-			if order.VendorID == model.VendorIDDD && courierName != "" && courierMobile != "" {
+			if order.VendorID == model.VendorIDDD && courierName != "" && courierMobile != "" && err == nil {
 				timeNow := time.Now()
 				rand.Seed(timeNow.UnixNano())
 				randNumber := rand.Int63n(640)

business/model/dao/store_sku.go

@@ -689,6 +689,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
+	globals.SugarLogger.Debugf("=====parma := %s", sql)
+	globals.SugarLogger.Debugf("=====parma := %s", utils.Format4Output(sqlParams, false))
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}