- don't check weixin exist after login in.

business/jxutils/jxutils_cms.go

@@ -99,3 +99,11 @@ func IntMap2List(intMap map[int]int) []int {
 	}
 	return retVal
 }
+
+//  计算SKU价格，unitPrice为一斤的单价，specQuality为质量，单位为克
+func CaculateSkuPrice(unitPrice int, specQuality float32, specUnit string) int {
+	if strings.ToLower(specUnit) == "kg" {
+		specQuality *= 1000
+	}
+	return int(math.Round(float64(float32(unitPrice) * specQuality / 500)))
+}

business/jxutils/tasksch/task.go

@@ -7,6 +7,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 const (
@@ -91,6 +92,7 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 	}
 	task.C = task.finishChan
 	go func() {
+		globals.SugarLogger.Debugf("RunTask %s", taskName)
 		for i := 0; i < parallelCount; i++ {
 			go func() {
 				var chanRetVal interface{}
@@ -104,19 +106,25 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 							chanRetVal = retVal
 							goto end
 						} else {
-							if result, err := worker(job, params...); err == nil {
+							result, err := worker(job, params...)
+							globals.SugarLogger.Debugf("RunTask %s, after call worker result:%v, err:%v", taskName, result, err)
+							if err == nil {
 								task.finishedOneJob(len(job))
 								if result != nil {
 									retVal = append(retVal, utils.Interface2Slice(result)...)
 								}
 							} else {
 								chanRetVal = err
-								task.Cancel()
+								go func() {
+									task.Cancel()
+								}()
+								goto end
 							}
 						}
 					}
 				}
 			end:
+				// globals.SugarLogger.Debugf("RunTask %s, put to chann chanRetVal:%v", taskName, chanRetVal)
 				task.subFinishChan <- chanRetVal
 			}()
 		}
@@ -157,6 +165,7 @@ func RunTask(taskName string, worker WorkFunc, resultHandler ResultHandlerFunc,
 		task.TerminatedAt = time.Now()
 
 		task.locker.Unlock()
+		globals.SugarLogger.Debugf("RunTask %s, result:%v, err:%v", taskName, taskResult, taskErr)
 
 		close(task.finishChan)
 		close(task.subFinishChan)