Browse Source

fix:升级计费修改

duxin 2 months ago
parent
commit
2c37ac0ea9
2 changed files with 16 additions and 3 deletions
  1. 14 1
      internal/controller/orderHandler.go
  2. 2 2
      internal/controller/orderInvoiceQuery.go

+ 14 - 1
internal/controller/orderHandler.go

@@ -368,8 +368,21 @@ func UpdateOrderHandler(r *ghttp.Request) {
 			}
 			//退回单子重新编辑提交后更改审核状态
 			if auditStatus := gconv.Int(orderRes.Map()["audit_status"]); auditStatus < 0 {
+				newAuditStatus := SwitchAudit(auditStatus)
 				upOrder["order_status"] = 0
-				upOrder["audit_status"] = SwitchAudit(auditStatus)
+				upOrder["audit_status"] = newAuditStatus
+				//新增轨迹
+				_, err = g.DB().Save(ctx, "audit_records", map[string]interface{}{
+					"operator":      uMsg.EntUserName,
+					"create_time":   date.NowFormat(date.Date_Full_Layout),
+					"operator_type": 4,
+					"audit_status":  newAuditStatus,
+					"order_code":    param.OrderCode,
+					"audit_type":    2,
+				})
+				if err != nil {
+					return errors.New("新增审核轨迹失败")
+				}
 			}
 			//编辑回退订单或未完成订单
 			if _, err = g.DB().Ctx(ctx).Update(ctx, "dataexport_order", upOrder, "order_code=? and order_status=0 ", param.OrderCode); err != nil {

+ 2 - 2
internal/controller/orderInvoiceQuery.go

@@ -20,12 +20,12 @@ func InvoiceQuery(r *ghttp.Request) {
 		}
 		data, err := order.InvoiceOrderQuery(r.Context(), param)
 		if err != nil {
-			return nil, errors.Wrap(err, "代用户下单创建账号异常")
+			return nil, errors.Wrap(err, "发票查询异常")
 		}
 		return data, nil
 	}()
 	if err != nil {
-		g.Log().Errorf(r.Context(), "代用户下单创建账号异常 %v", err)
+		g.Log().Errorf(r.Context(), "发票查询异常 %v", err)
 	}
 	r.Response.WriteJson(NewResult(rData, err))
 }