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

business/jxcallback/scheduler/defsch/defsch.go

@@ -1133,13 +1133,13 @@ func (s *DefScheduler) resetTimer(savedOrderInfo *WatchOrderInfo, bill *model.Wa
 			if timeout == 0 {
 				config.CallTimeoutAction(savedOrderInfo, bill)
 			} else {
-				timerName := ""
-				if statusType == model.OrderTypeOrder {
-					timerName = model.OrderStatusName[status]
-				} else if statusType == model.OrderTypeWaybill {
-					timerName = model.WaybillStatusName[status]
-				}
-				globals.SugarLogger.Debugf("timerName %s", timerName)
+				//timerName := ""
+				//if statusType == model.OrderTypeOrder {
+				//	timerName = model.OrderStatusName[status]
+				//} else if statusType == model.OrderTypeWaybill {
+				//	timerName = model.WaybillStatusName[status]
+				//}
+				//globals.SugarLogger.Debugf("timerName %s", timerName)
 				timerInfo := &tTimerInfo{
 					statusType: statusType,
 					vendorID:   vendorID,

business/jxstore/cms/store.go

@@ -4322,7 +4322,6 @@ func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload ma
 	if err != nil {
 		return err
 	}
-	fmt.Println("======", payload["pricePercentage"])
 	if vendorStoreID != "" && vendorStoreID != "0" {
 		//AddStoreVendorMap 太复杂了并不满足，还是手动加吧
 		storeMap := &model.StoreMap{