fix:续费修改

internal/logic/order/editBatchReturn.go

@@ -65,7 +65,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 	switch param.FlowType == 0 {
 	case true: //流水回款
 		//查询回款流水记录
-		//transactionData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT return_id,BNKNAM,BNKFLW,id,ACTNBR,TRSBAL,BNKTIM,OTHNAM,NUSAGE FROM cbs.transaction WHERE id = %d`, param.TransactionId))
+		//transactionData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT return_id,BNKNAM,BNKFLW,id,ACTNBR,TRSBAL,BNKTIM,OTHNAM,NUSAGE FROM cadmin.transaction WHERE id = %d`, param.TransactionId))
 		transactionData, _ := g.DB().Ctx(ctx).GetOne(ctx, fmt.Sprintf(`SELECT return_id,BNKNAM,BNKFLW,id,ACTNBR,TRSBAL,BNKTIM,OTHNAM,NUSAGE FROM cadmin.transaction WHERE id = %d`, param.TransactionId))
 		if transactionData.IsEmpty() {
 			return errors.New("未找到该流水")
@@ -232,7 +232,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 			"return_id":  strings.Join(returnId, ","),
 			"ISRELATION": 1,
 		}
-		_, err := g.DB().Ctx(ctx).Update(ctx, "transaction", updateTransactionData, map[string]interface{}{"id": transactionMap["id"]})
+		_, err := g.DB().Ctx(ctx).Update(ctx, "cadmin.transaction", updateTransactionData, map[string]interface{}{"id": transactionMap["id"]})
 		if err != nil {
 			return err
 
@@ -240,4 +240,3 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 	}
 	return nil
 }
-

internal/logic/product/bigmember/BigMemberRenew.go

@@ -80,8 +80,8 @@ func (p jyBigProduct) BigEntMemberExtend(ctx context.Context, waitEmpowerId int,
 		log.Printf("企业用户权益续费失败:ent_user_id:%s\n", strings.Join(errUserid, ","))
 	}
 	_, err = g.DB().Ctx(ctx).Update(ctx, "entniche_wait_empower", map[string]interface{}{
-		"start_time": startTime,
-		"end_time":   endTime,
+		"start_time": date.FormatDate(&startTime, date.Date_Full_Layout),
+		"end_time":   date.FormatDate(&endTime, date.Date_Full_Layout),
 	}, map[string]interface{}{"id": waitEmpowerId})
 	if err != nil {
 		return errors.New(fmt.Sprintf("套餐续费失败 id: %d", waitEmpowerId))

internal/logic/timedTask/automaticPayment.go

@@ -33,7 +33,7 @@ type FilterStr struct {
 func AutomaticPayment() {
 	var ctx = context.Background()
 	log.Println("自动回款匹配。。。开始")
-	query := `select * from cbs.transaction where ISRELATION = 0 and OTHNAM is not null  and  OTHNAM != "" order by id`
+	query := `select * from cadmin.transaction where ISRELATION = 0 and OTHNAM is not null  and  OTHNAM != "" order by id`
 	data, _ := g.DB().Query(ctx, query)
 	if !data.IsEmpty() {
 		returnOrderMap := make(map[string]int)
@@ -139,7 +139,7 @@ WHERE
 							if returnId > 0 {
 								log.Println("自动回款创建回款记录成功", id, orderCode)
 								g.DB().Update(ctx, "dataexport_order", updateData, map[string]interface{}{"order_code": orderCode})
-								g.DB().Update(ctx, "transaction", map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)}, map[string]interface{}{"id": id})
+								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))