- 重构了dao.GetAuthBind和dao.GetUserBindAuthInfo

- AuthBind的唯一索引调整为"AuthID", "Type", "BindType", "DeletedAt"

business/jxstore/cms/user2.go

@@ -183,7 +183,7 @@ func HandleOrder4Consignee(order *model.GoodsOrder) (err error) {
 
 	vendorUserID := order.VendorUserID
 	if vendorUserID != "" {
-		authInfo, err2 := dao.GetAuthBind(db, "", model.AuthBindTypeID, authType, vendorUserID)
+		authInfo, err2 := dao.GetAuthBind(db, model.AuthBindTypeID, authType, vendorUserID)
 		if err = err2; err != nil && !dao.IsNoRowsError(err) {
 			return err
 		}
@@ -309,7 +309,7 @@ func OnDingDingMsg(msg map[string]interface{}) (callbackResponse *dingdingapi.Ca
 		for _, userID := range msg[dingdingapi.KeyUserID].([]interface{}) {
 			userIDStr := utils.Interface2String(userID)
 			globals.SugarLogger.Debugf("OnDingDingMsg dingding user:%s left company", userIDStr)
-			if authBind, err = dao.GetAuthBind(db, "", model.AuthBindTypeAuth, dingding.AuthTypeStaff, userIDStr); err == nil { // 直接找到了
+			if authBind, err = dao.GetAuthBind(db, model.AuthBindTypeAuth, dingding.AuthTypeStaff, userIDStr); err == nil { // 直接找到了
 				globals.SugarLogger.Debugf("OnDingDingMsg dingding user:%s, userID:%s left company", userIDStr, authBind.UserID)
 				if err = DisableUser(jxcontext.AdminCtx, authBind.UserID); err != nil {
 					globals.SugarLogger.Errorf("OnDingDingMsg failed with error:%v", err)

business/jxstore/tempop/tempop.go

@@ -1066,7 +1066,7 @@ func CreateConsumerFromOrders(ctx *jxcontext.Context, vendorIDs []int, fromDate,
 											}
 										}
 									}
-									if order2 == nil {
+									if order2 == nil && order.VendorID == model.VendorIDMTWM && time.Now().Sub(curDate) < 30*24*time.Hour {
 										order2, err = handler.GetOrder(order.VendorOrderID)
 									}
 									if order2 != nil {