2 Commity 2f5e161eaa ... 9a73ab82c8

Autor SHA1 Wiadomość Data
  wangshan 9a73ab82c8 Merge branch 'feature/v1.0.1' of https://jygit.jydev.jianyu360.cn/jianyu/jyOrderManager into feature/v1.0.1 7 godzin temu
  wangshan 61dcda23a7 回款方式 7 godzin temu
1 zmienionych plików z 4 dodań i 1 usunięć
  1. 4 1
      internal/logic/order/editBatchReturn.go

+ 4 - 1
internal/logic/order/editBatchReturn.go

@@ -62,7 +62,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 	}
 	transactionMap := make(map[string]interface{})
 	var (
-		money int
+		money, operateType int
 	)
 	switch param.FlowType == 0 {
 	case true:
@@ -81,10 +81,12 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 			return errors.New("订单回款失败,回款金额不符合")
 		}
 		transactionMap = transactionData.Map()
+		operateType = 2
 	case false: //手动回款
 		if param.ReturnMoney != realPrice {
 			return errors.New("订单回款失败,回款金额不符合")
 		}
+		operateType = 1
 	}
 	var (
 		returnId, allReturnOrder []string
@@ -109,6 +111,7 @@ func EditBatchReturn(ctx context.Context, param model.OrdersEditBatchReturn) err
 			"flow_type":             param.FlowType,
 			"pay_account_name":      param.PayAccountName,
 			"state":                 1,
+			"operate_type":          operateType,
 		}
 		updateData := make(map[string]interface{})
 		switch param.ReturnType {