fix:对公转账回款逻辑修改

internal/logic/order/editBatchReturn.go

@@ -46,7 +46,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 	)
 
 	for _, value := range param.OrderArr {
-		orderData, _ := g.DB().Ctx(ctx).GetOne(ctx, "select  (IFNULL( a.pay_money, 0 )-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code)+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection c where c.orderCode=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
+		orderData, _ := g.DB().Ctx(ctx).GetOne(ctx, "select  ((IFNULL(CASE WHEN a.is_backstage_order = 1 THEN a.pay_money ELSE a.order_money END, 0)) -IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code)+(select IFNULL(sum(payMoney),0) as return_money from moneyCorrection c where c.orderCode=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
 		if orderData.IsEmpty() {
 			continue
 		}

internal/logic/product/bigmember/BigMemberBuyTry.go

@@ -128,12 +128,11 @@ func (p jyBigProduct) BigMemberBuyTry(ctx context.Context, serviceOpenTime time.
 		)
 		//获取套餐名称
 		if p.param.Filter.ComboId != 0 && p.param.Filter.ComboId != 5 {
-			comboData, err := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT s_name,s_servers FROM bigmember_combo WHERE id=%d`, p.param.Filter.ComboId))
-			if err != nil || comboData.IsEmpty() {
+			serviceIds, err := BigMemberComboServiceIds(ctx, p.param.Filter.ComboId)
+			if err != nil {
 				return errors.New("套餐id失效")
 			}
-			comboName = gconv.String(comboData.Map()["s_name"])
-			p.param.Filter.ServiceIds = strings.Split(gconv.String(comboData.Map()["s_servers"]), ",")
+			p.param.Filter.ServiceIds = serviceIds
 		}
 		entService, userCount = jyutil.EntServiceOpen(gconv.Int(userData["entId"]), p.param.Phone)
 		//orderId := p.param.OrderCode