fix:修改

internal/controller/orderHandler.go

@@ -38,7 +38,7 @@ var checkOrderProduct = func(ctx context.Context, orderCode string, param model.
 	}
 	if update { //待审核和已完成订单禁止修改
 		var orderDetailRes gdb.Result
-		orderDetailRes, err = g.DB().Query(ctx, "SELECT id FROM jy_order_detail WHERE order_code=?", param.OrderCode)
+		orderDetailRes, err = g.DB().Query(ctx, "SELECT id FROM jy_order_detail WHERE order_code=? and status =1", param.OrderCode)
 		if err != nil || orderDetailRes.IsEmpty() {
 			err = gerror.Wrapf(err, "为查询到订单明细")
 			return
@@ -327,6 +327,23 @@ func UpdateOrderHandler(r *ghttp.Request) {
 
 		//数据库操作
 		if err := g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+			var delDetailIds []string
+			detailIds, _ := g.DB().Ctx(ctx).Query(ctx, "SELECT id FROM jy_order_detail WHERE order_code = ? and status =1", param.OrderCode)
+			if !detailIds.IsEmpty() { //编辑订单存在删除老产品
+				for _, idMap := range detailIds.List() {
+					var isExist bool
+					for _, jyProduct := range param.ProductArr {
+						if gconv.String(idMap["id"]) == gconv.String(jyProduct["id"]) {
+							isExist = true
+							break
+						}
+					}
+					if !isExist {
+						delDetailIds = append(delDetailIds, gconv.String(idMap["id"]))
+					}
+				}
+			}
+
 			upOrder := g.Map{
 				"order_money":           param.OrderMoney,
 				"pay_money":             param.ContractMoney,
@@ -387,6 +404,11 @@ func UpdateOrderHandler(r *ghttp.Request) {
 			if err := order.SaveOrUpdateReturnPlant(ctx, param.OrderCode, param.ContractMoney, param.ReturnPlant); err != nil {
 				return gerror.Wrapf(err, "回款计划异常")
 			}
+			if len(delDetailIds) > 0 { //存在删除的订单
+				g.DB().Ctx(ctx).Update(ctx, "dataexport_order", map[string]interface{}{
+					"status": -1,
+				}, fmt.Sprintf(" id in (%s)", strings.Join(delDetailIds, ",")))
+			}
 			return nil
 		}); err != nil {
 			return nil, gerror.Wrapf(err, "数据库操作异常")

internal/logic/order/copyLink.go

@@ -21,7 +21,7 @@ import (
 func CopyLink(ctx context.Context, param model.OrderCopyLinkParams) (interface{}, error) {
 	var link string
 	//查询订单信息
-	orderData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf("SELECT a.user_id,a.order_code,jod.product_type,jod.filter,b.saler_name,b.saler_Id FROM dataexport_order a INNER JOIN order_sale_record b on(a.order_code = b.ordercode) INNER JOIN jy_order_detail jod on a.order_code = jod.order_code WHERE a.id=%s", param.Id))
+	orderData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf("SELECT a.user_id,a.order_code,jod.product_type,jod.filter,b.saler_name,b.saler_Id FROM dataexport_order a INNER JOIN order_sale_record b on(a.order_code = b.ordercode) INNER JOIN jy_order_detail jod on a.order_code = jod.order_code WHERE a.id=%s and jod.status =1", param.Id))
 	if !orderData.IsEmpty() {
 		order := orderData.Map()
 		filterMap := map[string]interface{}{}

internal/logic/order/detail.go

@@ -73,7 +73,7 @@ func Detail(ctx context.Context, param model.OrderDetailParams) (map[string]inte
 	orderMap["pure_amount"] = common.If(gconv.Int(orderMap["pay_money"])-gconv.Int(orderMap["commission"]) > 0, gconv.Int(orderMap["pay_money"])-gconv.Int(orderMap["commission"]), 0)
 
 	//产品
-	productData, err := g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM  jy_order_detail WHERE order_code =%s `, param.OrderCode))
+	productData, err := g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM  jy_order_detail WHERE order_code =%s and status =1`, param.OrderCode))
 	var (
 		productArr       []map[string]interface{}
 		autoAndAttribute bool
@@ -97,7 +97,7 @@ func Detail(ctx context.Context, param model.OrderDetailParams) (map[string]inte
 		for _, m := range moneyCorrectionData.List() {
 			if detailId := gconv.Int(m["detail_id"]); detailId > 0 {
 				productRed[detailId] += gconv.Int(m["payMoney"])
-				orderDetail, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT product_type FROM  jy_order_detail WHERE id =%d`, gconv.Int(m["detail_id"])))
+				orderDetail, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT product_type FROM  jy_order_detail WHERE id =%d and status =1`, gconv.Int(m["detail_id"])))
 				if !orderDetail.IsEmpty() {
 					m["name"] = orderDetail.Map()["product_type"]
 				} else if gconv.String(m["activity_code"]) != "" {
@@ -292,7 +292,7 @@ WHERE b.order_detail_id=%d`, linkedDetailId))
 FROM jy_order_detail jod
 INNER JOIN entniche_order eo ON jod.id = eo.order_detail_id
 INNER JOIN dataexport_order do on jod.order_code= do.order_code
-WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and eo.create_time< '%s' ORDER BY do.create_time desc`, gconv.String(entService.Map()["id"]), orderMap["create_time"]))
+WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and jod.status =1 and eo.create_time< '%s' ORDER BY do.create_time desc`, gconv.String(entService.Map()["id"]), orderMap["create_time"]))
 						if !entOrderService.IsEmpty() {
 							for _, m2 := range entOrderService.List() {
 								orderArr = append(orderArr, map[string]interface{}{
@@ -448,7 +448,7 @@ WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and eo.create_time< '%s
 			if gconv.Int(datum["refund_detail_id"]) > 0 {
 				detailData, _ := g.DB().GetOne(ctx, `SELECT de.*,jc.class_name FROM jy_order_detail  de
 LEFT JOIN jy_product_item ji on de.product_code = ji.code
-LEFT JOIN jy_product_class jc on ji.product_class_id = jc.id WHERE de.id =?`, gconv.Int(datum["refund_detail_id"]))
+LEFT JOIN jy_product_class jc on ji.product_class_id = jc.id WHERE de.id =? and de.status =1`, gconv.Int(datum["refund_detail_id"]))
 				if !detailData.IsEmpty() {
 					if gconv.String(detailData.Map()["class_name"]) == "" {
 						datum["name"] = detailData.Map()["product_type"]

internal/logic/order/editBatchReturn.go

@@ -176,7 +176,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 		returnId = append(returnId, fmt.Sprint(id))
 		//修改成功，判断是否全额回款并且创建订单勾选回款开通权益
 		if gconv.Int(value["return_status"]) != 1 && consts.PhoneRegex.MatchString(gconv.String(value["user_phone"])) && gconv.Int(updateData["return_status"]) == 1 {
-			productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0`, orderCode))
+			productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0 and status =1`, orderCode))
 			if err != nil || productDetail.IsEmpty() {
 				return err
 			}

internal/logic/order/examine.go

@@ -114,7 +114,7 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 		auditStatus = newAuditStatus
 		var checkAuto bool
 
-		productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s'`, param.OrderCode))
+		productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and status =1`, param.OrderCode))
 		if err != nil || productDetail.IsEmpty() {
 			return err
 		}

internal/logic/order/examineList.go

@@ -106,7 +106,7 @@ func ExamineList(ctx context.Context, param model.OrderExamineListParams) (map[s
 					showDeptMap[common.ObjToString(vv["code"])] = common.ObjToString(vv["show"])
 				}
 				for _, vv := range res.List() {
-					orderDetail, _ := g.DB().GetOne(ctx, fmt.Sprintf("SELECT product_type,filter,service_type FROM jy_order_detail where order_code = '%s' order by final_price desc,id desc LIMIT 1", vv["order_code"]))
+					orderDetail, _ := g.DB().GetOne(ctx, fmt.Sprintf("SELECT product_type,filter,service_type FROM jy_order_detail where order_code = '%s' and status =1 order by final_price desc,id desc LIMIT 1", vv["order_code"]))
 					if !orderDetail.IsEmpty() {
 						vv["product_type"] = orderDetail.Map()["product_type"]
 						vv["filter"] = orderDetail.Map()["filter"]

internal/logic/order/list.go

@@ -29,7 +29,7 @@ func List(ctx context.Context, param model.OrderListParams) (map[string]interfac
 		orderSql = append(orderSql, fmt.Sprintf(`(a.salesperson_entUserId ='%d' or a.order_code in (SELECT ordercode FROM order_sale_record WHERE ent_userId = %d and  state in (1,2) GROUP BY ordercode))`, adminId, adminId))
 	case 2: //代用户下单
 		// 我的订单、高翔、沈炳义查看所有得帮助用户下单的订单
-		productSql = ` INNER JOIN (SELECT DISTINCT(order_code)  FROM jy_order_detail WHERE product_type = 'VIP订阅' ) ptc on ptc.order_code = a.order_code `
+		productSql = ` INNER JOIN (SELECT DISTINCT(order_code)  FROM jy_order_detail WHERE product_type = 'VIP订阅' and status =1) ptc on ptc.order_code = a.order_code `
 		orderSql = append(orderSql, " a.del_status = 0 and  a.order_channel = 'xdqd04' ")
 		var isHelpList bool
 		for _, s := range g.Cfg().MustGet(ctx, "request_auth").Int64s() {
@@ -111,7 +111,7 @@ func List(ctx context.Context, param model.OrderListParams) (map[string]interfac
 		productArr = append(productArr, fmt.Sprintf(" product_type in ('%s') ", strings.Join(param.ProductType, "','")))
 	}
 	if len(productArr) > 0 {
-		productSql = fmt.Sprintf(` INNER JOIN (SELECT DISTINCT(order_code)  FROM jy_order_detail WHERE %s ) ptc on ptc.order_code = a.order_code `, strings.Join(productArr, " and "))
+		productSql = fmt.Sprintf(` INNER JOIN (SELECT DISTINCT(order_code)  FROM jy_order_detail WHERE %s and status =1) ptc on ptc.order_code = a.order_code `, strings.Join(productArr, " and "))
 	}
 	if param.SearchContent != "" {
 		orderSql = append(orderSql, fmt.Sprintf(`  (a.order_code = '%s' or a.company_name LIKE '%s' or a.user_phone LIKE '%s')`,
@@ -343,7 +343,7 @@ LEFT JOIN (
 
 		jyOrderDetail, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.*,jpi.name FROM jy_order_detail jod 
 LEFT JOIN jy_product_item jpi on jod.product_code = jpi.code
-WHERE jod.order_code = '%s'  order by  jod.final_price desc, jod.id desc`, gconv.String(m["order_code"])))
+WHERE jod.order_code = '%s' and jod.status =1 order by  jod.final_price desc, jod.id desc`, gconv.String(m["order_code"])))
 		if !jyOrderDetail.IsEmpty() {
 			switch param.ListSource {
 			case 1: //我的订单获取所有关联订单名称

internal/logic/order/redPunch.go

@@ -97,13 +97,13 @@ func OperateOrderRedPunch(ctx context.Context, params model.OrderRedPunchParams)
 			}
 			var pMoney int
 			if param.Id > 0 {
-				activeData, _ := g.DB().GetOne(ctx, `SELECT final_price+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection where orderCode=? and detail_id = ?) as final_price FROM jy_order_detail WHERE id = ?`, params.OrderCode, param.Id, param.Id)
+				activeData, _ := g.DB().GetOne(ctx, `SELECT final_price+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection where orderCode=? and detail_id = ?) as final_price FROM jy_order_detail WHERE id = ? and status =1`, params.OrderCode, param.Id, param.Id)
 				if !activeData.IsEmpty() {
 					pMoney = gconv.Int(activeData.Map()["final_price"])
 				}
 				insertData["payMoney"] = param.PayMoney - pMoney
 			} else if param.ActiveCode != "" && param.PayMoney > 0 {
-				activeData, _ := g.DB().GetOne(ctx, `SELECT sum(final_price)+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection where orderCode=? and activity_code = ?) as final_price FROM jy_order_detail WHERE activity_code = ? and order_code = ?`, params.OrderCode, param.ActiveCode, param.ActiveCode, params.OrderCode)
+				activeData, _ := g.DB().GetOne(ctx, `SELECT sum(final_price)+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection where orderCode=? and activity_code = ?) as final_price FROM jy_order_detail WHERE activity_code = ? and order_code = ? and status =1`, params.OrderCode, param.ActiveCode, param.ActiveCode, params.OrderCode)
 				if !activeData.IsEmpty() {
 					pMoney = gconv.Int(activeData.Map()["final_price"])
 				}
@@ -142,7 +142,7 @@ func OperateOrderRedPunch(ctx context.Context, params model.OrderRedPunchParams)
 		}
 		if return_money >= params.PayMoney {
 			updateData["return_status"] = 1
-			productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0`, params.OrderCode))
+			productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0 and status =1`, params.OrderCode))
 			if !productDetail.IsEmpty() {
 				uData, entId, userPositionId, err := jyutil.GetCreateUserData(gconv.String(orderData.Map()["user_phone"]), gconv.String(orderData.Map()["company_name"]), gconv.Int(orderData.Map()["buy_subject"]) == 2)
 				if err != nil {

internal/logic/order/serviceOpen.go

@@ -32,7 +32,7 @@ func ServiceOpen(ctx context.Context, param model.OrderOpenServiceParams) error
 			"order_code": param.OrderCode,
 		})
 	}
-	productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and is_service_open = 0`, param.OrderCode))
+	productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and is_service_open = 0 and status =1`, param.OrderCode))
 	if err != nil || productDetail.IsEmpty() {
 		return err
 	}

internal/logic/order/transferAccounts.go

@@ -58,7 +58,7 @@ func TransferAccounts(ctx context.Context, param model.TransferAccountsParams) (
 		//站内信通知
 		go func() {
 			orderData, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT a.user_phone,b.product_type from dataexport_order a
-INNER JOIN jy_order_detail b on a.order_code = b.order_code WHERE a.order_code = '%s'`, param.OrderCode))
+INNER JOIN jy_order_detail b on a.order_code = b.order_code WHERE a.order_code = '%s' and b.status =1`, param.OrderCode))
 			if !orderData.IsEmpty() {
 				var productType, link string
 				switch orderData.Map()["product_type"] {

internal/logic/product/bigmember/BigMemberRenew.go

@@ -128,7 +128,7 @@ func (p jyBigProduct) BigMemberRenew(ctx context.Context, orderData, userData ma
 		data, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT c.id as waitEmpowerId,c.start_time as sTime,c.end_time as eTime from jy_order_detail a 
 INNER JOIN entniche_order b on a.id = b.order_detail_id
 INNER JOIN entniche_wait_empower c on b.wait_empower_id=c.id
-where a.id = %s  `, p.param.LinkedOrderId))
+where a.id = %s and a.status =1 `, p.param.LinkedOrderId))
 		if !data.IsEmpty() {
 			eTime := jyutil.StrToTime(gconv.String(data.Map()["eTime"]), "2006-01-02 15:04:05")
 			if eTime.Unix() > time.Now().Unix() {

internal/logic/product/bigmember/BigMemberUpgrades.go

@@ -36,7 +36,7 @@ func (p jyBigProduct) BigMemberUpgrades(ctx context.Context, orderData, userData
 			data, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT c.id as waitEmpowerId,c.start_time as sTime,c.end_time as eTime,c.ent_id from jy_order_detail a 
 INNER JOIN entniche_order b on a.id = b.order_detail_id
 INNER JOIN entniche_wait_empower c on b.wait_empower_id=c.id
-where a.id = %s  `, p.param.LinkedOrderId))
+where a.id = %s  and a.status =1`, p.param.LinkedOrderId))
 			if data.IsEmpty() {
 				return errors.New("套餐id获取失败")
 			}
@@ -110,7 +110,7 @@ func (p jyBigProduct) BigMemberSub(ctx context.Context, orderData, userData map[
 		}
 	case "2":
 		var areaCount int
-		res, _ := g.DB().GetOne(ctx, fmt.Sprintf("SELECT c.end_time,c.start_time,c.province_count FROM jy_order_detail a LEFT JOIN entniche_order b on a.id = b.order_detail_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.id = %s", p.param.LinkedOrderId))
+		res, _ := g.DB().GetOne(ctx, fmt.Sprintf("SELECT c.end_time,c.start_time,c.province_count FROM jy_order_detail a LEFT JOIN entniche_order b on a.id = b.order_detail_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.id = %s and a.status =1", p.param.LinkedOrderId))
 		if !res.IsEmpty() {
 			bs, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(res.Map()["start_time"]), time.Local)
 			be, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString(res.Map()["end_time"]), time.Local)

internal/logic/product/bigmember/bigcommon.go

@@ -32,7 +32,7 @@ const (
 func ExistProcessOrder(phone, orderCode string) bool {
 	sql := fmt.Sprintf(`SELECT * FROM dataexport_order a
 INNER JOIN jy_order_detail b on a.order_code = b.order_code 
