Browse Source

创建订单异常

xuzhiheng 2 years ago
parent
commit
6e39141bd7
3 changed files with 12 additions and 12 deletions
  1. 1 1
      src/main.go
  2. 1 1
      src/order/orderManageController.go
  3. 10 10
      src/order/orderManageService.go

+ 1 - 1
src/main.go

@@ -51,7 +51,7 @@ func main() {
 		writer.Header().Add("Access-Control-Allow-Headers", "Content-Type")
 		actionArr := "/system/user/save,/system/user/remove,/order/orderList/confirmRefund,/order/orderList/transferAccounts,/users/subAdd,/users/subOpenClose,/order/createBigOrder,/order/createSubOrder,/order/createSupplyOrder,/order/updateCombo,/order/delCombo,/order/openInvoice,/order/createOtherOrder,/order/editReturnInfo,/order/updateSalesperson,/order/editBatchReturnMoneyInfo,/order/updateBigOrder,/order/updateOtherOrder,/order/updateSupplyOrder,/order/updateSubOrder,/order/myCreateOtherOrder,/order/myCreateBigOrder,/order/suppleInfoExamine,/order/ordersExamine,/order/myUpdateOtherOrder,/order/myUpdateBigOrder,/order/myCreateSubOrder,/order/myCreateSupplyOrder,/order/myUpdateSupplySubOrder,/order/helpUserOrders,/order/logicalDelOrder,/order/addUpdateRecord"
 		context := admin.NewContext(writer, request)
-		if context.User != nil && strings.Contains(actionArr, context.Action) {
+		if context.User != nil && strings.Contains(actionArr, context.Action) && context.Action != "/order/orderList" {
 			res, _ := json.Marshal(context.Response)
 			//formParam:=map[string]interface{}{}
 			formParam, _ := json.Marshal(request.Form)

+ 1 - 1
src/order/orderManageController.go

@@ -420,7 +420,7 @@ func orderList(context *admin.Context) (interface{}, error) {
 		}
 		for k, v := range *res {
 			//用户手机号处理
-			u, ok := util.MQFW.FindById("user", qutil.ObjToString(v["user_id"]), `{"s_phone":1,"s_m_phone":1}`)
+			u, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(qutil.ObjToString(v["user_id"]))})
 			if ok && u != nil {
 				if s_phone, _ := (*u)["s_phone"].(string); s_phone != "" {
 					(*res)[k]["user_phone"] = s_phone

+ 10 - 10
src/order/orderManageService.go

@@ -3854,7 +3854,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 					}
 				}
 				sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-				serverDatas := util.JysqlDB.SelectBySql(sqls, serverId, fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+				serverDatas := util.JysqlDB.SelectBySql(sqls, serverId, fmt.Sprint(paramOrder["user_id"]))
 				if serverDatas != nil && len(*serverDatas) > 0 {
 					i_status := qutil.If(dateType == 1, 0, 1)
 					sql := ""
@@ -3870,7 +3870,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 				} else {
 					insert := map[string]interface{}{
 						"s_smainid":    mainId,
-						"s_userid":     fmt.Sprint(qutil.Int64All(paramOrder["user_id"])),
+						"s_userid":     fmt.Sprint(paramOrder["user_id"]),
 						"s_serviceid":  serverId,
 						"i_frequency":  frequency,
 						"l_starttime":  qutil.FormatDate(&startdate, qutil.Date_Full_Layout),
@@ -3881,7 +3881,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 					}
 					order_id := util.JysqlDB.Insert("bigmember_service_user", insert)
 					if order_id > 0 {
-						log.Println("用户服务表插入成功", fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+						log.Println("用户服务表插入成功", fmt.Sprint(paramOrder["user_id"]))
 					} else {
 						return errors.New("用户服务表插入失败")
 					}
@@ -3912,17 +3912,17 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 					}
 				}
 				sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-				serverDatas := util.JysqlDB.SelectBySql(sqls, serverId, fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+				serverDatas := util.JysqlDB.SelectBySql(sqls, serverId, fmt.Sprint(paramOrder["user_id"]))
 				if serverDatas != nil && len(*serverDatas) > 0 {
 					i_status := qutil.If(dateType == 1, 0, 1)
 					sql := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?,l_starttime = ?,l_endtime = ?,i_status = ? where s_serviceid = ? and s_userid = ?"
-					status1 := util.JysqlDB.UpdateOrDeleteBySql(sql, fmt.Sprint(frequency), qutil.NowFormat(qutil.Date_Full_Layout), qutil.FormatDate(&startdate, qutil.Date_Full_Layout), qutil.FormatDate(&enddate, qutil.Date_Full_Layout), fmt.Sprint(i_status), serverId, fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+					status1 := util.JysqlDB.UpdateOrDeleteBySql(sql, fmt.Sprint(frequency), qutil.NowFormat(qutil.Date_Full_Layout), qutil.FormatDate(&startdate, qutil.Date_Full_Layout), qutil.FormatDate(&enddate, qutil.Date_Full_Layout), fmt.Sprint(i_status), serverId, fmt.Sprint(paramOrder["user_id"]))
 					if status1 < 0 {
 						return errors.New("新建服务-更新服务表出错")
 					}
 				} else {
 					insert := map[string]interface{}{
-						"s_userid":     fmt.Sprint(qutil.Int64All((paramOrder["user_id"]))),
+						"s_userid":     fmt.Sprint((paramOrder["user_id"])),
 						"s_smainid":    mainId,
 						"s_serviceid":  serverId,
 						"i_frequency":  frequency,
@@ -3941,7 +3941,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 				}
 			}
 		}
-		ClearBigVipUserPower(fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+		ClearBigVipUserPower(fmt.Sprint(paramOrder["user_id"]))
 	}
 	if param.PaySub > 0 || param.FreeSub > 0 {
 		sets := map[string]interface{}{
@@ -3987,12 +3987,12 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 	for _, v := range param.ServerArr {
 		if qutil.IntAll(v["id"]) == 16 {
 			sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-			serverData := util.JysqlDB.SelectBySql(sqls, 12, fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+			serverData := util.JysqlDB.SelectBySql(sqls, 12, fmt.Sprint(paramOrder["user_id"]))
 			updatecount_before := qutil.IntAll((*serverData)[0]["i_frequency"])
 			updatecount_after := updatecount_before + qutil.IntAll(v["count"])
 			serverId := 12
 			insert := map[string]interface{}{
-				"s_userid":             fmt.Sprint(qutil.Int64All(paramOrder["user_id"])),
+				"s_userid":             fmt.Sprint(paramOrder["user_id"]),
 				"s_serviceid":          serverId,
 				"l_updatetime_before":  (*serverData)[0]["l_endtime"],
 				"l_updatetime_after":   (*serverData)[0]["l_endtime"],
@@ -4008,7 +4008,7 @@ func NewBigOrder(subStatus, dateType int, startdate, enddate time.Time, userId,
 				return errors.New("插入充值表失败")
 			}
 			sqls1 := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-			serverData1 := util.JysqlDB.SelectBySql(sqls1, 13, fmt.Sprint(qutil.Int64All(paramOrder["user_id"])))
+			serverData1 := util.JysqlDB.SelectBySql(sqls1, 13, fmt.Sprint(paramOrder["user_id"]))
 			updatecount_before1 := qutil.IntAll((*serverData1)[0]["i_frequency"])
 			updatecount_after1 := updatecount_before1 + qutil.IntAll(v["count"])
 			serverId1 := 13