- add black user .

business/jd/controller/order.go

@@ -5,6 +5,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/controllers"
 	"git.rosy.net.cn/jx-callback/business/jd/models"
 	"git.rosy.net.cn/jx-callback/compat/corm"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -143,13 +144,21 @@ func (c *OrderController) OrderDeliveryStatus(jdOrderDeliveryStatusMsg *jdapi.Ca
 }
 
 //-----------
-func acceptOrder(msg *jdapi.CallbackOrderMsg) {
-	globals2.Jdapi.OrderAcceptOperate(msg.BillID, true)
+func acceptOrder(msg *jdapi.CallbackOrderMsg, userMobile string, db orm.Ormer) {
+	if controllers.IsAutoAcceptOrder(userMobile, db) {
+		globals2.Jdapi.OrderAcceptOperate(msg.BillID, true)
+		if userMobile == "" {
+			globals.SugarLogger.Infof("jd order:%v force accepted, because userMobile is empty", msg)
+		}
+	} else {
+		globals.SugarLogger.Infof("jd order:%v refused, userMobile:%s", msg, userMobile)
+	}
 }
 
 func newOrder(msg *jdapi.CallbackOrderMsg) error {
 	result, err := globals2.Jdapi.LegacyQuerySingleOrder(msg.BillID)
-	acceptOrder(msg)
+	userMobile := ""
+	var db orm.Ormer
 	if err == nil {
 		rec := &models.Jdorder{
 			ID: msg.ID,
@@ -175,8 +184,9 @@ func newOrder(msg *jdapi.CallbackOrderMsg) error {
 			resultByteArr := utils.MustMarshal(data)
 			rec.Data = string(resultByteArr)
 			rec.Data4Json = data
+			userMobile = rec.Data4Json["buyerMobile"].(string)
 			err = utils.CallFuncLogError(func() error {
-				db := orm.NewOrm()
+				db = orm.NewOrm()
 				_, err := db.Update(rec, "Data", "Code", "Msg", "Success", "CityName", "OrderStatus", "OrderStatusTime")
 				return err
 			}, globals2.ErrStrAccessDB)
@@ -187,6 +197,7 @@ func newOrder(msg *jdapi.CallbackOrderMsg) error {
 			globals.SugarLogger.Errorf("can not get jdorder info:%v", msg.BillID)
 		}
 	}
+	acceptOrder(msg, userMobile, db)
 	return err
 }