-WHERE  a.user_phone = '%s' and b.is_service_open = 0 and b.product_type = '大会员' and a.buy_subject=1 and b.status =1`, phone)
+WHERE  a.user_phone = '%s' and b.is_service_open = 0 and b.product_type = '大会员' and a.buy_subject=1 and b.status =1 and b.status =1`, phone)
 	if orderCode != "" {
 		sql += fmt.Sprintf(" and b.order_code != '%s'", orderCode)
 	}

internal/logic/product/bigmember/bigmember.go

@@ -37,7 +37,7 @@ func NewBigProduct(reqParam map[string]interface{}, detailId ...int64) (product.
 	_ = gconv.Struct(reqParam, &p)
 	//根据订单详情id,初始化字段
 	if len(detailId) > 0 {
-		record, err := g.DB().GetOne(context.Background(), fmt.Sprintf("SELECT * FROM jy_order_detail WHERE id=%d", detailId[0]))
+		record, err := g.DB().GetOne(context.Background(), fmt.Sprintf("SELECT * FROM jy_order_detail WHERE id=%d and status =1", detailId[0]))
 		if err != nil {
 			return nil, errors.New("未知订单详情id")
 		}
@@ -366,7 +366,7 @@ func (p jyBigProduct) OpenService(ctx context.Context, serviceOpenTime time.Time
 		return errors.New("更新订单明细异常")
 	}
 
-	orderDetail, _ := g.DB().GetOne(ctx, `SELECT * from jy_order_detail WHERE id = ? and is_master =1 `, p.param.Id)
+	orderDetail, _ := g.DB().GetOne(ctx, `SELECT * from jy_order_detail WHERE id = ? and is_master =1 and status =1`, p.param.Id)
 	if !orderDetail.IsEmpty() {
 		filterMap := map[string]interface{}{
 			"free_sub_num": p.param.Filter.GiftAccountCount,

internal/logic/product/bigmember/price.go

@@ -90,7 +90,7 @@ func (p jyBigProduct) GetPrice() (price int64, err error) {
 		if err != nil {
 			return 0, fmt.Errorf("查询关联订单异常")
 		}
-		re, err := g.DB().GetOne(context.Background(), fmt.Sprintf(`SELECT product_code FROM jy_order_detail WHERE id =%s`, p.param.LinkedOrderId))
+		re, err := g.DB().GetOne(context.Background(), fmt.Sprintf(`SELECT product_code FROM jy_order_detail WHERE id =%s and status =1`, p.param.LinkedOrderId))
 		if err != nil {
 			return 0, fmt.Errorf("查询关联订单异常")
 		}

internal/logic/product/common.go

@@ -18,7 +18,7 @@ func GetLinkVipCycleFilter(ctx context.Context, linkOrderDetailId int64) (filter
 	var (
 		re gdb.Record
 	)
-	re, err = g.DB().GetOne(ctx, "SELECT filter,service_starttime,service_endtime FROM jy_order_detail WHERE id =?", linkOrderDetailId)
+	re, err = g.DB().GetOne(ctx, "SELECT filter,service_starttime,service_endtime FROM jy_order_detail WHERE id =? and status =1", linkOrderDetailId)
 	if err != nil {
 		return
 	}
@@ -50,7 +50,7 @@ func GetLinkBigCycleFilter(ctx context.Context, linkOrderDetailId string) (filte
 	var (
 		re gdb.Record
 	)
-	re, err = g.DB().GetOne(ctx, fmt.Sprintf(`SELECT filter,service_starttime,service_endtime FROM jy_order_detail WHERE id =%s`, linkOrderDetailId))
+	re, err = g.DB().GetOne(ctx, fmt.Sprintf(`SELECT filter,service_starttime,service_endtime FROM jy_order_detail WHERE id =%s and status =1`, linkOrderDetailId))
 	if err != nil {
 		return
 	}

internal/logic/product/dataPack/dataPack.go

@@ -32,7 +32,7 @@ func NewDataPackProduct(reqParam map[string]interface{}, detailIdParam ...int64)
 	//根据订单详情id,初始化字段
 	if len(detailIdParam) > 0 {
 		detailId := detailIdParam[0]
-		record, err := g.DB().GetOne(context.Background(), "SELECT * FROM jy_order_detail WHERE id=?", detailId)
+		record, err := g.DB().GetOne(context.Background(), "SELECT * FROM jy_order_detail WHERE id=? and status =1", detailId)
 		if err != nil {
 			return nil, errors.Wrap(err, "未知订单详情id")
 		}

internal/logic/product/otherProduct/otherProduct.go

@@ -76,7 +76,7 @@ func NewDataPackProduct(reqParam map[string]interface{}, detailIdParam ...int64)
 	if len(reqParam) == 0 && len(detailIdParam) > 0 {
 		//根据请求参数中的code 获取对应产品类型
 		detailId := detailIdParam[0]
-		record, err := g.DB().GetOne(context.Background(), "SELECT * FROM jy_order_detail WHERE id=?", detailId)
+		record, err := g.DB().GetOne(context.Background(), "SELECT * FROM jy_order_detail WHERE id=? and status =1", detailId)
 		if err != nil {
 			return nil, errors.Wrap(err, "未知订单详情id")
 		}

internal/logic/product/subvip/check.go

@@ -72,7 +72,7 @@ func (p jySubVipProduct) Check(ctx context.Context, t int) error {
 			switch p.OrderDetail.ReqSubject {
 			case 1: //个人
 				if p.OrderDetail.ServiceType == 1 || p.OrderDetail.ServiceType == 4 { //校验是否有待生效的订单
-					num, err := g.DB().GetCount(ctx, "SELECT count(*) FROM dataexport_order d inner join jy_order_detail jyd on(d.order_code=jyd.order_code) WHERE d.user_phone=? and jyd.product_type= 'VIP订阅' and (jyd.service_type=1 or jyd.service_type=4) and jyd.status =1 and d.audit_status!=0", p.OrderDetail.Phone)
+					num, err := g.DB().GetCount(ctx, "SELECT count(*) FROM dataexport_order d inner join jy_order_detail jyd on(d.order_code=jyd.order_code) WHERE d.user_phone=? and jyd.status =1 and jyd.product_type= 'VIP订阅' and (jyd.service_type=1 or jyd.service_type=4) and jyd.status =1 and d.audit_status!=0", p.OrderDetail.Phone)
 					if err != nil {
 						return gerror.Wrapf(err, "查询账户订单信息异常")
 					}

internal/logic/product/subvip/service.go

@@ -173,7 +173,7 @@ func (p jySubVipProduct) OpenService(ctx context.Context, serviceOpenTime time.T
 	if err != nil {
 		return errors.Wrap(err, "更新订单明细异常")
 	}
-	orderDetail, _ := g.DB().GetOne(ctx, `SELECT is_master from jy_order_detail WHERE id = ? and is_master =1`, p.OrderDetail.Id)
+	orderDetail, _ := g.DB().GetOne(ctx, `SELECT is_master from jy_order_detail WHERE id = ? and is_master =1 and status =1`, p.OrderDetail.Id)
 	if !orderDetail.IsEmpty() {
 		g.DB().Update(ctx, "dataexport_order", map[string]interface{}{
 			"vip_starttime": date.FormatDate(&vipStartTime, date.Date_Full_Layout),

internal/logic/product/subvip/subvip.go

@@ -33,7 +33,7 @@ func NewSubVipProduct(reqParam map[string]interface{}, detailIdParam ...int64) (
 	//根据订单详情id,初始化字段
 	if len(detailIdParam) > 0 {
 		detailId := detailIdParam[0]
-		record, err := g.DB().GetOne(context.Background(), "SELECT *,returned_open as paybackOpenServer,linked_detail_id as linked_orderId FROM jy_order_detail WHERE id=?", detailId)
+		record, err := g.DB().GetOne(context.Background(), "SELECT *,returned_open as paybackOpenServer,linked_detail_id as linked_orderId FROM jy_order_detail WHERE id=? and status =1", detailId)
 		if err != nil {
 			return nil, errors.Wrap(err, "未知订单详情id")
 		}

internal/logic/timedTask/automaticPayment.go

@@ -142,7 +142,7 @@ WHERE
 								g.DB().Update(ctx, "cadmin.transaction", map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)}, map[string]interface{}{"id": id})
 								log.Println("自动回款开通权益", orderCode, gconv.Int(o["return_status"]), updateData["return_status"], returned_money, returnMoney, money)
 								if gconv.Int(o["return_status"]) != 1 && updateData["return_status"] == 1 {
-									productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0`, orderCode))
+									productDetail, err := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and is_service_open = 0 and status =1`, orderCode))
 									if err != nil || productDetail.IsEmpty() {
 										continue
 									}

internal/logic/timedTask/onlineReturnMoney.go

@@ -116,7 +116,7 @@ func OnlineReturnMoney() {
 				}
 
 				if orderUpdate["return_status"] == 1 && consts.PhoneRegex.MatchString(gconv.String(orderData["user_phone"])) {
-					productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and returned_open = 0 and is_service_open = 0`, orderCode))
+					productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and returned_open = 0 and is_service_open = 0 and status =1`, orderCode))
 					if !productDetail.IsEmpty() {
 						//全额回款开通权益
 						for _, o := range productDetail.List() {

internal/logic/user/getService.go

@@ -76,7 +76,7 @@ WHERE b.phone = '%s' and a.name = '%s'`, param.Phone, param.EntName))
 		}
 		orderDetailType, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT DISTINCT(jod.product_type)  FROM jy_order_detail jod
 INNER JOIN dataexport_order dor on jod.order_code = dor.order_code
-WHERE %s order by dor.create_time desc`, whereSql))
+WHERE %s and jod.status =1 order by dor.create_time desc`, whereSql))
 		if orderDetailType.IsEmpty() {
 			return map[string]interface{}{
 				"willEffect": false,
@@ -305,7 +305,7 @@ WHERE a.ent_id = '%s'  %s and a.product_type like '%s'  ORDER BY a.end_time desc
 			case strings.Contains(productType, "大会员"):
 				//大会员获取下服务最新id
 				serviceId, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT  b.filter FROM entniche_order a 
-	INNER JOIN  jy_order_detail b on a.order_detail_id = b.id WHERE a.wait_empower_id = %d ORDER BY a.create_time desc LIMIT 1`, gconv.Int(m["id"])))
+	INNER JOIN  jy_order_detail b on a.order_detail_id = b.id WHERE a.wait_empower_id = %d and b.status =1 ORDER BY a.create_time desc LIMIT 1`, gconv.Int(m["id"])))
 				if !serviceId.IsEmpty() {
 					comboId = gconv.Int(gconv.Map(serviceId.Map()["filter"])["comboId"])
 					itemMap, _ := g.DB().GetOne(ctx, fmt.Sprintf(`SELECT code FROM jy_product_item WHERE JSON_EXTRACT(price, '$.comboId') = %d;`, comboId))
@@ -337,7 +337,7 @@ WHERE a.ent_id = '%s'  %s and a.product_type like '%s'  ORDER BY a.end_time desc
 			//获取订单
 			entOrderService, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT  b.id,b.service_type,b.order_code,c.create_time,b.service_starttime,b.service_endtime,b.filter FROM entniche_order a 
 	INNER JOIN  jy_order_detail b on a.order_detail_id = b.id
-	LEFT JOIN dataexport_order c on b.order_code = c.order_code WHERE a.wait_empower_id = %d order by b.id desc`, gconv.Int(m["id"])))
+	LEFT JOIN dataexport_order c on b.order_code = c.order_code WHERE a.wait_empower_id = %d and b.status =1 order by b.id desc`, gconv.Int(m["id"])))
 			if !entOrderService.IsEmpty() {
 				for _, m2 := range entOrderService.List() {
 					if linkedId == 0 {
@@ -412,7 +412,7 @@ func SpecialService(ctx context.Context, phone, productType string, buySubject i
 
 	orderData, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT jod.product_code,jod.service_endtime,jod.id,jod.service_starttime,jod.service_type,jod.order_code,dor.create_time FROM dataexport_order dor 
 INNER JOIN jy_order_detail jod on dor.order_code = jod.order_code 
-WHERE %s and dor.product_type = '%s' ORDER BY dor.create_time desc `, phone, productType))
+WHERE %s and dor.product_type = '%s' and jod.status =1 ORDER BY dor.create_time desc `, phone, productType))
 	if !orderData.IsEmpty() {
 		for _, m2 := range orderData.List() {
 			if linkedId == 0 {

internal/logic/user/personService.go

@@ -27,7 +27,7 @@ func OrderUserChangePhone(ctx context.Context, param model.UserServiceParams) (i
 		return nil, nil
 	}
 
-	order, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT  * FROM jy_order_detail WHERE  order_code = '%s'  `, param.OrderCode))
+	order, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT  * FROM jy_order_detail WHERE  order_code = '%s'  and status =1 `, param.OrderCode))
 	if order.IsEmpty() {
 		return nil, nil
 	}