fix:cbs配置修改

config.yaml

@@ -22,6 +22,9 @@ database:
   subject:
     link: "mysql:jianyu:Topnet123@tcp(172.20.45.129:4000)/Jianyu_subjectdb_test"
     debug: false
+  cbs:
+      link: "mysql:jianyu:Topnet123@tcp(172.20.45.129:4000)/jianyu"
+      debug: false
 
 redis:
   default: # 配置seo的redis

internal/controller/invoiceUpload.go

@@ -55,6 +55,7 @@ func InvoiceUpload(r *ghttp.Request) {
 		data["mail"] = param.Email
 		data["company_phone"] = param.CompanyPhone
 		data["operator"] = jyutil.GetUserMsgFromCtx(r.Context()).EntUserName
+		data["operable_time"] = time.Now().Format("2006-01-02 15:04:05")
 		data["source"] = 3
 		data["invoice_status"] = 1
 		log.Println("发票上传参数", data, param.Id)

internal/logic/order/editBatchReturn.go

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

internal/logic/timedTask/automaticPayment.go

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